diff options
Diffstat (limited to 'kopete/libkopete')
22 files changed, 60 insertions, 60 deletions
diff --git a/kopete/libkopete/knotification.cpp b/kopete/libkopete/knotification.cpp index ddda9bd7..68ef32fa 100644 --- a/kopete/libkopete/knotification.cpp +++ b/kopete/libkopete/knotification.cpp @@ -284,7 +284,7 @@ void KNotification::raiseWidget(TQWidget *w) } else { - TQWidget *pw=w->tqparentWidget(); + TQWidget *pw=w->parentWidget(); raiseWidget(pw); if( TQTabWidget *tab_widget=dynamic_cast<TQTabWidget*>(pw)) diff --git a/kopete/libkopete/kopeteaccount.cpp b/kopete/libkopete/kopeteaccount.cpp index 11f668d8..0477ccd3 100644 --- a/kopete/libkopete/kopeteaccount.cpp +++ b/kopete/libkopete/kopeteaccount.cpp @@ -278,42 +278,42 @@ Kopete::MetaContact* Account::addContact( const TQString &contactId, const TQStr } else { - // should we here add the contact to the tqparentContact if any? + // should we here add the contact to the parentContact if any? kdDebug( 14010 ) << k_funcinfo << "Contact already exists" << endl; } return c->metaContact(); } - MetaContact *tqparentContact = new MetaContact(); + MetaContact *parentContact = new MetaContact(); if(!displayName.isEmpty()) - tqparentContact->setDisplayName( displayName ); + parentContact->setDisplayName( displayName ); //Set it as a temporary contact if requested if ( isTemporary ) - tqparentContact->setTemporary( true ); + parentContact->setTemporary( true ); else - tqparentContact->addToGroup( group ); + parentContact->addToGroup( group ); if ( c ) { - c->setMetaContact( tqparentContact ); + c->setMetaContact( parentContact ); if ( mode == ChangeKABC ) { kdDebug( 14010 ) << k_funcinfo << " changing KABC" << endl; - KABCPersistence::self()->write( tqparentContact ); + KABCPersistence::self()->write( parentContact ); } } else { - if ( !createContact( contactId, tqparentContact ) ) + if ( !createContact( contactId, parentContact ) ) { - delete tqparentContact; + delete parentContact; return 0L; } } - ContactList::self()->addMetaContact( tqparentContact ); - return tqparentContact; + ContactList::self()->addMetaContact( parentContact ); + return parentContact; } bool Account::addContact(const TQString &contactId , MetaContact *tqparent, AddMode mode ) @@ -341,7 +341,7 @@ bool Account::addContact(const TQString &contactId , MetaContact *tqparent, AddM } else { - // should we here add the contact to the tqparentContact if any? + // should we here add the contact to the parentContact if any? kdDebug( 14010 ) << "Account::addContact: Contact already exists" << endl; } return false; //(the contact is not in the correct metacontact, so false) diff --git a/kopete/libkopete/kopeteaccount.h b/kopete/libkopete/kopeteaccount.h index 44f12eb1..205b795f 100644 --- a/kopete/libkopete/kopeteaccount.h +++ b/kopete/libkopete/kopeteaccount.h @@ -364,16 +364,16 @@ protected: * You shouldn't ever call this method yourself. To add contacts, use @ref addContact(). * * This method is called by @ref addContact(). In this method, you should create the - * new custom @ref Contact, using @p tqparentContact as the tqparent. + * new custom @ref Contact, using @p parentContact as the tqparent. * * If the metacontact is not temporary and the protocol supports it, you can add the * contact to the server. * * @param contactId the ID of the contact to create - * @param tqparentContact the metacontact to add this contact to + * @param parentContact the metacontact to add this contact to * @return @c true if creating the contact succeeded, @c false on failure. */ - virtual bool createContact( const TQString &contactId, MetaContact *tqparentContact ) =0; + virtual bool createContact( const TQString &contactId, MetaContact *parentContact ) =0; /** diff --git a/kopete/libkopete/kopetecontactlist.h b/kopete/libkopete/kopetecontactlist.h index a0b27ded..2357da53 100644 --- a/kopete/libkopete/kopetecontactlist.h +++ b/kopete/libkopete/kopetecontactlist.h @@ -346,7 +346,7 @@ public: //TODO I think all theses method should be moved to the decop interface. * Return all meta contacts with their current status * * FIXME: Do we *need* this one? Sounds error prone to me, because - * nicknames can contain tqparentheses too. - Martijn + * nicknames can contain parentheses too. - Martijn */ TQStringList contactStatuses() const; diff --git a/kopete/libkopete/kopetemimesourcefactory.cpp b/kopete/libkopete/kopetemimesourcefactory.cpp index ca50d514..962bc8ff 100644 --- a/kopete/libkopete/kopetemimesourcefactory.cpp +++ b/kopete/libkopete/kopetemimesourcefactory.cpp @@ -146,7 +146,7 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const * To find a valid KOS, we ask Kopete's account manager to locate an existing * account. We'll use the myself() instance of that account to reference its * current KOS object, which in turn has access to the global KOS icon cache. - * Note that if the cache has been tqinvalidated in the meantime, we'll just + * Note that if the cache has been invalidated in the meantime, we'll just * get an empty pixmap back. */ Account *account = AccountManager::self()->accounts().getFirst(); diff --git a/kopete/libkopete/kopeteonlinestatus.h b/kopete/libkopete/kopeteonlinestatus.h index a1296f17..34f0bc9c 100644 --- a/kopete/libkopete/kopeteonlinestatus.h +++ b/kopete/libkopete/kopeteonlinestatus.h @@ -332,7 +332,7 @@ public: * * You can access icons with this method that have previously been rendered * using mimeSourceFor(). Note that only a cache lookup will be done, so - * if the cache has been tqinvalidated due to a change of icon sets between + * if the cache has been invalidated due to a change of icon sets between * requesting the key (thus rendering the icon) and trying to access the * icon by key, an invalid pixmap will be returned. */ diff --git a/kopete/libkopete/kopetepluginmanager.cpp b/kopete/libkopete/kopetepluginmanager.cpp index d11e413b..06176178 100644 --- a/kopete/libkopete/kopetepluginmanager.cpp +++ b/kopete/libkopete/kopetepluginmanager.cpp @@ -465,7 +465,7 @@ Plugin* PluginManager::plugin( const TQString &_pluginId ) const { // Hack for compatibility with Plugin::pluginId(), which returns // classname() instead of the internal name. Changing that is not easy - // as it tqinvalidates the config file, the contact list, and most likely + // as it invalidates the config file, the contact list, and most likely // other code as well. // For now, just transform FooProtocol to kopete_foo. // FIXME: In the future we'll need to change this nevertheless to unify diff --git a/kopete/libkopete/networkstatuscommon.cpp b/kopete/libkopete/networkstatuscommon.cpp index acf53f96..ef6d488e 100644 --- a/kopete/libkopete/networkstatuscommon.cpp +++ b/kopete/libkopete/networkstatuscommon.cpp @@ -8,7 +8,7 @@ TQDataStream & operator<< ( TQDataStream & s, const NetworktqStatus::Properties s << (int)p.onDemandPolicy; s << p.service; s << ( p.internet ? 1 : 0 ); - s << p.nettqmasks; + s << p.netmasks; return s; } @@ -26,7 +26,7 @@ TQDataStream & operator>> ( TQDataStream & s, NetworktqStatus::Properties &p ) p.internet = true; else p.internet = false; - s >> p.nettqmasks; + s >> p.netmasks; kdDebug() << k_funcinfo << "enum converted status is: " << p.status << endl; return s; } diff --git a/kopete/libkopete/networkstatuscommon.h b/kopete/libkopete/networkstatuscommon.h index 81ac8350..1d36b5c0 100644 --- a/kopete/libkopete/networkstatuscommon.h +++ b/kopete/libkopete/networkstatuscommon.h @@ -19,8 +19,8 @@ namespace NetworktqStatus TQCString service; // indicate that the connection is to 'the internet' - similar to default gateway in routing bool internet; - // list of nettqmasks that the network connects to - overridden by above internet - TQStringList nettqmasks; + // list of netmasks that the network connects to - overridden by above internet + TQStringList netmasks; // for future expansion consider // EnumChargingModel - FlatRate, TimeCharge, VolumeCharged // EnumLinktqStatus - for WLANs - VPOOR, POOR, AVERAGE, GOOD, EXCELLENT diff --git a/kopete/libkopete/private/kopeteemoticons.cpp b/kopete/libkopete/private/kopeteemoticons.cpp index 1edede5d..9c41d44d 100644 --- a/kopete/libkopete/private/kopeteemoticons.cpp +++ b/kopete/libkopete/private/kopeteemoticons.cpp @@ -218,7 +218,7 @@ TQValueList<Emoticons::Token> Emoticons::tokenize( const TQString& message, uint // Search for where it ends if( htmlEnd == -1 ) { - // Aptqparently this HTML entity isn't ended, something is wrong, try skip the '&' + // Apparently this HTML entity isn't ended, something is wrong, try skip the '&' // and continue kdDebug( 14000 ) << k_funcinfo << "Broken HTML entity, trying to recover." << endl; inHTMLEntity = false; diff --git a/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp b/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp index 35dde6b8..f542d153 100644 --- a/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp +++ b/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp @@ -36,7 +36,7 @@ Account::~Account() } -bool Account::createContact( const TQString &contactId, Kopete::MetaContact *tqparentContact ) +bool Account::createContact( const TQString &contactId, Kopete::MetaContact *parentContact ) { return true; } diff --git a/kopete/libkopete/tests/mock/kopeteaccount_mock.h b/kopete/libkopete/tests/mock/kopeteaccount_mock.h index 93b1acdf..0f297a06 100644 --- a/kopete/libkopete/tests/mock/kopeteaccount_mock.h +++ b/kopete/libkopete/tests/mock/kopeteaccount_mock.h @@ -39,7 +39,7 @@ public: Account(Kopete::Protocol *tqparent, const TQString &accountID, const char *name=0L); ~Account(); // pure virtual functions implementation - virtual bool createContact( const TQString &contactId, MetaContact *tqparentContact ); + virtual bool createContact( const TQString &contactId, MetaContact *parentContact ); virtual void connect( const Kopete::OnlineStatus& initialtqStatus = OnlineStatus() ); virtual void disconnect(); virtual void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString() ); diff --git a/kopete/libkopete/ui/addressbooklinkwidget_base.ui b/kopete/libkopete/ui/addressbooklinkwidget_base.ui index 652e292a..8fc4c46f 100644 --- a/kopete/libkopete/ui/addressbooklinkwidget_base.ui +++ b/kopete/libkopete/ui/addressbooklinkwidget_base.ui @@ -70,7 +70,7 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kopete/libkopete/ui/addressbookselectorwidget_base.ui b/kopete/libkopete/ui/addressbookselectorwidget_base.ui index f67300df..276620be 100644 --- a/kopete/libkopete/ui/addressbookselectorwidget_base.ui +++ b/kopete/libkopete/ui/addressbookselectorwidget_base.ui @@ -165,8 +165,8 @@ <includes> <include location="global" impldecl="in declaration">klistviewsearchline.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kactivelabel.h</includehint> <includehint>klistview.h</includehint> diff --git a/kopete/libkopete/ui/contactaddednotifywidget.ui b/kopete/libkopete/ui/contactaddednotifywidget.ui index 6517c1e0..100e6eca 100644 --- a/kopete/libkopete/ui/contactaddednotifywidget.ui +++ b/kopete/libkopete/ui/contactaddednotifywidget.ui @@ -248,7 +248,7 @@ Leave it empty if you want to see the contact nickname as display name.</string> <header>addressbooklinkwidget.h</header> </customwidget> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kopete/libkopete/ui/fileconfirmbase.ui b/kopete/libkopete/ui/fileconfirmbase.ui index 412ea20e..cd91863d 100644 --- a/kopete/libkopete/ui/fileconfirmbase.ui +++ b/kopete/libkopete/ui/fileconfirmbase.ui @@ -140,7 +140,7 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kopete/libkopete/ui/kopeteawaydialogbase.ui b/kopete/libkopete/ui/kopeteawaydialogbase.ui index 26eb3590..be81b276 100644 --- a/kopete/libkopete/ui/kopeteawaydialogbase.ui +++ b/kopete/libkopete/ui/kopeteawaydialogbase.ui @@ -81,5 +81,5 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/libkopete/ui/kopetelistview.cpp b/kopete/libkopete/ui/kopetelistview.cpp index eb755f29..91b251a9 100644 --- a/kopete/libkopete/ui/kopetelistview.cpp +++ b/kopete/libkopete/ui/kopetelistview.cpp @@ -68,7 +68,7 @@ ToolTip::~ToolTip() void ToolTip::maybeTip( const TQPoint &pos ) { - if( !tqparentWidget() || !m_listView ) + if( !parentWidget() || !m_listView ) return; if( Item *item = dynamic_cast<Item*>( m_listView->itemAt( pos ) ) ) @@ -122,7 +122,7 @@ ListView::ListView( TQWidget *tqparent, const char *name ) // clear the appropriate flags from the viewport - qt docs say we have to tqmask // these flags out of the TQListView to make weirdly painted list items work, but - // that doesn't do the job. tqmasking them out of the viewport does. + // that doesn't do the job. masking them out of the viewport does. // class MyWidget : public TQWidget { public: using TQWidget::clearWFlags; }; // static_cast<MyWidget*>( viewport() )->clearWFlags( WStaticContents ); // static_cast<MyWidget*>( viewport() )->setWFlags( WNoAutoErase ); diff --git a/kopete/libkopete/ui/kopetelistviewitem.cpp b/kopete/libkopete/ui/kopetelistviewitem.cpp index 6e6aad72..1f23da15 100644 --- a/kopete/libkopete/ui/kopetelistviewitem.cpp +++ b/kopete/libkopete/ui/kopetelistviewitem.cpp @@ -1227,17 +1227,17 @@ class Item::Private { public: Private( Item *item ) - : tqlayoutAnimateTimer( theLayoutAnimateTimer(), item, TQT_SLOT( slotLayoutAnimateItems() ) ) + : layoutAnimateTimer( theLayoutAnimateTimer(), item, TQT_SLOT( slotLayoutAnimateItems() ) ) , animateLayout( true ), opacity( 1.0 ) , visibilityTimer( theVisibilityTimer(), item, TQT_SLOT( slotUpdateVisibility() ) ) , visibilityLevel( 0 ), visibilityTarget( false ), searchMatch( true ) { } - TQTimer tqlayoutTimer; + TQTimer layoutTimer; - //TQTimer tqlayoutAnimateTimer; - SharedTimerRef tqlayoutAnimateTimer; + //TQTimer layoutAnimateTimer; + SharedTimerRef layoutAnimateTimer; SharedTimer &theLayoutAnimateTimer() { static SharedTimer timer( 10 ); @@ -1245,8 +1245,8 @@ public: } bool animateLayout; - int tqlayoutAnimateSteps; - static const int tqlayoutAnimateStepsTotal = 10; + int layoutAnimateSteps; + static const int layoutAnimateStepsTotal = 10; float opacity; @@ -1306,8 +1306,8 @@ void Item::setEffects( bool animation, bool fading, bool folding ) void Item::initLVI() { connect( listView()->header(), TQT_SIGNAL( sizeChange( int, int, int ) ), TQT_SLOT( slotColumnResized() ) ); - connect( &d->tqlayoutTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutItems() ) ); - //connect( &d->tqlayoutAnimateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutAnimateItems() ) ); + connect( &d->layoutTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutItems() ) ); + //connect( &d->layoutAnimateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutAnimateItems() ) ); //connect( &d->visibilityTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotUpdateVisibility() ) ); setVisible( false ); setTargetVisibility( true ); @@ -1323,13 +1323,13 @@ void Item::slotColumnResized() void Item::scheduleLayout() { // perform a delayed tqlayout in order to speed it all up - if ( ! d->tqlayoutTimer.isActive() ) - d->tqlayoutTimer.start( 30, true ); + if ( ! d->layoutTimer.isActive() ) + d->layoutTimer.start( 30, true ); } void Item::slotLayoutItems() { - d->tqlayoutTimer.stop(); + d->layoutTimer.stop(); for ( uint n = 0; n < components(); ++n ) { @@ -1347,14 +1347,14 @@ void Item::slotLayoutItems() if ( Private::animateChanges && d->animateLayout && !d->visibilityTimer.isActive() ) { - d->tqlayoutAnimateTimer.start(); - //if ( !d->tqlayoutAnimateTimer.isActive() ) - // d->tqlayoutAnimateTimer.start( 10 ); - d->tqlayoutAnimateSteps = 0; + d->layoutAnimateTimer.start(); + //if ( !d->layoutAnimateTimer.isActive() ) + // d->layoutAnimateTimer.start( 10 ); + d->layoutAnimateSteps = 0; } else { - d->tqlayoutAnimateSteps = Private::tqlayoutAnimateStepsTotal; + d->layoutAnimateSteps = Private::layoutAnimateStepsTotal; d->animateLayout = true; } slotLayoutAnimateItems(); @@ -1362,11 +1362,11 @@ void Item::slotLayoutItems() void Item::slotLayoutAnimateItems() { - if ( ++d->tqlayoutAnimateSteps >= Private::tqlayoutAnimateStepsTotal ) - d->tqlayoutAnimateTimer.stop(); + if ( ++d->layoutAnimateSteps >= Private::layoutAnimateStepsTotal ) + d->layoutAnimateTimer.stop(); - const int s = Private::tqlayoutAnimateStepsTotal; - const int p = TQMIN( d->tqlayoutAnimateSteps, s ); + const int s = Private::layoutAnimateStepsTotal; + const int p = TQMIN( d->layoutAnimateSteps, s ); updateAnimationPosition( p, s ); setHeight(0); @@ -1457,7 +1457,7 @@ void Item::slotUpdateVisibility() void Item::tqrepaint() { // if we're about to retqlayout, don't bother painting yet. - if ( d->tqlayoutTimer.isActive() ) + if ( d->layoutTimer.isActive() ) return; listView()->repaintItem( this ); } diff --git a/kopete/libkopete/ui/kopetepassworddialog.ui b/kopete/libkopete/ui/kopetepassworddialog.ui index 40a94ca8..6007a139 100644 --- a/kopete/libkopete/ui/kopetepassworddialog.ui +++ b/kopete/libkopete/ui/kopetepassworddialog.ui @@ -105,5 +105,5 @@ <tabstop>m_password</tabstop> <tabstop>m_save_passwd</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/libkopete/ui/kopetepasswordwidgetbase.ui b/kopete/libkopete/ui/kopetepasswordwidgetbase.ui index ecdfda7a..468efd56 100644 --- a/kopete/libkopete/ui/kopetepasswordwidgetbase.ui +++ b/kopete/libkopete/ui/kopetepasswordwidgetbase.ui @@ -91,7 +91,7 @@ <tabstops> <tabstop>mRemembered</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpassdlg.h</includehint> </includehints> diff --git a/kopete/libkopete/ui/metacontactselectorwidget_base.ui b/kopete/libkopete/ui/metacontactselectorwidget_base.ui index 1fd35317..52d946b9 100644 --- a/kopete/libkopete/ui/metacontactselectorwidget_base.ui +++ b/kopete/libkopete/ui/metacontactselectorwidget_base.ui @@ -97,8 +97,8 @@ <include location="local" impldecl="in declaration">kopetelistview.h</include> <include location="global" impldecl="in declaration">tqheader.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kactivelabel.h</includehint> <includehint>kopetelistviewsearchline.h</includehint> |