diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:48:31 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:48:31 -0600 |
commit | c48e769eb275917717e2b55eb869f7e559293ac8 (patch) | |
tree | 8f650b907e21c918b826f854dbe1c8174cc2c0c6 /kopete/protocols | |
parent | 8011d84f483f3628f3f04ea5cb2c1c3c86b2dba7 (diff) | |
download | tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.tar.gz tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kopete/protocols')
36 files changed, 110 insertions, 110 deletions
diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp index 19db0db7..76ec8b4f 100644 --- a/kopete/protocols/gadu/gaduaccount.cpp +++ b/kopete/protocols/gadu/gaduaccount.cpp @@ -128,7 +128,7 @@ static const char* const servers_ip[] = { p->textcodec_ = TQTextCodec::codecForName( "CP1250" ); p->session_ = new GaduSession( this, "GaduSession" ); - KGlobal::config()->setGroup( "Gadu" ); + TDEGlobal::config()->setGroup( "Gadu" ); setMyself( new GaduContact( accountId().toInt(), accountId(), this, Kopete::ContactList::self()->myself() ) ); diff --git a/kopete/protocols/gadu/gaduregisteraccount.cpp b/kopete/protocols/gadu/gaduregisteraccount.cpp index e33b4959..a5eb3dce 100644 --- a/kopete/protocols/gadu/gaduregisteraccount.cpp +++ b/kopete/protocols/gadu/gaduregisteraccount.cpp @@ -49,7 +49,7 @@ GaduRegisterAccount::GaduRegisterAccount( TQWidget* parent, const char* name ) cRegister = new RegisterCommand( TQT_TQOBJECT(this) ); emailRegexp = new TQRegExp( "[\\w\\d.+_-]{1,}@[\\w\\d.-]{1,}" ); - hintPixmap = KGlobal::iconLoader()->loadIcon ( "gadu_protocol", KIcon::Small ); + hintPixmap = TDEGlobal::iconLoader()->loadIcon ( "gadu_protocol", KIcon::Small ); connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( doRegister() ) ); connect( this, TQT_SIGNAL( okClicked() ), TQT_SLOT( slotClose() ) ); diff --git a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp index 6005f61a..d4c65412 100644 --- a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp @@ -49,7 +49,7 @@ ReceiveInvitationDialog::ReceiveInvitationDialog( GroupWiseAccount * account, co else //something is very wrong m_wid->m_contactName->setText( event.user ); - m_wid->m_dateTime->setText( KGlobal::locale()->formatDateTime( event.timeStamp ) ); + m_wid->m_dateTime->setText( TDEGlobal::locale()->formatDateTime( event.timeStamp ) ); m_wid->m_message->setText( TQString("<b>%1</b>").arg( event.message ) ); setMainWidget( m_wid ); diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp index 318a8f20..ffede29f 100644 --- a/kopete/protocols/irc/ircaccount.cpp +++ b/kopete/protocols/irc/ircaccount.cpp @@ -757,7 +757,7 @@ void IRCAccount::slotJoinChannel() comp.insertItems( chans ); dlg.lineEdit()->setCompletionObject( &comp ); - dlg.lineEdit()->setCompletionMode( KGlobalSettings::CompletionPopup ); + dlg.lineEdit()->setCompletionMode( TDEGlobalSettings::CompletionPopup ); while( true ) { diff --git a/kopete/protocols/irc/ircchannelcontact.cpp b/kopete/protocols/irc/ircchannelcontact.cpp index 94d67d3a..cab34817 100644 --- a/kopete/protocols/irc/ircchannelcontact.cpp +++ b/kopete/protocols/irc/ircchannelcontact.cpp @@ -495,7 +495,7 @@ void IRCChannelContact::topicUser(const TQString &nick, const TQDateTime &time) Kopete::Message msg(account->myServer(), mMyself, i18n("Topic set by %1 at %2").arg(nick).arg( - KGlobal::locale()->formatDateTime(time, true) + TDEGlobal::locale()->formatDateTime(time, true) ), Kopete::Message::Internal, Kopete::Message::PlainText, CHAT_VIEW); msg.setImportance(Kopete::Message::Low); //set the importance manualy to low appendMessage(msg); diff --git a/kopete/protocols/irc/ircusercontact.cpp b/kopete/protocols/irc/ircusercontact.cpp index c4607cb9..54c40132 100644 --- a/kopete/protocols/irc/ircusercontact.cpp +++ b/kopete/protocols/irc/ircusercontact.cpp @@ -472,7 +472,7 @@ void IRCUserContact::whoWasComplete() .arg(mInfo.realName); msg += i18n("Last Online: %1\n").arg( - KGlobal::locale()->formatDateTime( + TDEGlobal::locale()->formatDateTime( property( m_protocol->propLastSeen ).value().toDateTime() ) ); diff --git a/kopete/protocols/irc/kcodecaction.cpp b/kopete/protocols/irc/kcodecaction.cpp index 5dca8771..97964885 100644 --- a/kopete/protocols/irc/kcodecaction.cpp +++ b/kopete/protocols/irc/kcodecaction.cpp @@ -34,9 +34,9 @@ void KCodecAction::slotActivated( const TQString & text ) /* text is something like "Western European ( iso-8859-1 )", but we must give * codecForName() only the "iso-8859-1" part. */ - TQString encoding = KGlobal::charsets()->encodingForName(text); + TQString encoding = TDEGlobal::charsets()->encodingForName(text); - emit activated( KGlobal::charsets()->codecForName(encoding) ); + emit activated( TDEGlobal::charsets()->codecForName(encoding) ); } void KCodecAction::setCodec( const TQTextCodec *codec ) @@ -44,9 +44,9 @@ void KCodecAction::setCodec( const TQTextCodec *codec ) TQStringList items = this->items(); int i = 0; for (TQStringList::ConstIterator it = items.begin(), end = items.end(); it != end; ++it, ++i) { - TQString encoding = KGlobal::charsets()->encodingForName(*it); + TQString encoding = TDEGlobal::charsets()->encodingForName(*it); - if (KGlobal::charsets()->codecForName(encoding)->mibEnum() == codec->mibEnum()) { + if (TDEGlobal::charsets()->codecForName(encoding)->mibEnum() == codec->mibEnum()) { setCurrentItem(i); break; } @@ -61,25 +61,25 @@ void KCodecAction::setCodec( const TQTextCodec *codec ) TQStringList KCodecAction::supportedEncodings(bool usAscii) { - TQStringList encodingNames = KGlobal::charsets()->availableEncodingNames(); + TQStringList encodingNames = TDEGlobal::charsets()->availableEncodingNames(); TQStringList encodings; TQMap<TQString, bool> mimeNames; for (TQStringList::ConstIterator it = encodingNames.begin(); it != encodingNames.end(); ++it) { - TQTextCodec *codec = KGlobal::charsets()->codecForName(*it); + TQTextCodec *codec = TDEGlobal::charsets()->codecForName(*it); TQString mimeName = (codec) ? TQString(codec->mimeName()).lower() : (*it); if (mimeNames.find(mimeName) == mimeNames.end()) { - encodings.append(KGlobal::charsets()->languageForEncoding(*it) + encodings.append(TDEGlobal::charsets()->languageForEncoding(*it) + " ( " + mimeName + " )"); mimeNames.insert(mimeName, true); } } encodings.sort(); - if (usAscii) encodings.prepend(KGlobal::charsets() + if (usAscii) encodings.prepend(TDEGlobal::charsets() ->languageForEncoding("us-ascii") + " ( us-ascii )"); return encodings; } diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp index c0d5a87a..1b268027 100644 --- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp +++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp @@ -98,9 +98,9 @@ IRCEditAccountWidget::IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *ident charset->insertStringList( KCodecAction::supportedEncodings() ); for (int i = 0; i < charset->count(); ++i) { - TQString encoding = KGlobal::charsets()->encodingForName(charset->text(i)); + TQString encoding = TDEGlobal::charsets()->encodingForName(charset->text(i)); - if (KGlobal::charsets()->codecForName(encoding)->mibEnum() == currentCodec) { + if (TDEGlobal::charsets()->codecForName(encoding)->mibEnum() == currentCodec) { charset->setCurrentItem( i ); break; } @@ -208,7 +208,7 @@ void IRCEditAccountWidget::slotAddCtcp() TQString IRCEditAccountWidget::generateAccountId( const TQString &network ) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); TQString nextId = network; uint accountNumber = 1; @@ -262,7 +262,7 @@ Kopete::Account *IRCEditAccountWidget::apply() account()->setCustomCtcpReplies( replies ); account()->setConnectCommands( cmds ); - KCharsets *c = KGlobal::charsets(); + KCharsets *c = TDEGlobal::charsets(); account()->setCodec( c->codecForName( c->encodingForName( charset->currentText() ) ) ); return account(); diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp index d46f8707..bb4766e8 100644 --- a/kopete/protocols/jabber/jabberaccount.cpp +++ b/kopete/protocols/jabber/jabberaccount.cpp @@ -348,9 +348,9 @@ void JabberAccount::connectWithPassword ( const TQString &password ) m_jabberClient->setAllowPlainTextPassword ( configGroup()->readBoolEntry ( "AllowPlainTextPassword", false ) ); // enable file transfer (if empty, IP will be set after connection has been established) - KGlobal::config()->setGroup ( "Jabber" ); - m_jabberClient->setFileTransfersEnabled ( true, KGlobal::config()->readEntry ( "LocalIP" ) ); - setS5BServerPort ( KGlobal::config()->readNumEntry ( "LocalPort", 8010 ) ); + TDEGlobal::config()->setGroup ( "Jabber" ); + m_jabberClient->setFileTransfersEnabled ( true, TDEGlobal::config()->readEntry ( "LocalIP" ) ); + setS5BServerPort ( TDEGlobal::config()->readNumEntry ( "LocalPort", 8010 ) ); // // Determine system name diff --git a/kopete/protocols/jabber/jabberbasecontact.cpp b/kopete/protocols/jabber/jabberbasecontact.cpp index 5dac2e18..6ed0bcfd 100644 --- a/kopete/protocols/jabber/jabberbasecontact.cpp +++ b/kopete/protocols/jabber/jabberbasecontact.cpp @@ -277,7 +277,7 @@ void JabberBaseContact::updateResourceList () // resource timestamp resourceListStr += TQString ( "<tr><td>%1: %2</td></tr>" ). - arg ( i18n ( "Timestamp" ), KGlobal::locale()->formatDateTime ( (*it)->resource().status().timeStamp(), true, true ) ); + arg ( i18n ( "Timestamp" ), TDEGlobal::locale()->formatDateTime ( (*it)->resource().status().timeStamp(), true, true ) ); // message, if any if ( !(*it)->resource().status().status().stripWhiteSpace().isEmpty () ) diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp index b8a9c080..71ad871f 100644 --- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp +++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp @@ -115,9 +115,9 @@ void JabberEditAccountWidget::reopen () cbAllowPlainTextPassword->setChecked (account()->configGroup()->readBoolEntry("AllowPlainTextPassword", true)); - KGlobal::config()->setGroup("Jabber"); - leLocalIP->setText (KGlobal::config()->readEntry("LocalIP", "")); - sbLocalPort->setValue (KGlobal::config()->readNumEntry("LocalPort", 8010)); + TDEGlobal::config()->setGroup("Jabber"); + leLocalIP->setText (TDEGlobal::config()->readEntry("LocalIP", "")); + sbLocalPort->setValue (TDEGlobal::config()->readNumEntry("LocalPort", 8010)); leProxyJID->setText (account()->configGroup()->readEntry("ProxyJID", TQString())); @@ -178,9 +178,9 @@ void JabberEditAccountWidget::writeConfig () account()->setExcludeConnect(cbAutoConnect->isChecked()); - KGlobal::config()->setGroup("Jabber"); - KGlobal::config()->writeEntry("LocalIP", leLocalIP->text()); - KGlobal::config()->writeEntry("LocalPort", sbLocalPort->value()); + TDEGlobal::config()->setGroup("Jabber"); + TDEGlobal::config()->writeEntry("LocalIP", leLocalIP->text()); + TDEGlobal::config()->writeEntry("LocalPort", sbLocalPort->value()); account()->configGroup()->writeEntry("ProxyJID", leProxyJID->text()); diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp index 00f228d5..7cb869e9 100644 --- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp +++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp @@ -73,7 +73,7 @@ JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *parent, connect ( jabberClient, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotConnected () ) ); jidRegExp.setPattern ( "[\\w\\d.+_-]{1,}@[\\w\\d.-]{1,}" ); - hintPixmap = KGlobal::iconLoader()->loadIcon ( "jabber_online", KIcon::Small ); + hintPixmap = TDEGlobal::iconLoader()->loadIcon ( "jabber_online", KIcon::Small ); mSuccess = false; diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp index c4dcabf2..034f2548 100644 --- a/kopete/protocols/msn/msnaccount.cpp +++ b/kopete/protocols/msn/msnaccount.cpp @@ -1184,8 +1184,8 @@ void MSNAccount::slotCreateChat( const TQString& ID, const TQString& address, co * see MSNChatSession::receivedTypingMsg * - KGlobal::config()->setGroup( "MSN" ); - bool notifyNewChat = KGlobal::config()->readBoolEntry( "NotifyNewChat", false ); + TDEGlobal::config()->setGroup( "MSN" ); + bool notifyNewChat = TDEGlobal::config()->readBoolEntry( "NotifyNewChat", false ); if ( !ID.isEmpty() && notifyNewChat ) { // this temporary message should open the window if they not exist diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp index 6709f0f1..8e2113a1 100644 --- a/kopete/protocols/msn/msnchatsession.cpp +++ b/kopete/protocols/msn/msnchatsession.cpp @@ -173,7 +173,7 @@ void MSNChatSession::createChat( const TQString &handle, this, TQT_SLOT( slotSwitchBoardClosed() ) ); connect( m_chatService, TQT_SIGNAL( receivedTypingMsg( const TQString &, bool ) ), this, TQT_SLOT( receivedTypingMsg( const TQString &, bool ) ) ); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); if(config->readBoolEntry( "SendTypingNotification" , true) ) { @@ -223,7 +223,7 @@ void MSNChatSession::slotUserJoined( const TQString &handle, const TQString &pub if(!m_messagesQueue.empty() || !m_invitations.isEmpty()) sendMessageQueue(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); if ( members().count()==1 && config->readNumEntry( "DownloadPicture", 1 ) >= 1 && !c->object().isEmpty() && !c->hasProperty(Kopete::Global::Properties::self()->photo().key())) slotRequestPicture(); @@ -584,7 +584,7 @@ void MSNChatSession::slotDisplayPictureChanged() } else { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); if ( config->readNumEntry( "DownloadPicture", 1 ) >= 1 && !c->object().isEmpty() ) slotRequestPicture(); @@ -616,8 +616,8 @@ void MSNChatSession::receivedTypingMsg( const TQString &contactId, bool b ) if(c && m_newSession && !view(false)) { //this was originaly in MSNAccount::slotCreateChat - KGlobal::config()->setGroup( "MSN" ); - bool notifyNewChat = KGlobal::config()->readBoolEntry( "NotifyNewChat", false ); + TDEGlobal::config()->setGroup( "MSN" ); + bool notifyNewChat = TDEGlobal::config()->readBoolEntry( "NotifyNewChat", false ); if ( notifyNewChat ) { // this internal message should open the window if they not exist diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp index 700bf213..e77ba2ff 100644 --- a/kopete/protocols/msn/msncontact.cpp +++ b/kopete/protocols/msn/msncontact.cpp @@ -700,7 +700,7 @@ void MSNContact::setObject(const TQString &obj) removeProperty( Kopete::Global::Properties::self()->photo() ) ; emit displayPictureChanged(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); if ( config->readNumEntry( "DownloadPicture", 2 ) >= 2 && !obj.isEmpty() && account()->myself()->onlineStatus().status() != Kopete::OnlineStatus::Invisible ) diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp index 3298e46e..f2a7e667 100644 --- a/kopete/protocols/msn/msnswitchboardsocket.cpp +++ b/kopete/protocols/msn/msnswitchboardsocket.cpp @@ -419,7 +419,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) else if( type== "text/x-mms-emoticon" || type== "text/x-mms-animemoticon") { // TODO remove Displatcher. - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); if ( config->readBoolEntry( "useCustomEmoticons", true ) ) { @@ -466,7 +466,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) if(!m_clientcapsSent) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); TQString JabberID; @@ -667,7 +667,7 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg ) } #endif - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); if ( config->readBoolEntry( "exportEmoticons", false ) ) { diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp index 4bb246a2..60672824 100644 --- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp +++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp @@ -84,8 +84,8 @@ MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account d->autoConfig->retrieveSettings( true ); //Get a list of all jabber accounts - KGlobal::config()->setGroup("MSN"); - TQString jab_account=KGlobal::config()->readEntry("JabberAccount"); + TDEGlobal::config()->setGroup("MSN"); + TQString jab_account=TDEGlobal::config()->readEntry("JabberAccount"); TQPtrList<Kopete::Account> accounts = Kopete::AccountManager::self()->accounts(); for(Kopete::Account *a=accounts.first() ; a; a=accounts.next() ) @@ -192,8 +192,8 @@ MSNEditAccountWidget::~MSNEditAccountWidget() Kopete::Account * MSNEditAccountWidget::apply() { d->autoConfig->saveSettings(); - KGlobal::config()->setGroup("MSN"); - KGlobal::config()->writeEntry("JabberAccount", d->ui->JabberAccount->currentText()); + TDEGlobal::config()->setGroup("MSN"); + TDEGlobal::config()->writeEntry("JabberAccount", d->ui->JabberAccount->currentText()); if ( !account() ) setAccount( new MSNAccount( d->protocol, d->ui->m_login->text() ) ); diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp index 88fe7d33..43b0f33e 100644 --- a/kopete/protocols/msn/webcam.cpp +++ b/kopete/protocols/msn/webcam.cpp @@ -54,7 +54,7 @@ Webcam::Webcam(Who who, const TQString& to, Dispatcher *parent, TQ_UINT32 sessio m_mimic=0L; m_widget=0L; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); // Read the configuration to get the number of frame per second to send @@ -519,7 +519,7 @@ TQString Webcam::xml(uint session , uint rid) int Webcam::getAvailablePort() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); TQString basePort=config->readEntry("WebcamPort"); if(basePort.isEmpty() || basePort == "0" ) diff --git a/kopete/protocols/oscar/icq/icqprotocol.cpp b/kopete/protocols/oscar/icq/icqprotocol.cpp index cf86118f..a7e3f001 100644 --- a/kopete/protocols/oscar/icq/icqprotocol.cpp +++ b/kopete/protocols/oscar/icq/icqprotocol.cpp @@ -219,7 +219,7 @@ void ICQProtocol::initGenders() void ICQProtocol::initCountries() { mCountries.insert(0, ""); // unspecified - KLocale *kl = KGlobal::locale(); //KLocale(TQString::fromLatin1("kopete")); + KLocale *kl = TDEGlobal::locale(); //KLocale(TQString::fromLatin1("kopete")); mCountries.insert(93, kl->twoAlphaToCountryName("af")); mCountries.insert(355, kl->twoAlphaToCountryName("al")); @@ -468,7 +468,7 @@ void ICQProtocol::initCountries() void ICQProtocol::initLang() { - KLocale *kl = KGlobal::locale(); //KLocale(TQString::fromLatin1("kopete")); + KLocale *kl = TDEGlobal::locale(); //KLocale(TQString::fromLatin1("kopete")); mLanguages.insert(0 , ""); mLanguages.insert(1 , kl->twoAlphaToLanguageName("ar") /*i18n("Arabic")*/); diff --git a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp index 44fd5afd..4d09d70f 100644 --- a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp +++ b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp @@ -47,28 +47,28 @@ ICQUserInfoWidget::ICQUserInfoWidget( TQWidget * parent, const char * name ) TQFrame* genInfo = addPage( i18n( "General Info" ), i18n( "General ICQ Information" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "identity" ), KIcon::Desktop ) ); + TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "identity" ), KIcon::Desktop ) ); TQVBoxLayout* genLayout = new TQVBoxLayout( genInfo ); m_genInfoWidget = new ICQGeneralInfoWidget( genInfo, "Basic Information" ); genLayout->addWidget( m_genInfoWidget ); TQFrame* workInfo = addPage( i18n( "Work Info" ), i18n( "Work Information" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "attach" ), KIcon::Desktop ) ); + TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "attach" ), KIcon::Desktop ) ); TQVBoxLayout* workLayout = new TQVBoxLayout( workInfo ); m_workInfoWidget = new ICQWorkInfoWidget( workInfo, "Work Information" ); workLayout->addWidget( m_workInfoWidget ); TQFrame* otherInfo = addPage( i18n( "Other Info" ), i18n( "Other ICQ Information" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) ); + TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) ); TQVBoxLayout* otherLayout = new TQVBoxLayout( otherInfo ); m_otherInfoWidget = new ICQOtherInfoWidget( otherInfo, "Other Information" ); otherLayout->addWidget( m_otherInfoWidget ); TQFrame* interestInfo = addPage( i18n( "Interest Info" ), i18n( "Interest" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) ); + TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) ); TQVBoxLayout* interestLayout = new TQVBoxLayout( interestInfo ); m_interestInfoWidget = new ICQInterestInfoWidget( interestInfo, "Other Information" ); interestLayout->addWidget( m_interestInfoWidget ); @@ -165,7 +165,7 @@ void ICQUserInfoWidget::fillMoreInfo( const ICQMoreUserInfo& ui ) TQTextCodec* codec = m_contact->contactCodec(); m_genInfoWidget->ageSpinBox->setValue( ui.age ); if ( ui.birthday.isValid() ) - m_genInfoWidget->birthday->setText( KGlobal::locale()->formatDate( ui.birthday,true ) ); + m_genInfoWidget->birthday->setText( TDEGlobal::locale()->formatDate( ui.birthday,true ) ); TQString gender = static_cast<ICQProtocol*>( m_contact->protocol() )->genders()[ui.gender]; m_genInfoWidget->genderEdit->setText( gender ); diff --git a/kopete/protocols/oscar/oscarversionupdater.cpp b/kopete/protocols/oscar/oscarversionupdater.cpp index 90981434..d79e47fc 100644 --- a/kopete/protocols/oscar/oscarversionupdater.cpp +++ b/kopete/protocols/oscar/oscarversionupdater.cpp @@ -66,7 +66,7 @@ bool OscarVersionUpdater::update( unsigned int stamp ) { mVersionData.resize( 0 ); - KConfigGroup config( KGlobal::config(), "Oscar" ); + KConfigGroup config( TDEGlobal::config(), "Oscar" ); TQString url = config.readEntry( "NewVersionURL", "http://kopete.kde.org/oscarversions.xml" ); mTransferJob = KIO::get ( url ); kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Download version info from server."<< endl; @@ -87,7 +87,7 @@ unsigned int OscarVersionUpdater::stamp() const void OscarVersionUpdater::initICQVersionInfo() { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl; - KConfigGroup config( KGlobal::config(), "ICQVersion" ); + KConfigGroup config( TDEGlobal::config(), "ICQVersion" ); mICQVersion.clientString = config.readEntry( "ClientString", "ICQ Client" ); mICQVersion.clientId = config.readEntry( "ClientId", "0x010A" ).toUShort( 0, 0 ); @@ -104,7 +104,7 @@ void OscarVersionUpdater::initAIMVersionInfo() { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl; - KConfigGroup config( KGlobal::config(), "AIMVersion" ); + KConfigGroup config( TDEGlobal::config(), "AIMVersion" ); mAIMVersion.clientString = config.readEntry( "ClientString", "AOL Instant Messenger (SM), version 5.1.3036/WIN32" ); mAIMVersion.clientId = config.readEntry( "ClientId", "0x0109" ).toUShort( 0, 0 ); @@ -264,7 +264,7 @@ bool OscarVersionUpdater::parseVersion( Oscar::ClientVersion& version, TQDomElem void OscarVersionUpdater::storeVersionInfo( const TQString& group, const Oscar::ClientVersion& version ) const { kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Storing version info to group: " << group << endl; - KConfigGroup config( KGlobal::config(), group ); + KConfigGroup config( TDEGlobal::config(), group ); config.writeEntry( "ClientString", version.clientString ); config.writeEntry( "ClientId", version.clientId ); diff --git a/kopete/protocols/sms/services/gsmlib.h b/kopete/protocols/sms/services/gsmlib.h index c49e26b7..5f7b9257 100644 --- a/kopete/protocols/sms/services/gsmlib.h +++ b/kopete/protocols/sms/services/gsmlib.h @@ -40,7 +40,7 @@ class GSMLibPrefsUI; class SMSContact; class TQListViewItem; -class KProcess; +class TDEProcess; class GSMLibThread; class GSMLib : public SMSService diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp index 984e8435..9a1898a8 100644 --- a/kopete/protocols/sms/services/smsclient.cpp +++ b/kopete/protocols/sms/services/smsclient.cpp @@ -71,7 +71,7 @@ void SMSClient::send(const Kopete::Message& msg) if (programName.isNull()) programName = "/usr/bin/sms_client"; - KProcess* p = new KProcess; + TDEProcess* p = new TDEProcess; TQString message = msg.plainBody(); TQString nr = msg.to().first()->contactId(); @@ -80,11 +80,11 @@ void SMSClient::send(const Kopete::Message& msg) *p << provider + ":" + nr; *p << message; - TQObject::connect(p, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotSendFinished(KProcess*))); - TQObject::connect(p, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); - TQObject::connect(p, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); + TQObject::connect(p, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotSendFinished(TDEProcess*))); + TQObject::connect(p, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + TQObject::connect(p, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - p->start(KProcess::Block, KProcess::AllOutput); + p->start(TDEProcess::Block, TDEProcess::AllOutput); } TQWidget* SMSClient::configureWidget(TQWidget* parent) @@ -152,14 +152,14 @@ TQStringList SMSClient::providers() return p; } -void SMSClient::slotReceivedOutput(KProcess*, char *buffer, int buflen) +void SMSClient::slotReceivedOutput(TDEProcess*, char *buffer, int buflen) { TQStringList lines = TQStringList::split("\n", TQString::fromLocal8Bit(buffer, buflen)); for (TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it) output.append(*it); } -void SMSClient::slotSendFinished(KProcess* p) +void SMSClient::slotSendFinished(TDEProcess* p) { if (p->exitStatus() == 0) emit messageSent(m_msg); diff --git a/kopete/protocols/sms/services/smsclient.h b/kopete/protocols/sms/services/smsclient.h index 988565b1..ffb146c6 100644 --- a/kopete/protocols/sms/services/smsclient.h +++ b/kopete/protocols/sms/services/smsclient.h @@ -26,7 +26,7 @@ class SMSClientPrefsUI; class SMSContact; class TQListViewItem; -class KProcess; +class TDEProcess; class SMSClient : public SMSService { @@ -46,8 +46,8 @@ public slots: void savePreferences(); private slots: - void slotReceivedOutput(KProcess*, char *buffer, int buflen); - void slotSendFinished(KProcess* p); + void slotReceivedOutput(TDEProcess*, char *buffer, int buflen); + void slotSendFinished(TDEProcess* p); signals: void messageSent(const Kopete::Message &); diff --git a/kopete/protocols/sms/services/smssendprovider.cpp b/kopete/protocols/sms/services/smssendprovider.cpp index 8feb94a9..e2095d25 100644 --- a/kopete/protocols/sms/services/smssendprovider.cpp +++ b/kopete/protocols/sms/services/smssendprovider.cpp @@ -237,21 +237,21 @@ void SMSSendProvider::send(const Kopete::Message& msg) values[messagePos] = message; values[telPos] = nr; - KProcess* p = new KProcess; + TDEProcess* p = new TDEProcess; kdWarning( 14160 ) << "Executing " << TQString("%1/bin/smssend").arg(prefix) << " \"" << provider << "\" " << values.join("\" \"") << "\"" << endl; *p << TQString("%1/bin/smssend").arg(prefix) << provider << values; output = ""; - connect( p, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotSendFinished(KProcess *))); - connect( p, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(slotReceivedOutput(KProcess *, char *, int))); -// connect( p, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), this, TQT_SLOT(slotReceivedOutput(KProcess *, char *, int))); + connect( p, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotSendFinished(TDEProcess *))); + connect( p, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(slotReceivedOutput(TDEProcess *, char *, int))); +// connect( p, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQT_SLOT(slotReceivedOutput(TDEProcess *, char *, int))); - p->start(KProcess::NotifyOnExit, KProcess::AllOutput); + p->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput); } -void SMSSendProvider::slotSendFinished(KProcess *p) +void SMSSendProvider::slotSendFinished(TDEProcess *p) { kdWarning( 14160 ) << k_funcinfo << "this = " << this << ", es = " << p->exitStatus() << ", p = " << p << " (should be non-zero!!)" << endl; if (p->exitStatus() == 0) @@ -262,7 +262,7 @@ void SMSSendProvider::slotSendFinished(KProcess *p) p->deleteLater(); } -void SMSSendProvider::slotReceivedOutput(KProcess *, char *buffer, int buflen) +void SMSSendProvider::slotReceivedOutput(TDEProcess *, char *buffer, int buflen) { // TQStringList lines = TQStringList::split("\n", TQString::fromLocal8Bit(buffer, buflen)); // for (TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it) diff --git a/kopete/protocols/sms/services/smssendprovider.h b/kopete/protocols/sms/services/smssendprovider.h index 97d60542..fbe238e1 100644 --- a/kopete/protocols/sms/services/smssendprovider.h +++ b/kopete/protocols/sms/services/smssendprovider.h @@ -29,7 +29,7 @@ #include "smsaccount.h" -class KProcess; +class TDEProcess; namespace Kopete { class Account; } class SMSContact; @@ -54,8 +54,8 @@ public: int maxSize(); private slots: - void slotReceivedOutput(KProcess*, char *buffer, int buflen); - void slotSendFinished(KProcess*); + void slotReceivedOutput(TDEProcess*, char *buffer, int buflen); + void slotSendFinished(TDEProcess*); private: TQStringList names; TQStringList descriptions; diff --git a/kopete/protocols/sms/smsaccount.h b/kopete/protocols/sms/smsaccount.h index f127759f..b543d191 100644 --- a/kopete/protocols/sms/smsaccount.h +++ b/kopete/protocols/sms/smsaccount.h @@ -23,7 +23,7 @@ class KActionMenu; class SMSProtocol; class SMSContact; class SMSService; -class KProcess; +class TDEProcess; enum SMSMsgAction { ACT_ASK = 0, ACT_CANCEL, ACT_SPLIT }; diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp index c408d0ad..05eabee7 100644 --- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp +++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp @@ -163,9 +163,9 @@ void WinPopupLib::startReadProcess(const TQString &Host) *reader << smbClientBin << "-N" << "-E" << "-g" << "-L" << Host << "-"; connect(reader, TQT_SIGNAL(readReady(KProcIO *)), this, TQT_SLOT(slotReadProcessReady(KProcIO *))); - connect(reader, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotReadProcessExited(KProcess *))); + connect(reader, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotReadProcessExited(TDEProcess *))); - if (!reader->start(KProcess::NotifyOnExit, true)) { + if (!reader->start(TDEProcess::NotifyOnExit, true)) { // still to come kdDebug(14170) << "ReadProcess not started!" << endl; } @@ -189,7 +189,7 @@ void WinPopupLib::slotReadProcessReady(KProcIO *r) } } -void WinPopupLib::slotReadProcessExited(KProcess *r) +void WinPopupLib::slotReadProcessExited(TDEProcess *r) { delete r; @@ -327,13 +327,13 @@ void WinPopupLib::readMessages(const KFileItemList &items) */ void WinPopupLib::sendMessage(const TQString &Body, const TQString &Destination) { - KProcess *sender = new KProcess(this); + TDEProcess *sender = new TDEProcess(this); *sender << smbClientBin << "-M" << Destination; *sender << "-N" << "-"; - connect(sender, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotSendProcessExited(KProcess *))); + connect(sender, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotSendProcessExited(TDEProcess *))); - if (sender->start(KProcess::NotifyOnExit, KProcess::Stdin)) { + if (sender->start(TDEProcess::NotifyOnExit, TDEProcess::Stdin)) { sender->writeStdin(Body.local8Bit(), Body.local8Bit().length()); if (!sender->closeStdin()) { delete sender; @@ -343,7 +343,7 @@ void WinPopupLib::sendMessage(const TQString &Body, const TQString &Destination) } } -void WinPopupLib::slotSendProcessExited(KProcess *p) +void WinPopupLib::slotSendProcessExited(TDEProcess *p) { // emit sendJobDone(p->pid()); delete p; diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h index c4789ebc..1213b3cf 100644 --- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h +++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h @@ -77,8 +77,8 @@ private slots: void slotUpdateGroupData(); void startReadProcess(const TQString &Host); void slotReadProcessReady(KProcIO *r); - void slotReadProcessExited(KProcess *r); - void slotSendProcessExited(KProcess *p); + void slotReadProcessExited(TDEProcess *r); + void slotSendProcessExited(TDEProcess *p); void slotStartDirLister(); void slotListCompleted(); void slotNewMessages(const KFileItemList &items); diff --git a/kopete/protocols/winpopup/wpeditaccount.cpp b/kopete/protocols/winpopup/wpeditaccount.cpp index 217ac462..0e0b6f43 100644 --- a/kopete/protocols/winpopup/wpeditaccount.cpp +++ b/kopete/protocols/winpopup/wpeditaccount.cpp @@ -58,9 +58,9 @@ WPEditAccount::WPEditAccount(TQWidget *parent, Kopete::Account *theAccount) mHostName->setText(account()->accountId()); // mAutoConnect->setChecked(account()->excludeConnect()); mHostName->setReadOnly(true); - KGlobal::config()->setGroup("WinPopup"); - mHostCheckFreq->setValue(KGlobal::config()->readNumEntry("HostCheckFreq", 60)); - mSmbcPath->setURL(KGlobal::config()->readEntry("SmbcPath", tmpSmbcPath)); + TDEGlobal::config()->setGroup("WinPopup"); + mHostCheckFreq->setValue(TDEGlobal::config()->readNumEntry("HostCheckFreq", 60)); + mSmbcPath->setURL(TDEGlobal::config()->readEntry("SmbcPath", tmpSmbcPath)); } else { @@ -112,9 +112,9 @@ bool WPEditAccount::validateData() void WPEditAccount::writeConfig() { - KGlobal::config()->setGroup("WinPopup"); - KGlobal::config()->writeEntry("SmbcPath", mSmbcPath->url()); - KGlobal::config()->writeEntry("HostCheckFreq", mHostCheckFreq->text()); + TDEGlobal::config()->setGroup("WinPopup"); + TDEGlobal::config()->writeEntry("SmbcPath", mSmbcPath->url()); + TDEGlobal::config()->writeEntry("HostCheckFreq", mHostCheckFreq->text()); } Kopete::Account *WPEditAccount::apply() diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp index 8e21a16d..5d4f708a 100644 --- a/kopete/protocols/winpopup/wpprotocol.cpp +++ b/kopete/protocols/winpopup/wpprotocol.cpp @@ -128,9 +128,9 @@ void WPProtocol::settingsChanged() void WPProtocol::readConfig() { - KGlobal::config()->setGroup("WinPopup"); - smbClientBin = KGlobal::config()->readEntry("SmbcPath", "/usr/bin/smbclient"); - groupCheckFreq = KGlobal::config()->readNumEntry("HostCheckFreq", 60); + TDEGlobal::config()->setGroup("WinPopup"); + smbClientBin = TDEGlobal::config()->readEntry("SmbcPath", "/usr/bin/smbclient"); + groupCheckFreq = TDEGlobal::config()->readNumEntry("HostCheckFreq", 60); } void WPProtocol::installSamba() diff --git a/kopete/protocols/winpopup/wpuserinfo.cpp b/kopete/protocols/winpopup/wpuserinfo.cpp index 162374b7..39651475 100644 --- a/kopete/protocols/winpopup/wpuserinfo.cpp +++ b/kopete/protocols/winpopup/wpuserinfo.cpp @@ -59,16 +59,16 @@ WPUserInfo::WPUserInfo( WPContact *contact, WPAccount */*account*/, TQWidget *pa // if we would do this in libwinpopup. GF void WPUserInfo::startDetailsProcess(const TQString &host) { - KGlobal::config()->setGroup("WinPopup"); - TQString theSMBClientPath = KGlobal::config()->readEntry("SMBClientPath", "/usr/bin/smbclient"); + TDEGlobal::config()->setGroup("WinPopup"); + TQString theSMBClientPath = TDEGlobal::config()->readEntry("SMBClientPath", "/usr/bin/smbclient"); KProcIO *details = new KProcIO; *details << theSMBClientPath << "-N" << "-E" << "-g" << "-L" << host << "-"; connect(details, TQT_SIGNAL(readReady(KProcIO *)), this, TQT_SLOT(slotDetailsProcessReady(KProcIO *))); - connect(details, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotDetailsProcessExited(KProcess *))); + connect(details, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotDetailsProcessExited(TDEProcess *))); - if (!details->start(KProcess::NotifyOnExit, KProcess::Stderr)) { + if (!details->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr)) { slotDetailsProcessExited(details); kdDebug(14170) << "DetailsProcess not started!" << endl; } @@ -91,7 +91,7 @@ void WPUserInfo::slotDetailsProcessReady(KProcIO *d) } } -void WPUserInfo::slotDetailsProcessExited(KProcess *d) +void WPUserInfo::slotDetailsProcessExited(TDEProcess *d) { delete d; diff --git a/kopete/protocols/winpopup/wpuserinfo.h b/kopete/protocols/winpopup/wpuserinfo.h index 09d2f332..f70f9c8d 100644 --- a/kopete/protocols/winpopup/wpuserinfo.h +++ b/kopete/protocols/winpopup/wpuserinfo.h @@ -43,7 +43,7 @@ class WPUserInfo : public KDialogBase private slots: void slotDetailsProcessReady(KProcIO *d); - void slotDetailsProcessExited(KProcess *d); + void slotDetailsProcessExited(TDEProcess *d); void slotCloseClicked(); signals: diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp index 90245b29..e90b45f2 100644 --- a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp @@ -470,11 +470,11 @@ void WebcamTask::parseData( TQByteArray &data, KStreamSocket *socket ) file->writeBlock((info->buffer->buffer()).data(), info->buffer->size()); file->close(); - KProcess p; + TDEProcess p; p << "jasper"; p << "--input" << jpcTmpImageFile.name() << "--output" << bmpTmpImageFile.name() << "--output-format" << "bmp"; - p.start( KProcess::Block ); + p.start( TDEProcess::Block ); if( p.exitStatus() != 0 ) { kdDebug(YAHOO_RAW_DEBUG) << " jasper exited with status " << p.exitStatus() << " " << info->sender << endl; diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp index 700c91e5..7b1839d4 100644 --- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp +++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp @@ -47,21 +47,21 @@ YahooUserInfoDialog::YahooUserInfoDialog( YahooContact *c, TQWidget * parent, co showButton( User2, false ); TQFrame* genInfo = addPage( i18n( "General Info" ), i18n( "General Yahoo Information" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "identity" ), KIcon::Desktop ) ); + TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "identity" ), KIcon::Desktop ) ); TQVBoxLayout* genLayout = new TQVBoxLayout( genInfo ); m_genInfoWidget = new YahooGeneralInfoWidget( genInfo, "Basic Information" ); genLayout->addWidget( m_genInfoWidget ); TQFrame* workInfo = addPage( i18n( "Work Info" ), i18n( "Work Information" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "attach" ), KIcon::Desktop ) ); + TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "attach" ), KIcon::Desktop ) ); TQVBoxLayout* workLayout = new TQVBoxLayout( workInfo ); m_workInfoWidget = new YahooWorkInfoWidget( workInfo, "Work Information" ); workLayout->addWidget( m_workInfoWidget ); TQFrame* otherInfo = addPage( i18n( "Other Info" ), i18n( "Other Yahoo Information" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) ); + TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) ); TQVBoxLayout* otherLayout = new TQVBoxLayout( otherInfo ); m_otherInfoWidget = new YahooOtherInfoWidget( otherInfo, "Other Information" ); otherLayout->addWidget( m_otherInfoWidget ); diff --git a/kopete/protocols/yahoo/yahoowebcam.cpp b/kopete/protocols/yahoo/yahoowebcam.cpp index 1e22b89c..0ddf8a45 100644 --- a/kopete/protocols/yahoo/yahoowebcam.cpp +++ b/kopete/protocols/yahoo/yahoowebcam.cpp @@ -97,12 +97,12 @@ void YahooWebcam::sendImage() m_img->save( origImg->name(), "JPEG"); - KProcess p; + TDEProcess p; p << "jasper"; p << "--input" << origImg->name() << "--output" << convertedImg->name() << "--output-format" << "jpc" << "-O" <<"cblkwidth=64\ncblkheight=64\nnumrlvls=4\nrate=0.0165\nprcheight=128\nprcwidth=2048\nmode=real"; - p.start( KProcess::Block ); + p.start( TDEProcess::Block ); if( p.exitStatus() != 0 ) { kdDebug(YAHOO_GEN_DEBUG) << " jasper exited with status " << p.exitStatus() << endl; |