From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001
From: tpearson
Date: Wed, 13 Apr 2011 00:46:47 +0000
Subject: Initial conversion of kdepim to TQt This will probably require some
tweaking before it will build under Qt4, however Qt3 builds are OK. Any
alterations this commit makes to kdepim behaviour under Qt3 are unintentional
and should be fixed.
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
libkdepim/addresseediffalgo.cpp | 4 +-
libkdepim/addresseeemailselection.cpp | 4 +-
libkdepim/addresseelineedit.cpp | 42 +++----
libkdepim/addresseelineedit.h | 5 +-
libkdepim/addresseeselector.cpp | 20 ++--
libkdepim/addresseeselector.h | 8 +-
libkdepim/addresseeview.cpp | 22 ++--
libkdepim/addresseeview.h | 3 +-
libkdepim/addressesdialog.cpp | 90 +++++++-------
libkdepim/addressesdialog.h | 14 ++-
libkdepim/addresspicker.ui | 18 +--
libkdepim/broadcaststatus.cpp | 28 ++---
libkdepim/broadcaststatus.h | 11 +-
libkdepim/calendardiffalgo.cpp | 12 +-
libkdepim/categoryeditdialog.cpp | 6 +-
libkdepim/categoryeditdialog.h | 3 +-
libkdepim/categoryeditdialog_base.ui | 12 +-
libkdepim/categoryselectdialog.cpp | 6 +-
libkdepim/categoryselectdialog.h | 3 +-
libkdepim/categoryselectdialog_base.ui | 10 +-
libkdepim/cfgc/example.cfg | 4 +-
libkdepim/cfgc/general_base.ui | 8 +-
libkdepim/cfgc/myoptions_base.ui | 6 +-
libkdepim/clicklineedit.cpp | 4 +-
libkdepim/clicklineedit.h | 7 +-
libkdepim/collectingprocess.cpp | 10 +-
libkdepim/collectingprocess.h | 9 +-
libkdepim/completionordereditor.cpp | 14 +--
libkdepim/completionordereditor.h | 9 +-
libkdepim/configmanager.cpp | 4 +-
libkdepim/configmanager.h | 3 +-
libkdepim/csshelper.cpp | 8 +-
libkdepim/csshelper.h | 6 +-
libkdepim/designerfields.cpp | 34 +++---
libkdepim/designerfields.h | 5 +-
libkdepim/diffalgo.cpp | 2 +-
libkdepim/distributionlist.cpp | 16 +--
libkdepim/distributionlist.h | 8 +-
libkdepim/embeddedurlpage.cpp | 8 +-
libkdepim/embeddedurlpage.h | 5 +-
libkdepim/htmldiffalgodisplay.cpp | 4 +-
libkdepim/htmldiffalgodisplay.h | 2 +-
libkdepim/infoextension.cpp | 4 +-
libkdepim/infoextension.h | 7 +-
libkdepim/kabcresourcecached.cpp | 4 +-
libkdepim/kabcresourcecached.h | 1 +
libkdepim/kaccount.cpp | 6 +-
libkdepim/kaccount.h | 12 +-
libkdepim/kaddrbook.cpp | 30 ++---
libkdepim/kaddrbook.h | 8 +-
libkdepim/kcmdesignerfields.cpp | 48 ++++----
libkdepim/kcmdesignerfields.h | 3 +-
libkdepim/kconfigpropagator.cpp | 6 +-
libkdepim/kconfigpropagator.h | 4 +-
libkdepim/kconfigwizard.cpp | 8 +-
libkdepim/kconfigwizard.h | 9 +-
libkdepim/kdateedit.cpp | 38 +++---
libkdepim/kdateedit.h | 7 +-
libkdepim/kdatepickerpopup.cpp | 4 +-
libkdepim/kdatepickerpopup.h | 7 +-
libkdepim/kdepim.widgets | 2 +-
libkdepim/kfileio.cpp | 10 +-
libkdepim/kfileio.h | 8 +-
libkdepim/kfoldertree.cpp | 24 ++--
libkdepim/kfoldertree.h | 11 +-
libkdepim/kimportdialog.cpp | 36 +++---
libkdepim/kimportdialog.h | 3 +-
libkdepim/kincidencechooser.cpp | 10 +-
libkdepim/kincidencechooser.h | 7 +-
libkdepim/kmailcompletion.cpp | 12 +-
libkdepim/kmailcompletion.h | 5 +-
libkdepim/komposer/core/attachment.cpp | 16 +--
libkdepim/komposer/core/core.cpp | 6 +-
libkdepim/komposer/core/core.h | 1 +
libkdepim/komposer/core/corewidget.cpp | 4 +-
libkdepim/komposer/core/corewidget.h | 5 +-
libkdepim/komposer/core/editor.cpp | 4 +-
libkdepim/komposer/core/editor.h | 3 +-
libkdepim/komposer/core/plugin.cpp | 4 +-
libkdepim/komposer/core/plugin.h | 3 +-
libkdepim/komposer/core/pluginmanager.cpp | 10 +-
libkdepim/komposer/core/pluginmanager.h | 7 +-
libkdepim/komposer/core/prefsmodule.cpp | 14 +--
libkdepim/komposer/core/prefsmodule.h | 6 +-
libkdepim/komposer/core/tests/managertest.cpp | 4 +-
libkdepim/komposer/core/tests/managertest.h | 3 +-
libkdepim/komposer/core/tests/tester.cpp | 4 +-
libkdepim/komposer/core/tests/testmanager.cpp | 4 +-
libkdepim/komposer/core/tests/testmanager.h | 5 +-
.../komposer/plugins/default/defaulteditor.cpp | 8 +-
libkdepim/komposer/plugins/default/defaulteditor.h | 3 +-
.../komposer/plugins/default/defaulteditorui.rc | 2 +-
.../kpartsdesignerplugin/kpartsdesignerplugin.cpp | 28 ++---
.../kpartsdesignerplugin/kpartsdesignerplugin.h | 9 +-
libkdepim/kpimprefs.cpp | 2 +-
libkdepim/kpimprefs.h | 2 +-
libkdepim/kpimurlrequesterdlg.cpp | 4 +-
libkdepim/kpimurlrequesterdlg.h | 10 +-
libkdepim/kpixmapregionselectordialog.cpp | 20 ++--
libkdepim/kpixmapregionselectordialog.h | 10 +-
libkdepim/kpixmapregionselectorwidget.cpp | 16 +--
libkdepim/kpixmapregionselectorwidget.h | 5 +-
libkdepim/kprefsdialog.cpp | 132 ++++++++++-----------
libkdepim/kprefsdialog.h | 121 ++++++++++---------
libkdepim/kregexp3.cpp | 28 ++---
libkdepim/kregexp3.h | 38 +++---
libkdepim/kresourceprefs.h | 2 +-
libkdepim/krsqueezedtextlabel.cpp | 8 +-
libkdepim/krsqueezedtextlabel.h | 15 +--
libkdepim/kscoring.cpp | 26 ++--
libkdepim/kscoring.h | 8 +-
libkdepim/kscoringeditor.cpp | 28 ++---
libkdepim/kscoringeditor.h | 27 +++--
libkdepim/ksubscription.cpp | 30 ++---
libkdepim/ksubscription.h | 29 ++---
libkdepim/ktimeedit.cpp | 16 +--
libkdepim/ktimeedit.h | 9 +-
libkdepim/kvcarddrag.cpp | 2 +-
libkdepim/kvcarddrag.h | 7 +-
libkdepim/kwidgetlister.cpp | 22 ++--
libkdepim/kwidgetlister.h | 17 +--
libkdepim/kxface.cpp | 6 +-
libkdepim/kxface.h | 3 +-
libkdepim/ldapclient.cpp | 14 +--
libkdepim/ldapclient.h | 10 +-
libkdepim/ldapsearchdialog.cpp | 16 +--
libkdepim/ldapsearchdialog.h | 3 +-
libkdepim/linklocator.cpp | 34 +++---
libkdepim/linklocator.h | 4 +-
libkdepim/maillistdrag.cpp | 6 +-
libkdepim/maillistdrag.h | 4 +-
libkdepim/overlaywidget.cpp | 10 +-
libkdepim/overlaywidget.h | 11 +-
libkdepim/pluginloader.h | 2 +-
libkdepim/progressdialog.cpp | 70 +++++------
libkdepim/progressdialog.h | 21 ++--
libkdepim/progressmanager.cpp | 36 +++---
libkdepim/progressmanager.h | 62 +++++-----
libkdepim/qutf7codec.cpp | 54 ++++-----
libkdepim/qutf7codec.h | 30 +++--
libkdepim/qutf7codecplugin.cpp | 20 ++--
libkdepim/recentaddresses.cpp | 10 +-
libkdepim/recentaddresses.h | 8 +-
libkdepim/resourceabc.cpp | 4 +-
libkdepim/resourceabc.h | 5 +-
libkdepim/sendsmsdialog.cpp | 6 +-
libkdepim/sendsmsdialog.h | 3 +-
libkdepim/sidebarextension.cpp | 4 +-
libkdepim/sidebarextension.h | 7 +-
libkdepim/spellingfilter.cpp | 4 +-
libkdepim/ssllabel.cpp | 10 +-
libkdepim/ssllabel.h | 10 +-
libkdepim/statusbarprogresswidget.cpp | 16 +--
libkdepim/statusbarprogresswidget.h | 9 +-
libkdepim/tests/testdateedit.cpp | 4 +-
libkdepim/tests/testdateedit.h | 5 +-
libkdepim/tests/testdistrlist.cpp | 10 +-
libkdepim/tests/testdistrlist.h | 3 +-
libkdepim/tests/testutf7decoder.cpp | 2 +-
libkdepim/tests/testutf7encoder.cpp | 2 +-
libkdepim/tests/testutf7encoder2.cpp | 2 +-
libkdepim/weaver.cpp | 20 ++--
libkdepim/weaver.h | 24 ++--
libkdepim/weaverextensions.cpp | 6 +-
libkdepim/weaverextensions.h | 7 +-
libkdepim/weaverlogger.cpp | 6 +-
libkdepim/weaverlogger.h | 5 +-
167 files changed, 1151 insertions(+), 1075 deletions(-)
(limited to 'libkdepim')
diff --git a/libkdepim/addresseediffalgo.cpp b/libkdepim/addresseediffalgo.cpp
index 361ec631f..1de2dddcc 100644
--- a/libkdepim/addresseediffalgo.cpp
+++ b/libkdepim/addresseediffalgo.cpp
@@ -135,12 +135,12 @@ void AddresseeDiffAlgo::diffList( const TQString &id,
const TQValueList &left, const TQValueList &right )
{
for ( uint i = 0; i < left.count(); ++i ) {
- if ( right.find( left[ i ] ) == right.end() )
+ if ( right.tqfind( left[ i ] ) == right.end() )
additionalLeftField( id, toString( left[ i ] ) );
}
for ( uint i = 0; i < right.count(); ++i ) {
- if ( left.find( right[ i ] ) == left.end() )
+ if ( left.tqfind( right[ i ] ) == left.end() )
additionalRightField( id, toString( right[ i ] ) );
}
}
diff --git a/libkdepim/addresseeemailselection.cpp b/libkdepim/addresseeemailselection.cpp
index f9f101607..481fc1554 100644
--- a/libkdepim/addresseeemailselection.cpp
+++ b/libkdepim/addresseeemailselection.cpp
@@ -53,7 +53,7 @@ TQString AddresseeEmailSelection::fieldTitle( uint index ) const
return i18n( "Bcc" );
break;
default:
- return TQString::null;
+ return TQString();
}
}
@@ -195,7 +195,7 @@ TQString AddresseeEmailSelection::addressBookTitle( uint index ) const
if ( index == 0 )
return i18n( "Recent Addresses" );
else
- return TQString::null;
+ return TQString();
}
KABC::Addressee::List AddresseeEmailSelection::addressBookContent( uint index ) const
diff --git a/libkdepim/addresseelineedit.cpp b/libkdepim/addresseelineedit.cpp
index 243b66086..0d86fad44 100644
--- a/libkdepim/addresseelineedit.cpp
+++ b/libkdepim/addresseelineedit.cpp
@@ -109,9 +109,9 @@ static bool itemIsHeader( const TQListBoxItem* item )
-AddresseeLineEdit::AddresseeLineEdit( TQWidget* parent, bool useCompletion,
+AddresseeLineEdit::AddresseeLineEdit( TQWidget* tqparent, bool useCompletion,
const char *name )
- : ClickLineEdit( parent, TQString::null, name ), DCOPObject( newLineEditDCOPObjectName() ),
+ : ClickLineEdit( tqparent, TQString(), name ), DCOPObject( newLineEditDCOPObjectName() ),
m_useSemiColonAsSeparator( false ), m_allowDistLists( true )
{
m_useCompletion = useCompletion;
@@ -285,12 +285,12 @@ void AddresseeLineEdit::insert( const TQString &t )
KURL url( newText );
newText = url.path();
}
- else if ( newText.find(" at ") != -1 ) {
+ else if ( newText.tqfind(" at ") != -1 ) {
// Anti-spam stuff
newText.tqreplace( " at ", "@" );
newText.tqreplace( " dot ", "." );
}
- else if ( newText.find("(at)") != -1 ) {
+ else if ( newText.tqfind("(at)") != -1 ) {
newText.tqreplace( TQRegExp("\\s*\\(at\\)\\s*"), "@" );
}
@@ -310,7 +310,7 @@ void AddresseeLineEdit::insert( const TQString &t )
eot--;
}
if ( eot == 0 ) {
- contents = TQString::null;
+ contents = TQString();
} else if ( pos >= eot ) {
if ( contents[ eot - 1 ] == ',' ) {
eot--;
@@ -365,7 +365,7 @@ void AddresseeLineEdit::dropEvent( TQDropEvent *e )
while ( ( eot > 0 ) && contents[ eot - 1 ].isSpace() )
eot--;
if ( eot == 0 )
- contents = TQString::null;
+ contents = TQString();
else if ( contents[ eot - 1 ] == ',' ) {
eot--;
contents.truncate( eot );
@@ -388,7 +388,7 @@ void AddresseeLineEdit::dropEvent( TQDropEvent *e )
return;
}
} else {
- // Let's see if this drop tqcontains a comma separated list of emails
+ // Let's see if this drop contains a comma separated list of emails
TQString dropData = TQString::fromUtf8( e->tqencodedData( "text/plain" ) );
TQStringList addrs = splitEmailAddrList( dropData );
if ( addrs.count() > 0 ) {
@@ -482,7 +482,7 @@ void AddresseeLineEdit::doCompletion( bool ctrlT )
//if only our \" is left, remove it since user has not typed it either
if ( m_searchExtended && m_searchString == "\"" ){
m_searchExtended = false;
- m_searchString = TQString::null;
+ m_searchString = TQString();
setText( m_previousAddresses );
break;
}
@@ -567,7 +567,7 @@ void AddresseeLineEdit::loadContacts()
KABC::Resource::Iterator it;
for ( it = resource->begin(); it != resource->end(); ++it ) {
TQString uid = (*it).uid();
- TQMap::const_iterator wit = uidToResourceMap.find( uid );
+ TQMap::const_iterator wit = uidToResourceMap.tqfind( uid );
const TQString subresourceLabel = resabc->subresourceLabel( *wit );
const int weight = ( wit != uidToResourceMap.end() ) ? resabc->subresourceCompletionWeight( *wit ) : 80;
const int idx = addCompletionSource( subresourceLabel, weight );
@@ -641,7 +641,7 @@ void AddresseeLineEdit::addContact( const KABC::Addressee& addr, int weight, int
const TQString givenName = addr.givenName();
const TQString familyName= addr.familyName();
const TQString nickName = addr.nickName();
- const TQString domain = email.mid( email.find( '@' ) + 1 );
+ const TQString domain = email.mid( email.tqfind( '@' ) + 1 );
TQString fullEmail = addr.fullEmail( email );
//TODO: let user decide what fields to use in lookup, e.g. company, city, ...
@@ -757,10 +757,10 @@ void AddresseeLineEdit::addContact( const KABC::Addressee& addr, int weight, int
void AddresseeLineEdit::addCompletionItem( const TQString& string, int weight, int completionItemSource, const TQStringList * keyWords )
{
// Check if there is an exact match for item already, and use the max weight if so.
- // Since there's no way to get the information from KCompletion, we have to keep our own QMap
- CompletionItemsMap::iterator it = s_completionItemMap->find( string );
+ // Since there's no way to get the information from KCompletion, we have to keep our own TQMap
+ CompletionItemsMap::iterator it = s_completionItemMap->tqfind( string );
if ( it != s_completionItemMap->end() ) {
- weight = QMAX( ( *it ).first, weight );
+ weight = TQMAX( ( *it ).first, weight );
( *it ).first = weight;
} else {
s_completionItemMap->insert( string, qMakePair( weight, completionItemSource ) );
@@ -900,7 +900,7 @@ void AddresseeLineEdit::setCompletedItems( const TQStringList& items, bool autoS
if ( autoSuggest )
{
- int index = items.first().find( m_searchString );
+ int index = items.first().tqfind( m_searchString );
TQString newText = items.first().mid( index );
setUserSelection(false);
setCompletedText(newText,true);
@@ -991,7 +991,7 @@ void AddresseeLineEdit::updateSearchString()
m_previousAddresses = m_searchString.left( n );
m_searchString = m_searchString.mid( n ).stripWhiteSpace();
} else {
- m_previousAddresses = TQString::null;
+ m_previousAddresses = TQString();
}
}
@@ -1020,7 +1020,7 @@ KCompletion::CompOrder KPIM::AddresseeLineEdit::completionOrder()
int KPIM::AddresseeLineEdit::addCompletionSource( const TQString &source, int weight )
{
- TQMap::iterator it = s_completionSourceWeights->find( source );
+ TQMap::iterator it = s_completionSourceWeights->tqfind( source );
if ( it == s_completionSourceWeights->end() )
s_completionSourceWeights->insert( source, weight );
else
@@ -1047,7 +1047,7 @@ bool KPIM::AddresseeLineEdit::eventFilter(TQObject *obj, TQEvent *e)
TQListBoxItem *item = completionBox()->itemAt( me->pos() );
if ( !item ) {
// In the case of a mouse move outside of the box we don't want
- // the parent to fuzzy select a header by mistake.
+ // the tqparent to fuzzy select a header by mistake.
bool eat = e->type() == TQEvent::MouseMove;
return eat;
}
@@ -1061,7 +1061,7 @@ bool KPIM::AddresseeLineEdit::eventFilter(TQObject *obj, TQEvent *e)
} else {
// if we are not on one of the group heading, make sure the item
// below or above is selected, not the heading, inadvertedly, due
- // to fuzzy auto-selection from QListBox
+ // to fuzzy auto-selection from TQListBox
completionBox()->setCurrentItem( item );
completionBox()->setSelected( completionBox()->index( item ), true );
if ( e->type() == TQEvent::MouseMove )
@@ -1145,7 +1145,7 @@ bool KPIM::AddresseeLineEdit::eventFilter(TQObject *obj, TQEvent *e)
/// first, find the header of the current section
TQListBoxItem *myHeader = 0;
const int iterationstep = ke->key() == Key_Tab ? 1 : -1;
- int i = QMIN( QMAX( currentIndex - iterationstep, 0 ), completionBox()->count() - 1 );
+ int i = TQMIN( TQMAX( currentIndex - iterationstep, 0 ), completionBox()->count() - 1 );
while ( i>=0 ) {
if ( itemIsHeader( completionBox()->item(i) ) ) {
myHeader = completionBox()->item( i );
@@ -1228,7 +1228,7 @@ const TQStringList KPIM::AddresseeLineEdit::getAdjustedCompletionItems( bool ful
TQMap sections;
TQStringList sortedItems;
for ( TQStringList::Iterator it = items.begin(); it != items.end(); ++it, ++i ) {
- CompletionItemsMap::const_iterator cit = s_completionItemMap->find(*it);
+ CompletionItemsMap::const_iterator cit = s_completionItemMap->tqfind(*it);
if ( cit == s_completionItemMap->end() )
continue;
int idx = (*cit).second;
@@ -1236,7 +1236,7 @@ const TQStringList KPIM::AddresseeLineEdit::getAdjustedCompletionItems( bool ful
if ( s_completion->order() == KCompletion::Weighted ) {
if ( lastSourceIndex == -1 || lastSourceIndex != idx ) {
const TQString sourceLabel( (*s_completionSources)[idx] );
- if ( sections.find(idx) == sections.end() ) {
+ if ( sections.tqfind(idx) == sections.end() ) {
items.insert( it, sourceLabel );
}
lastSourceIndex = idx;
diff --git a/libkdepim/addresseelineedit.h b/libkdepim/addresseelineedit.h
index 86d8d8db2..416af1671 100644
--- a/libkdepim/addresseelineedit.h
+++ b/libkdepim/addresseelineedit.h
@@ -45,7 +45,7 @@ namespace KPIM {
class LdapSearch;
class LdapResult;
typedef TQValueList LdapResultList;
-typedef TQMap< TQString, QPair > CompletionItemsMap;
+typedef TQMap< TQString, TQPair > CompletionItemsMap;
}
namespace KPIM {
@@ -54,9 +54,10 @@ class KDE_EXPORT AddresseeLineEdit : public ClickLineEdit, public DCOPObject
{
K_DCOP
Q_OBJECT
+ TQ_OBJECT
public:
- AddresseeLineEdit( TQWidget* parent, bool useCompletion = true,
+ AddresseeLineEdit( TQWidget* tqparent, bool useCompletion = true,
const char *name = 0L);
virtual ~AddresseeLineEdit();
diff --git a/libkdepim/addresseeselector.cpp b/libkdepim/addresseeselector.cpp
index 65e34985d..c7e378179 100644
--- a/libkdepim/addresseeselector.cpp
+++ b/libkdepim/addresseeselector.cpp
@@ -79,7 +79,7 @@ TQStringList AddresseeSelector::AddressBookManager::titles() const
void AddresseeSelector::AddressBookManager::addResource( KABC::Resource *resource )
{
- if ( mResources.find( resource ) == mResources.end() )
+ if ( mResources.tqfind( resource ) == mResources.end() )
mResources.append( resource );
}
@@ -184,12 +184,12 @@ uint SelectionItem::index() const
}
-class SelectionViewItem : public QListViewItem
+class SelectionViewItem : public TQListViewItem
{
public:
- SelectionViewItem( TQListView *parent, Selection *selection,
+ SelectionViewItem( TQListView *tqparent, Selection *selection,
SelectionItem *item )
- : TQListViewItem( parent, "" ), mSelection( selection ), mItem( item )
+ : TQListViewItem( tqparent, "" ), mSelection( selection ), mItem( item )
{
if ( mItem->distributionList() == 0 )
mIcon = mSelection->itemIcon( mItem->addressee(), mItem->index() );
@@ -205,7 +205,7 @@ class SelectionViewItem : public QListViewItem
else
return mSelection->distributionListText( mItem->distributionList() );
} else
- return TQString::null;
+ return TQString();
}
const TQPixmap* pixmap( int column ) const
@@ -224,8 +224,8 @@ class SelectionViewItem : public QListViewItem
TQPixmap mIcon;
};
-AddresseeSelector::AddresseeSelector( Selection *selection, TQWidget *parent, const char *name )
- : TQWidget( parent, name ), mSelection( selection ), mManager( 0 )
+AddresseeSelector::AddresseeSelector( Selection *selection, TQWidget *tqparent, const char *name )
+ : TQWidget( tqparent, name ), mSelection( selection ), mManager( 0 )
{
mMoveMapper = new TQSignalMapper( this );
mRemoveMapper = new TQSignalMapper( this );
@@ -303,7 +303,7 @@ void AddresseeSelector::initGUI()
mRemoveMapper->setMapping( listView, i );
TQVBoxLayout *buttonLayout = new TQVBoxLayout( this );
- buttonLayout->tqsetAlignment( Qt::AlignBottom );
+ buttonLayout->tqsetAlignment( TQt::AlignBottom );
tqlayout->addLayout( buttonLayout, row, 1 );
// move button
@@ -561,8 +561,8 @@ void AddresseeSelector::reloadAddressBook()
AddresseeSelectorDialog::AddresseeSelectorDialog( Selection *selection,
- TQWidget *parent, const char *name )
- : KDialogBase( Plain, "", Ok | Cancel, Ok, parent, name, true )
+ TQWidget *tqparent, const char *name )
+ : KDialogBase( Plain, "", Ok | Cancel, Ok, tqparent, name, true )
{
TQFrame *frame = plainPage();
TQVBoxLayout *tqlayout = new TQVBoxLayout( frame );
diff --git a/libkdepim/addresseeselector.h b/libkdepim/addresseeselector.h
index e566d4e5e..2b4771a19 100644
--- a/libkdepim/addresseeselector.h
+++ b/libkdepim/addresseeselector.h
@@ -163,13 +163,14 @@ class SelectionItem
TQBitArray mField;
};
-class KDE_EXPORT AddresseeSelector : public QWidget
+class KDE_EXPORT AddresseeSelector : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
AddresseeSelector( Selection *selection,
- TQWidget *parent, const char *name = 0 );
+ TQWidget *tqparent, const char *name = 0 );
~AddresseeSelector();
/**
@@ -215,10 +216,11 @@ class KDE_EXPORT AddresseeSelector : public QWidget
class KDE_EXPORT AddresseeSelectorDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
AddresseeSelectorDialog( Selection *selection,
- TQWidget *parent = 0, const char *name = 0 );
+ TQWidget *tqparent = 0, const char *name = 0 );
protected slots:
void accept();
diff --git a/libkdepim/addresseeview.cpp b/libkdepim/addresseeview.cpp
index d5b3e6e27..d8ead42b2 100644
--- a/libkdepim/addresseeview.cpp
+++ b/libkdepim/addresseeview.cpp
@@ -50,9 +50,9 @@
using namespace KPIM;
-AddresseeView::AddresseeView( TQWidget *parent, const char *name,
+AddresseeView::AddresseeView( TQWidget *tqparent, const char *name,
KConfig *config )
- : KTextBrowser( parent, name ), mDefaultConfig( false ), mImageJob( 0 ),
+ : KTextBrowser( tqparent, name ), mDefaultConfig( false ), mImageJob( 0 ),
mLinkMask( AddressLinks | EmailLinks | PhoneLinks | URLLinks | IMLinks | CustomFields )
{
setWrapPolicy( TQTextEdit::AtWordBoundary );
@@ -359,7 +359,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
customEntry.remove( "KADDRESSBOOK-X-" );
customEntry.remove( "KADDRESSBOOK-" );
- int pos = customEntry.find( ':' );
+ int pos = customEntry.tqfind( ':' );
TQString key = customEntry.left( pos );
const TQString value = customEntry.mid( pos + 1 );
@@ -367,7 +367,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
if ( key == "BlogFeed" || key == "IMAddress" )
continue;
- const TQMap::ConstIterator keyIt = titleMap.find( key );
+ const TQMap::ConstIterator keyIt = titleMap.tqfind( key );
if ( keyIt != titleMap.end() )
key = keyIt.data();
@@ -399,16 +399,16 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
imgSrc = pixmapAsDataUrl( proxy->presenceIcon( addr.uid() ) );
// make the status a link, if required
- TQString imStatus;
+ TQString imtqStatus;
if ( linkMask & IMLinks )
- imStatus = TQString::tqfromLatin1( " (%2)" );
+ imtqStatus = TQString::tqfromLatin1( " (%2)" );
else
- imStatus = TQString::tqfromLatin1( " (%2)" );
+ imtqStatus = TQString::tqfromLatin1( " (%2)" );
// append our status to the rest of the dynamic part of the addressee
dynamicPart += rowFmtStr
.arg( i18n( "Presence" ) )
- .arg( imStatus
+ .arg( imtqStatus
.arg( imgSrc )
.arg( proxy->presenceString( addr.uid() ) )
);
@@ -495,7 +495,7 @@ TQString AddresseeView::pixmapAsDataUrl( const TQPixmap& pixmap )
void AddresseeView::updateView()
{
// clear view
- setText( TQString::null );
+ setText( TQString() );
if ( mAddressee.isEmpty() )
return;
@@ -575,9 +575,9 @@ void AddresseeView::urlClicked( const TQString &url )
void AddresseeView::emailClicked( const TQString &email )
{
if ( email.startsWith( "mailto:" ) )
- kapp->invokeMailer( email.mid( 7 ), TQString::null );
+ kapp->invokeMailer( email.mid( 7 ), TQString() );
else
- kapp->invokeMailer( email, TQString::null );
+ kapp->invokeMailer( email, TQString() );
}
void AddresseeView::phoneNumberClicked( const TQString &number )
diff --git a/libkdepim/addresseeview.h b/libkdepim/addresseeview.h
index 74c3a657b..09e17887d 100644
--- a/libkdepim/addresseeview.h
+++ b/libkdepim/addresseeview.h
@@ -43,6 +43,7 @@ namespace KPIM {
class KDE_EXPORT AddresseeView : public KTextBrowser
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
Constructor.
@@ -50,7 +51,7 @@ class KDE_EXPORT AddresseeView : public KTextBrowser
@param config The config object where the settings are stored
which fields will be shown.
*/
- AddresseeView( TQWidget *parent = 0, const char *name = 0,
+ AddresseeView( TQWidget *tqparent = 0, const char *name = 0,
KConfig *config = 0 );
~AddresseeView();
diff --git a/libkdepim/addressesdialog.cpp b/libkdepim/addressesdialog.cpp
index 5807b0d68..b7bea2369 100644
--- a/libkdepim/addressesdialog.cpp
+++ b/libkdepim/addressesdialog.cpp
@@ -91,9 +91,9 @@ struct AddressesDialog::AddressesDialogPrivate {
};
// privates end
-AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const KABC::Addressee& addr,
+AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *tqparent, const KABC::Addressee& addr,
int emailIndex )
- : TQObject( 0 ), KListViewItem( parent, addr.realName(),
+ : TQObject( 0 ), KListViewItem( tqparent, addr.realName(),
( emailIndex == 0 ? addr.preferredEmail() : addr.emails()[ emailIndex ] ) )
{
d = new AddresseeViewItemPrivate;
@@ -120,17 +120,17 @@ AddresseeViewItem::AddresseeViewItem( KListView *lv, const TQString& name, Categ
d->category = cat;
}
-AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const TQString& name,
+AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *tqparent, const TQString& name,
const KABC::Addressee::List &lst )
- : TQObject(0), KListViewItem( parent, name, i18n("") )
+ : TQObject(0), KListViewItem( tqparent, name, i18n("") )
{
d = new AddresseeViewItemPrivate;
d->category = FilledGroup;
d->addresses = lst;
}
-AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const TQString& name )
- : TQObject(0), KListViewItem( parent, name, i18n("") )
+AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *tqparent, const TQString& name )
+ : TQObject(0), KListViewItem( tqparent, name, i18n("") )
{
d = new AddresseeViewItemPrivate;
d->category = DistList;
@@ -162,13 +162,13 @@ AddresseeViewItem::category() const
return d->category;
}
-QString
+TQString
AddresseeViewItem::name() const
{
return text(0);
}
-QString
+TQString
AddresseeViewItem::email() const
{
return text(1);
@@ -353,7 +353,7 @@ AddressesDialog::setShowBCC( bool b )
d->ui->mBCCButton->setShown( b );
}
-QStringList
+TQStringList
AddressesDialog::to() const
{
TQStringList emails = allDistributionLists( d->toItem );
@@ -363,7 +363,7 @@ AddressesDialog::to() const
return emails;
}
-QStringList
+TQStringList
AddressesDialog::cc() const
{
TQStringList emails = allDistributionLists( d->ccItem );
@@ -373,7 +373,7 @@ AddressesDialog::cc() const
return emails;
}
-QStringList
+TQStringList
AddressesDialog::bcc() const
{
TQStringList emails = allDistributionLists( d->bccItem );
@@ -402,7 +402,7 @@ AddressesDialog::allToAddressesNoDuplicates() const
TQValueList::ConstIterator eit;
for( eit = eList.begin(); eit != eList.end(); ++eit ) {
KABC::Addressee a = (*eit).addressee;
- if ( !a.preferredEmail().isEmpty() && aList.find( a ) == aList.end() ) {
+ if ( !a.preferredEmail().isEmpty() && aList.tqfind( a ) == aList.end() ) {
aList.append( a ) ;
}
}
@@ -415,7 +415,7 @@ AddressesDialog::allToAddressesNoDuplicates() const
TQValueList::ConstIterator eit;
for( eit = eList.begin(); eit != eList.end(); ++eit ) {
KABC::Addressee a = (*eit).addressee;
- if ( !a.preferredEmail().isEmpty() && aList.find( a ) == aList.end() ) {
+ if ( !a.preferredEmail().isEmpty() && aList.tqfind( a ) == aList.end() ) {
aList.append( a ) ;
}
}
@@ -437,19 +437,19 @@ AddressesDialog::bccAddresses() const
}
-QStringList
+TQStringList
AddressesDialog::toDistributionLists() const
{
return allDistributionLists( d->toItem );
}
-QStringList
+TQStringList
AddressesDialog::ccDistributionLists() const
{
return allDistributionLists( d->ccItem );
}
-QStringList
+TQStringList
AddressesDialog::bccDistributionLists() const
{
return allDistributionLists( d->bccItem );
@@ -544,12 +544,12 @@ AddressesDialog::availableAddressSelected( AddresseeViewItem* item, bool selecte
void
AddressesDialog::selectedAddressSelected( AddresseeViewItem* item, bool selected )
{
- // we have to avoid that a parent and a child is selected together
+ // we have to avoid that a tqparent and a child is selected together
// because in this case we get a double object deletion ( program crashes )
// when removing the selected items from list
- AddresseeViewItem* parent = static_cast(((TQListViewItem*)item)->parent());
- if ( parent && selected )
- parent->setSelected( false );
+ AddresseeViewItem* tqparent = static_cast(((TQListViewItem*)item)->tqparent());
+ if ( tqparent && selected )
+ tqparent->setSelected( false );
if (selected)
{
selectedSelectedAddresses.append(item);
@@ -662,10 +662,10 @@ AddressesDialog::addAddresseeToSelected( const KABC::Addressee& addr, AddresseeV
}
void
-AddressesDialog::addAddresseesToSelected( AddresseeViewItem *parent,
+AddressesDialog::addAddresseesToSelected( AddresseeViewItem *tqparent,
const TQPtrList& addresses )
{
- Q_ASSERT( parent );
+ Q_ASSERT( tqparent );
TQPtrListIterator itr( addresses );
@@ -678,7 +678,7 @@ AddressesDialog::addAddresseesToSelected( AddresseeViewItem *parent,
AddresseeViewItem* address = itr.current();
++itr;
- if (selectedToAvailableMapping.find(address) != 0)
+ if (selectedToAvailableMapping.tqfind(address) != 0)
{
continue;
}
@@ -686,15 +686,15 @@ AddressesDialog::addAddresseesToSelected( AddresseeViewItem *parent,
AddresseeViewItem* newItem = 0;
if (address->category() == AddresseeViewItem::Entry)
{
- newItem = new AddresseeViewItem( parent, address->addressee() );
+ newItem = new AddresseeViewItem( tqparent, address->addressee() );
}
else if (address->category() == AddresseeViewItem::DistList)
{
- newItem = new AddresseeViewItem( parent, address->name() );
+ newItem = new AddresseeViewItem( tqparent, address->name() );
}
else
{
- newItem = new AddresseeViewItem( parent, address->name(), allAddressee( address ) );
+ newItem = new AddresseeViewItem( tqparent, address->name(), allAddressee( address ) );
}
address->setSelected( false );
@@ -705,10 +705,10 @@ AddressesDialog::addAddresseesToSelected( AddresseeViewItem *parent,
this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool)));
}
- parent->setOpen( true );
+ tqparent->setOpen( true );
}
-QStringList
+TQStringList
AddressesDialog::entryToString( const KABC::Addressee::List& l ) const
{
TQStringList entries;
@@ -819,7 +819,7 @@ AddressesDialog::removeEntry()
resetCC = true;
else if( d->bccItem == item )
resetBCC = true;
- // we may only append parent items
+ // we may only append tqparent items
unmapSelectedAddress(item);
lst.append( item );
}
@@ -854,7 +854,7 @@ AddressesDialog::removeEntry()
// copied from kabcore.cpp :(
// KDE4: should be in libkabc I think
-static KABC::Resource *requestResource( KABC::AddressBook* abook, TQWidget *parent )
+static KABC::Resource *requestResource( KABC::AddressBook* abook, TQWidget *tqparent )
{
TQPtrList kabcResources = abook->resources();
@@ -870,7 +870,7 @@ static KABC::Resource *requestResource( KABC::AddressBook* abook, TQWidget *pare
}
}
- KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, parent );
+ KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, tqparent );
return static_cast( res );
}
#endif
@@ -894,7 +894,7 @@ AddressesDialog::saveAs()
bool ok = false;
TQString name = KInputDialog::getText( i18n("New Distribution List"),
i18n("Please enter name:"),
- TQString::null, &ok,
+ TQString(), &ok,
this );
if ( !ok || name.isEmpty() )
return;
@@ -1002,11 +1002,11 @@ AddressesDialog::filterChanged( const TQString& txt )
if ( item->category() == AddresseeViewItem::Entry ) {
bool matches = item->matches( txt );
item->setVisible( matches );
- TQListViewItem *parent = static_cast( item )->parent();
- if ( matches && parent ) {
- if ( parent == d->personal ) {
+ TQListViewItem *tqparent = static_cast( item )->tqparent();
+ if ( matches && tqparent ) {
+ if ( tqparent == d->personal ) {
personalVisible++;
- } else if ( parent == d->recent ) {
+ } else if ( tqparent == d->recent ) {
recentVisible++;
}
}
@@ -1087,19 +1087,19 @@ AddressesDialog::allAddressee( KListView* view, bool onlySelected ) const
}
KABC::Addressee::List
-AddressesDialog::allAddressee( AddresseeViewItem* parent ) const
+AddressesDialog::allAddressee( AddresseeViewItem* tqparent ) const
{
KABC::Addressee::List lst;
- if ( !parent ) return lst;
+ if ( !tqparent ) return lst;
- if ( parent->category() == AddresseeViewItem::Entry )
+ if ( tqparent->category() == AddresseeViewItem::Entry )
{
- lst.append( parent->addressee() );
+ lst.append( tqparent->addressee() );
return lst;
}
- AddresseeViewItem *myChild = static_cast( parent->firstChild() );
+ AddresseeViewItem *myChild = static_cast( tqparent->firstChild() );
while( myChild ) {
if ( myChild->category() == AddresseeViewItem::FilledGroup )
lst += myChild->addresses();
@@ -1111,15 +1111,15 @@ AddressesDialog::allAddressee( AddresseeViewItem* parent ) const
return lst;
}
-QStringList
-AddressesDialog::allDistributionLists( AddresseeViewItem* parent ) const
+TQStringList
+AddressesDialog::allDistributionLists( AddresseeViewItem* tqparent ) const
{
TQStringList lists;
- if ( !parent )
+ if ( !tqparent )
return TQStringList();
- AddresseeViewItem *item = static_cast( parent->firstChild() );
+ AddresseeViewItem *item = static_cast( tqparent->firstChild() );
while ( item ) {
if ( item->category() == AddresseeViewItem::DistList && !item->name().isEmpty() )
lists.append( item->name() );
diff --git a/libkdepim/addressesdialog.h b/libkdepim/addressesdialog.h
index 4b3ea9dc9..71d6925da 100644
--- a/libkdepim/addressesdialog.h
+++ b/libkdepim/addressesdialog.h
@@ -38,6 +38,7 @@ namespace KPIM {
class AddresseeViewItem : public TQObject, public KListViewItem
{
Q_OBJECT
+ TQ_OBJECT
public:
enum Category {
@@ -49,10 +50,10 @@ namespace KPIM {
FilledGroup =5,
DistList =6
};
- AddresseeViewItem( AddresseeViewItem *parent, const KABC::Addressee& addr, int emailIndex = 0 );
+ AddresseeViewItem( AddresseeViewItem *tqparent, const KABC::Addressee& addr, int emailIndex = 0 );
AddresseeViewItem( KListView *lv, const TQString& name, Category cat=Group );
- AddresseeViewItem( AddresseeViewItem *parent, const TQString& name, const KABC::Addressee::List &lst );
- AddresseeViewItem( AddresseeViewItem *parent, const TQString& name );
+ AddresseeViewItem( AddresseeViewItem *tqparent, const TQString& name, const KABC::Addressee::List &lst );
+ AddresseeViewItem( AddresseeViewItem *tqparent, const TQString& name );
~AddresseeViewItem();
KABC::Addressee addressee() const;
@@ -78,6 +79,7 @@ namespace KPIM {
class KDE_EXPORT AddressesDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
AddressesDialog( TQWidget *widget=0, const char *name=0 );
~AddressesDialog();
@@ -192,12 +194,12 @@ namespace KPIM {
AddresseeViewItem* defaultParent=0, bool useCategory=true );
void addAddresseeToSelected( const KABC::Addressee& addr,
AddresseeViewItem* defaultParent=0 );
- void addAddresseesToSelected( AddresseeViewItem *parent,
+ void addAddresseesToSelected( AddresseeViewItem *tqparent,
const TQPtrList& addresses );
TQStringList entryToString( const KABC::Addressee::List& l ) const;
- KABC::Addressee::List allAddressee( AddresseeViewItem* parent ) const;
+ KABC::Addressee::List allAddressee( AddresseeViewItem* tqparent ) const;
KABC::Addressee::List allAddressee( KListView* view, bool onlySelected = true ) const;
- TQStringList allDistributionLists( AddresseeViewItem* parent ) const;
+ TQStringList allDistributionLists( AddresseeViewItem* tqparent ) const;
private:
// if there's only one group in the available list, open it
diff --git a/libkdepim/addresspicker.ui b/libkdepim/addresspicker.ui
index e0bf7a9a9..cf14f9896 100644
--- a/libkdepim/addresspicker.ui
+++ b/libkdepim/addresspicker.ui
@@ -1,6 +1,6 @@
AddressPickerUI
-
+AddressPickerUI
@@ -64,7 +64,7 @@
true
-
+ tqlayout10
@@ -169,7 +169,7 @@
-
+ textLabel2
@@ -188,7 +188,7 @@
mSelectedView
-
+ textLabel1
@@ -207,7 +207,7 @@
mAvailableView
-
+ tqlayout1
@@ -215,7 +215,7 @@
unnamed
-
+ TextLabel2
@@ -226,7 +226,7 @@
mFilterEdit
-
+ mFilterEdit
@@ -289,7 +289,7 @@
true
-
+ mSaveAs
@@ -303,7 +303,7 @@
Alt+D
-
+ mLdapSearch
diff --git a/libkdepim/broadcaststatus.cpp b/libkdepim/broadcaststatus.cpp
index fb48f05ca..68900936a 100644
--- a/libkdepim/broadcaststatus.cpp
+++ b/libkdepim/broadcaststatus.cpp
@@ -23,37 +23,37 @@
#include "broadcaststatus.h"
#include "progressmanager.h"
-KPIM::BroadcasStatus* KPIM::BroadcasStatus::instance_ = 0;
-static KStaticDeleter broadcasStatusDeleter;
+KPIM::BroadcastqStatus* KPIM::BroadcastqStatus::instance_ = 0;
+static KStaticDeleter broadcasStatusDeleter;
namespace KPIM {
-BroadcasStatus* BroadcasStatus::instance()
+BroadcastqStatus* BroadcastqStatus::instance()
{
if (!instance_)
- broadcasStatusDeleter.setObject( instance_, new BroadcasStatus() );
+ broadcasStatusDeleter.setObject( instance_, new BroadcastqStatus() );
return instance_;
}
-BroadcasStatus::BroadcasStatus()
+BroadcastqStatus::BroadcastqStatus()
:mTransientActive( false )
{
}
-BroadcasStatus::~BroadcasStatus()
+BroadcastqStatus::~BroadcastqStatus()
{
instance_ = 0;
}
-void BroadcasStatus::seStatusMsg( const TQString& message )
+void BroadcastqStatus::seStatusMsg( const TQString& message )
{
mStatusMsg = message;
if( !mTransientActive )
emit statusMsg( message );
}
-void BroadcasStatus::seStatusMsgWithTimestamp( const TQString& message )
+void BroadcastqStatus::seStatusMsgWithTimestamp( const TQString& message )
{
KLocale* locale = KGlobal::locale();
seStatusMsg( i18n( "%1 is a time, %2 is a status message", "[%1] %2" )
@@ -62,7 +62,7 @@ void BroadcasStatus::seStatusMsgWithTimestamp( const TQString& message )
.arg( message ) );
}
-void BroadcasStatus::seStatusMsgTransmissionCompleted( int numMessages,
+void BroadcastqStatus::seStatusMsgTransmissionCompleted( int numMessages,
int numBytes,
int numBytesRead,
int numBytesToRead,
@@ -96,10 +96,10 @@ void BroadcasStatus::seStatusMsgTransmissionCompleted( int numMessages,
seStatusMsgWithTimestamp( statusMsg );
if ( item )
- item->seStatus( statusMsg );
+ item->setqStatus( statusMsg );
}
-void BroadcasStatus::seStatusMsgTransmissionCompleted( const TQString& account,
+void BroadcastqStatus::seStatusMsgTransmissionCompleted( const TQString& account,
int numMessages,
int numBytes,
int numBytesRead,
@@ -144,16 +144,16 @@ void BroadcasStatus::seStatusMsgTransmissionCompleted( const TQString& account,
seStatusMsgWithTimestamp( statusMsg );
if ( item )
- item->seStatus( statusMsg );
+ item->setqStatus( statusMsg );
}
-void BroadcasStatus::setTransienStatusMsg( const TQString& msg )
+void BroadcastqStatus::setTransienStatusMsg( const TQString& msg )
{
mTransientActive = true;
emit statusMsg( msg );
}
-void BroadcasStatus::reset()
+void BroadcastqStatus::reset()
{
mTransientActive = false;
// restore
diff --git a/libkdepim/broadcaststatus.h b/libkdepim/broadcaststatus.h
index 11eacd3e6..24365580b 100644
--- a/libkdepim/broadcaststatus.h
+++ b/libkdepim/broadcaststatus.h
@@ -29,16 +29,17 @@ class ProgressItem;
*/
-class KDE_EXPORT BroadcasStatus : public QObject
+class KDE_EXPORT BroadcastqStatus : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- virtual ~BroadcasStatus();
+ virtual ~BroadcastqStatus();
/** Return the instance of the singleton object for this class */
- static BroadcasStatus *instance();
+ static BroadcastqStatus *instance();
/** Return the last status message from seStatusMsg() */
TQString statusMsg() const { return mStatusMsg; }
@@ -82,10 +83,10 @@ signals:
protected:
- BroadcasStatus();
+ BroadcastqStatus();
TQString mStatusMsg;
bool mTransientActive;
- static BroadcasStatus* instance_;
+ static BroadcastqStatus* instance_;
};
diff --git a/libkdepim/calendardiffalgo.cpp b/libkdepim/calendardiffalgo.cpp
index 79676fb84..dc22fd30e 100644
--- a/libkdepim/calendardiffalgo.cpp
+++ b/libkdepim/calendardiffalgo.cpp
@@ -42,17 +42,17 @@ static TQString toString( KCal::Attendee *attendee )
static TQString toString( KCal::Alarm * )
{
- return TQString::null;
+ return TQString();
}
static TQString toString( KCal::Incidence * )
{
- return TQString::null;
+ return TQString();
}
static TQString toString( KCal::Attachment * )
{
- return TQString::null;
+ return TQString();
}
static TQString toString( const TQDate &date )
@@ -138,7 +138,7 @@ void CalendarDiffAlgo::diffIncidence( KCal::Incidence *left, KCal::Incidence *ri
conflictField( i18n( "Summary" ), left->summary(), right->summary() );
if ( left->status() != right->status() )
- conflictField( i18n( "Status" ), left->statusStr(), right->statusStr() );
+ conflictField( i18n( "tqStatus" ), left->statusStr(), right->statusStr() );
if ( left->secrecy() != right->secrecy() )
conflictField( i18n( "Secrecy" ), toString( left->secrecy() ), toString( right->secrecy() ) );
@@ -202,12 +202,12 @@ void CalendarDiffAlgo::diffList( const TQString &id,
const TQValueList &left, const TQValueList &right )
{
for ( uint i = 0; i < left.count(); ++i ) {
- if ( right.find( left[ i ] ) == right.end() )
+ if ( right.tqfind( left[ i ] ) == right.end() )
additionalLeftField( id, toString( left[ i ] ) );
}
for ( uint i = 0; i < right.count(); ++i ) {
- if ( left.find( right[ i ] ) == left.end() )
+ if ( left.tqfind( right[ i ] ) == left.end() )
additionalRightField( id, toString( right[ i ] ) );
}
}
diff --git a/libkdepim/categoryeditdialog.cpp b/libkdepim/categoryeditdialog.cpp
index d386ae101..c5c4885bd 100644
--- a/libkdepim/categoryeditdialog.cpp
+++ b/libkdepim/categoryeditdialog.cpp
@@ -43,7 +43,7 @@ class CategoryEditDialog::Private
TQPushButton *mDeleteButton;
};
-class CategoryListViewItem : public QListViewItem
+class CategoryListViewItem : public TQListViewItem
{
public:
CategoryListViewItem( TQListView *view, const TQString &text ) :
@@ -57,9 +57,9 @@ class CategoryListViewItem : public QListViewItem
}
};
-CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, TQWidget* parent,
+CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, TQWidget* tqparent,
const char* name, bool modal )
- : KDialogBase::KDialogBase( parent, name, modal,
+ : KDialogBase::KDialogBase( tqparent, name, modal,
i18n("Edit Categories"), Ok|Apply|Cancel|Help, Ok, true ),
mPrefs( prefs ), d( new Private )
{
diff --git a/libkdepim/categoryeditdialog.h b/libkdepim/categoryeditdialog.h
index f8168b7af..761dbad15 100644
--- a/libkdepim/categoryeditdialog.h
+++ b/libkdepim/categoryeditdialog.h
@@ -32,8 +32,9 @@ namespace KPIM {
class KDE_EXPORT CategoryEditDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- CategoryEditDialog( KPimPrefs *prefs, TQWidget* parent = 0,
+ CategoryEditDialog( KPimPrefs *prefs, TQWidget* tqparent = 0,
const char* name = 0,
bool modal = false );
~CategoryEditDialog();
diff --git a/libkdepim/categoryeditdialog_base.ui b/libkdepim/categoryeditdialog_base.ui
index b23a66972..d8f903d00 100644
--- a/libkdepim/categoryeditdialog_base.ui
+++ b/libkdepim/categoryeditdialog_base.ui
@@ -1,6 +1,6 @@
CategoryEditDialog_base
-
+CategoryEditDialog_base
@@ -25,12 +25,12 @@
6
-
+ mEdit
-
+ Category
@@ -52,7 +52,7 @@
AllColumns
-
+ tqlayout103
@@ -60,7 +60,7 @@
unnamed
-
+ mButtonAdd
@@ -68,7 +68,7 @@
A&dd
-
+ mButtonRemove
diff --git a/libkdepim/categoryselectdialog.cpp b/libkdepim/categoryselectdialog.cpp
index 4eb072b12..982e11517 100644
--- a/libkdepim/categoryselectdialog.cpp
+++ b/libkdepim/categoryselectdialog.cpp
@@ -32,9 +32,9 @@
using namespace KPIM;
-CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, TQWidget* parent,
+CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, TQWidget* tqparent,
const char* name, bool modal )
- : KDialogBase::KDialogBase( parent, name, modal,
+ : KDialogBase::KDialogBase( tqparent, name, modal,
i18n("Select Categories"), Ok|Apply|Cancel|Help, Ok, true ),
mPrefs( prefs )
{
@@ -58,7 +58,7 @@ void CategorySelectDialog::setCategories( const TQStringList &categoryList )
TQStringList::ConstIterator it;
for ( it = categoryList.begin(); it != categoryList.end(); ++it )
- if ( mPrefs->mCustomCategories.find( *it ) == mPrefs->mCustomCategories.end() )
+ if ( mPrefs->mCustomCategories.tqfind( *it ) == mPrefs->mCustomCategories.end() )
mPrefs->mCustomCategories.append( *it );
for ( it = mPrefs->mCustomCategories.begin();
diff --git a/libkdepim/categoryselectdialog.h b/libkdepim/categoryselectdialog.h
index dd5ad3b50..9c3044443 100644
--- a/libkdepim/categoryselectdialog.h
+++ b/libkdepim/categoryselectdialog.h
@@ -33,8 +33,9 @@ namespace KPIM {
class KDE_EXPORT CategorySelectDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- CategorySelectDialog( KPimPrefs *prefs, TQWidget *parent = 0,
+ CategorySelectDialog( KPimPrefs *prefs, TQWidget *tqparent = 0,
const char *name = 0, bool modal = false );
~CategorySelectDialog();
diff --git a/libkdepim/categoryselectdialog_base.ui b/libkdepim/categoryselectdialog_base.ui
index c5030679a..c728e4f12 100644
--- a/libkdepim/categoryselectdialog_base.ui
+++ b/libkdepim/categoryselectdialog_base.ui
@@ -1,6 +1,6 @@
CategorySelectDialog_base
-
+CategorySelectDialog_base
@@ -25,7 +25,7 @@
6
-
+ Category
@@ -41,7 +41,7 @@
mCategories
-
+ Layout12
@@ -55,7 +55,7 @@
6
-
+ mButtonClear
@@ -80,7 +80,7 @@
-
+ mButtonEdit
diff --git a/libkdepim/cfgc/example.cfg b/libkdepim/cfgc/example.cfg
index 28a2d06b1..1cc4feff3 100644
--- a/libkdepim/cfgc/example.cfg
+++ b/libkdepim/cfgc/example.cfg
@@ -27,12 +27,12 @@
-
+ MyStringDefault String
-
+ MyStringListup,down
diff --git a/libkdepim/cfgc/general_base.ui b/libkdepim/cfgc/general_base.ui
index 040990ef1..e5d8bfedc 100644
--- a/libkdepim/cfgc/general_base.ui
+++ b/libkdepim/cfgc/general_base.ui
@@ -1,6 +1,6 @@
GeneralBase
-
+GeneralBase
@@ -19,7 +19,7 @@
unnamed
-
+ OneOption
@@ -27,12 +27,12 @@
OneOption
-
+ Another_Option
-
+ textLabel1
diff --git a/libkdepim/cfgc/myoptions_base.ui b/libkdepim/cfgc/myoptions_base.ui
index fe5d43ac6..eadcb0302 100644
--- a/libkdepim/cfgc/myoptions_base.ui
+++ b/libkdepim/cfgc/myoptions_base.ui
@@ -1,6 +1,6 @@
MyOptionsBase
-
+MyOptionsBase
@@ -12,7 +12,7 @@
480
-
+ textLabel1
@@ -28,7 +28,7 @@
MyString:
-
+ MyString
diff --git a/libkdepim/clicklineedit.cpp b/libkdepim/clicklineedit.cpp
index 98748e44a..f8bfe0e91 100644
--- a/libkdepim/clicklineedit.cpp
+++ b/libkdepim/clicklineedit.cpp
@@ -26,8 +26,8 @@
using namespace KPIM;
-ClickLineEdit::ClickLineEdit(TQWidget *parent, const TQString &msg, const char* name) :
- KLineEdit(parent, name)
+ClickLineEdit::ClickLineEdit(TQWidget *tqparent, const TQString &msg, const char* name) :
+ KLineEdit(tqparent, name)
{
mDrawClickMsg = true;
setClickMessage( msg );
diff --git a/libkdepim/clicklineedit.h b/libkdepim/clicklineedit.h
index 65357375d..f9a9543d0 100644
--- a/libkdepim/clicklineedit.h
+++ b/libkdepim/clicklineedit.h
@@ -27,7 +27,7 @@
namespace KPIM {
/**
- This class provides a KLineEdit which tqcontains a greyed-out hinting
+ This class provides a KLineEdit which contains a greyed-out hinting
text as long as the user didn't enter any text
@short LineEdit with customizable "Click here" text
@@ -36,9 +36,10 @@ namespace KPIM {
class KDE_EXPORT ClickLineEdit : public KLineEdit
{
Q_OBJECT
- Q_PROPERTY( TQString clickMessage READ clickMessage WRITE setClickMessage )
+ TQ_OBJECT
+ TQ_PROPERTY( TQString clickMessage READ clickMessage WRITE setClickMessage )
public:
- ClickLineEdit( TQWidget *parent, const TQString &msg = TQString::null, const char* name = 0 );
+ ClickLineEdit( TQWidget *tqparent, const TQString &msg = TQString(), const char* name = 0 );
~ClickLineEdit();
void setClickMessage( const TQString &msg );
diff --git a/libkdepim/collectingprocess.cpp b/libkdepim/collectingprocess.cpp
index 2e1b61714..d49da43b8 100644
--- a/libkdepim/collectingprocess.cpp
+++ b/libkdepim/collectingprocess.cpp
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -49,8 +49,8 @@ struct CollectingProcess::Private {
};
-CollectingProcess::CollectingProcess( TQObject * parent, const char * name )
- : KProcess( parent, name )
+CollectingProcess::CollectingProcess( TQObject * tqparent, const char * name )
+ : KProcess( tqparent, name )
{
d = new Private();
}
diff --git a/libkdepim/collectingprocess.h b/libkdepim/collectingprocess.h
index aff8a8d32..8bc4651be 100644
--- a/libkdepim/collectingprocess.h
+++ b/libkdepim/collectingprocess.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -48,8 +48,9 @@ namespace KPIM {
*/
class KDE_EXPORT CollectingProcess : public KProcess {
Q_OBJECT
+ TQ_OBJECT
public:
- CollectingProcess( TQObject * parent = 0, const char * name = 0 );
+ CollectingProcess( TQObject * tqparent = 0, const char * name = 0 );
~CollectingProcess();
/** Starts the process in NotifyOnExit mode and writes in to stdin of
diff --git a/libkdepim/completionordereditor.cpp b/libkdepim/completionordereditor.cpp
index 9fd4950aa..e4821f3dc 100644
--- a/libkdepim/completionordereditor.cpp
+++ b/libkdepim/completionordereditor.cpp
@@ -18,11 +18,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -160,7 +160,7 @@ private:
/////////
-class CompletionViewItem : public QListViewItem
+class CompletionViewItem : public TQListViewItem
{
public:
CompletionViewItem( TQListView* lv, CompletionItem* item )
@@ -173,8 +173,8 @@ private:
};
CompletionOrderEditor::CompletionOrderEditor( KPIM::LdapSearch* ldapSearch,
- TQWidget* parent, const char* name )
- : KDialogBase( parent, name, true, i18n("Edit Completion Order"), Ok|Cancel, Ok, true ),
+ TQWidget* tqparent, const char* name )
+ : KDialogBase( tqparent, name, true, i18n("Edit Completion Order"), Ok|Cancel, Ok, true ),
mConfig( "kpimcompletionorder" ), mDirty( false )
{
mItems.setAutoDelete( true );
@@ -213,7 +213,7 @@ CompletionOrderEditor::CompletionOrderEditor( KPIM::LdapSearch* ldapSearch,
TQHBox* page = makeHBoxMainWidget();
mListView = new KListView( page );
mListView->setSorting( -1 );
- mListView->addColumn( TQString::null );
+ mListView->addColumn( TQString() );
mListView->header()->hide();
for( TQPtrListIterator compit( mItems ); *compit; ++compit ) {
diff --git a/libkdepim/completionordereditor.h b/libkdepim/completionordereditor.h
index 0e17a5342..7d4d3e47a 100644
--- a/libkdepim/completionordereditor.h
+++ b/libkdepim/completionordereditor.h
@@ -18,11 +18,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -63,9 +63,10 @@ public:
class CompletionOrderEditor : public KDialogBase {
Q_OBJECT
+ TQ_OBJECT
public:
- CompletionOrderEditor( KPIM::LdapSearch* ldapSearch, TQWidget* parent, const char* name = 0 );
+ CompletionOrderEditor( KPIM::LdapSearch* ldapSearch, TQWidget* tqparent, const char* name = 0 );
~CompletionOrderEditor();
KConfig* configFile() { return &mConfig; }
diff --git a/libkdepim/configmanager.cpp b/libkdepim/configmanager.cpp
index 64b4562fc..47bcb9d0d 100644
--- a/libkdepim/configmanager.cpp
+++ b/libkdepim/configmanager.cpp
@@ -21,8 +21,8 @@
using namespace KPIM;
-ConfigManager::ConfigManager( TQObject * parent, const char * name )
- : TQObject( parent, name )
+ConfigManager::ConfigManager( TQObject * tqparent, const char * name )
+ : TQObject( tqparent, name )
{
}
diff --git a/libkdepim/configmanager.h b/libkdepim/configmanager.h
index 44a170bcc..ba024093e 100644
--- a/libkdepim/configmanager.h
+++ b/libkdepim/configmanager.h
@@ -31,6 +31,7 @@ namespace KPIM {
**/
class KDE_EXPORT ConfigManager : public TQObject {
Q_OBJECT
+ TQ_OBJECT
public:
/** Commit changes to disk and emit changed() if necessary. */
virtual void commit() = 0;
@@ -45,7 +46,7 @@ signals:
void changed();
protected:
- ConfigManager( TQObject * parent=0, const char * name=0 );
+ ConfigManager( TQObject * tqparent=0, const char * name=0 );
virtual ~ConfigManager();
};
diff --git a/libkdepim/csshelper.cpp b/libkdepim/csshelper.cpp
index 4116e583e..f828476f6 100644
--- a/libkdepim/csshelper.cpp
+++ b/libkdepim/csshelper.cpp
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -83,7 +83,7 @@ namespace KPIM {
cPgpOk1H = TQColor( 0x40, 0xFF, 0x40 ); // light green
cPgpOk0H = TQColor( 0xFF, 0xFF, 0x40 ); // light yellow
cPgpWarnH = TQColor( 0xFF, 0xFF, 0x40 ); // light yellow
- cPgpErrH = Qt::red;
+ cPgpErrH = TQt::red;
for ( int i = 0 ; i < 3 ; ++i )
mQuoteColor[i] = TQColor( 0x00, 0x80 - i * 0x10, 0x00 ); // shades of green
diff --git a/libkdepim/csshelper.h b/libkdepim/csshelper.h
index 3dbc80c03..ab9190cf8 100644
--- a/libkdepim/csshelper.h
+++ b/libkdepim/csshelper.h
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/libkdepim/designerfields.cpp b/libkdepim/designerfields.cpp
index bb5b8c258..6907485d0 100644
--- a/libkdepim/designerfields.cpp
+++ b/libkdepim/designerfields.cpp
@@ -41,9 +41,9 @@
using namespace KPIM;
-DesignerFields::DesignerFields( const TQString &uiFile, TQWidget *parent,
+DesignerFields::DesignerFields( const TQString &uiFile, TQWidget *tqparent,
const char *name )
- : TQWidget( parent, name )
+ : TQWidget( tqparent, name )
{
initGUI( uiFile );
}
@@ -145,15 +145,15 @@ void DesignerFields::load( DesignerFields::Storage *storage )
TQString value;
if ( widIt.data()->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) {
TQLineEdit *wdg = static_cast( widIt.data() );
- wdg->setText( TQString::null );
+ wdg->setText( TQString() );
} else if ( widIt.data()->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ) {
TQSpinBox *wdg = static_cast( widIt.data() );
wdg->setValue( wdg->minValue() );
} else if ( widIt.data()->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) ) {
TQCheckBox *wdg = static_cast( widIt.data() );
wdg->setChecked( false );
- } else if ( widIt.data()->inherits( "QDateTimeEdit" ) ) {
- QDateTimeEdit *wdg = static_cast( widIt.data() );
+ } else if ( widIt.data()->inherits( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) {
+ TQDateTimeEdit *wdg = static_cast( widIt.data() );
wdg->setDateTime( TQDateTime::tqcurrentDateTime() );
} else if ( widIt.data()->inherits( "KDateTimeWidget" ) ) {
KDateTimeWidget *wdg = static_cast( widIt.data() );
@@ -166,7 +166,7 @@ void DesignerFields::load( DesignerFields::Storage *storage )
wdg->setCurrentItem( 0 );
} else if ( widIt.data()->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) {
TQTextEdit *wdg = static_cast( widIt.data() );
- wdg->setText( TQString::null );
+ wdg->setText( TQString() );
}
}
@@ -174,7 +174,7 @@ void DesignerFields::load( DesignerFields::Storage *storage )
for ( it2 = keys.begin(); it2 != keys.end(); ++it2 ) {
TQString value = storage->read( *it2 );
- TQMap::ConstIterator it = mWidgets.find( *it2 );
+ TQMap::ConstIterator it = mWidgets.tqfind( *it2 );
if ( it != mWidgets.end() ) {
if ( it.data()->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) {
TQLineEdit *wdg = static_cast( it.data() );
@@ -186,14 +186,14 @@ void DesignerFields::load( DesignerFields::Storage *storage )
TQCheckBox *wdg = static_cast( it.data() );
wdg->setChecked( value == "true" || value == "1" );
} else if ( it.data()->inherits( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) {
- QDateTimeEdit *wdg = static_cast( it.data() );
- wdg->setDateTime( TQDateTime::fromString( value, Qt::ISODate ) );
+ TQDateTimeEdit *wdg = static_cast( it.data() );
+ wdg->setDateTime( TQDateTime::fromString( value, TQt::ISODate ) );
} else if ( it.data()->inherits( "KDateTimeWidget" ) ) {
KDateTimeWidget *wdg = static_cast( it.data() );
- wdg->setDateTime( TQDateTime::fromString( value, Qt::ISODate ) );
+ wdg->setDateTime( TQDateTime::fromString( value, TQt::ISODate ) );
} else if ( it.data()->inherits( "KDatePicker" ) ) {
KDatePicker *wdg = static_cast( it.data() );
- wdg->setDate( TQDate::fromString( value, Qt::ISODate ) );
+ wdg->setDate( TQDate::fromString( value, TQt::ISODate ) );
} else if ( it.data()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) {
TQComboBox *wdg = static_cast( it.data() );
wdg->setCurrentText( value );
@@ -219,15 +219,15 @@ void DesignerFields::save( DesignerFields::Storage *storage )
} else if ( it.data()->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) ) {
TQCheckBox *wdg = static_cast( it.data() );
value = ( wdg->isChecked() ? "true" : "false" );
- } else if ( it.data()->inherits( "QDateTimeEdit" ) ) {
- QDateTimeEdit *wdg = static_cast( it.data() );
- value = wdg->dateTime().toString( Qt::ISODate );
+ } else if ( it.data()->inherits( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) {
+ TQDateTimeEdit *wdg = static_cast( it.data() );
+ value = wdg->dateTime().toString( TQt::ISODate );
} else if ( it.data()->inherits( "KDateTimeWidget" ) ) {
KDateTimeWidget *wdg = static_cast( it.data() );
- value = wdg->dateTime().toString( Qt::ISODate );
+ value = wdg->dateTime().toString( TQt::ISODate );
} else if ( it.data()->inherits( "KDatePicker" ) ) {
KDatePicker *wdg = static_cast( it.data() );
- value = wdg->date().toString( Qt::ISODate );
+ value = wdg->date().toString( TQt::ISODate );
} else if ( it.data()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) {
TQComboBox *wdg = static_cast( it.data() );
value = wdg->currentText();
@@ -244,7 +244,7 @@ void DesignerFields::setReadOnly( bool readOnly )
{
TQMap::Iterator it;
for ( it = mWidgets.begin(); it != mWidgets.end(); ++it )
- if ( mDisabledWidgets.find( it.data() ) == mDisabledWidgets.end() )
+ if ( mDisabledWidgets.tqfind( it.data() ) == mDisabledWidgets.end() )
it.data()->setEnabled( !readOnly );
}
diff --git a/libkdepim/designerfields.h b/libkdepim/designerfields.h
index 2d5db2b12..89032eadd 100644
--- a/libkdepim/designerfields.h
+++ b/libkdepim/designerfields.h
@@ -32,11 +32,12 @@
namespace KPIM {
-class KDE_EXPORT DesignerFields : public QWidget
+class KDE_EXPORT DesignerFields : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- DesignerFields( const TQString &uiFile, TQWidget *parent,
+ DesignerFields( const TQString &uiFile, TQWidget *tqparent,
const char *name = 0 );
class Storage
diff --git a/libkdepim/diffalgo.cpp b/libkdepim/diffalgo.cpp
index 21c476861..428316568 100644
--- a/libkdepim/diffalgo.cpp
+++ b/libkdepim/diffalgo.cpp
@@ -75,7 +75,7 @@ void DiffAlgo::conflictField( const TQString &id, const TQString &leftValue,
void DiffAlgo::addDisplay( DiffAlgoDisplay *display )
{
- if ( mDisplays.find( display ) == mDisplays.end() )
+ if ( mDisplays.tqfind( display ) == mDisplays.end() )
mDisplays.append( display );
}
diff --git a/libkdepim/distributionlist.cpp b/libkdepim/distributionlist.cpp
index 6d96b2358..97b11bcf8 100644
--- a/libkdepim/distributionlist.cpp
+++ b/libkdepim/distributionlist.cpp
@@ -28,7 +28,7 @@ void KPIM::DistributionList::setName( const TQString &name )
// Helper function, to parse the contents of the custom field
// Returns a list of { uid, email }
-typedef TQValueList > ParseList;
+typedef TQValueList > ParseList;
static ParseList parseCustom( const TQString& str )
{
ParseList res;
@@ -63,7 +63,7 @@ void KPIM::DistributionList::insertEntry( const TQString& uid, const TQString& e
TQString str = custom( "KADDRESSBOOK", s_customFieldName );
// Assumption: UIDs don't contain ; nor ,
str += ";" + uid + "," + email;
- insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // tqreplace old value
+ insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // replace old value
}
void KPIM::DistributionList::removeEntry( const Addressee& addr, const TQString& email )
@@ -88,7 +88,7 @@ void KPIM::DistributionList::removeEntry( const TQString& uid, const TQString& e
}
if ( str.isEmpty() )
str = ";"; // keep something, for isDistributionList to work
- insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // tqreplace old value
+ insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // replace old value
}
bool KPIM::DistributionList::isDistributionList( const KABC::Addressee& addr )
@@ -131,15 +131,15 @@ KPIM::DistributionList KPIM::DistributionList::findByName( KABC::AddressBook* bo
return DistributionList();
}
-static KABC::Addressee tqfindByUidOrName( KABC::AddressBook* book, const TQString& uidOrName, const TQString& email )
+static KABC::Addressee findByUidOrName( KABC::AddressBook* book, const TQString& uidOrName, const TQString& email )
{
- KABC::Addressee a = book->tqfindByUid( uidOrName );
+ KABC::Addressee a = book->findByUid( uidOrName );
if ( a.isEmpty() ) {
// UID not found, maybe it is a name instead.
// If we have an email, let's use that for the lookup.
// [This is used by e.g. the Kolab resource]
if ( !email.isEmpty() ) {
- KABC::Addressee::List lst = book->tqfindByEmail( email );
+ KABC::Addressee::List lst = book->findByEmail( email );
KABC::Addressee::List::ConstIterator listit = lst.begin();
for ( ; listit != lst.end(); ++listit )
if ( (*listit).formattedName() == uidOrName ) {
@@ -170,7 +170,7 @@ KPIM::DistributionList::Entry::List KPIM::DistributionList::entries( KABC::Addre
const TQString uid = (*it).first;
const TQString email = (*it).second;
// look up contact
- KABC::Addressee a = tqfindByUidOrName( book, uid, email );
+ KABC::Addressee a = findByUidOrName( book, uid, email );
if ( a.isEmpty() ) {
// ## The old DistributionListManager had a "missing entries" list...
kdWarning() << "Addressee not found: " << uid << endl;
@@ -192,7 +192,7 @@ TQStringList KPIM::DistributionList::emails( KABC::AddressBook* book ) const
const TQString thisEmail = (*it).second;
// look up contact
- KABC::Addressee a = tqfindByUidOrName( book, thisUid, thisEmail );
+ KABC::Addressee a = findByUidOrName( book, thisUid, thisEmail );
if ( a.isEmpty() ) {
// ## The old DistributionListManager had a "missing entries" list...
continue;
diff --git a/libkdepim/distributionlist.h b/libkdepim/distributionlist.h
index 06b720b03..0faaeeec6 100644
--- a/libkdepim/distributionlist.h
+++ b/libkdepim/distributionlist.h
@@ -89,18 +89,18 @@ class DistributionList : public KABC::Addressee
Insert an entry into this distribution list. If the entry already exists
nothing happens.
*/
- void insertEntry( const Addressee &, const TQString &email=TQString::null );
+ void insertEntry( const Addressee &, const TQString &email=TQString() );
/**
Remove an entry from this distribution list. If the entry doesn't exist
nothing happens.
*/
- void removeEntry( const Addressee &, const TQString &email=TQString::null );
+ void removeEntry( const Addressee &, const TQString &email=TQString() );
/// Overload, used by resources to avoid looking up the addressee
- void insertEntry( const TQString& uid, const TQString& email=TQString::null );
+ void insertEntry( const TQString& uid, const TQString& email=TQString() );
/// Overload, used by resources to avoid looking up the addressee
- void removeEntry( const TQString& uid, const TQString& email=TQString::null );
+ void removeEntry( const TQString& uid, const TQString& email=TQString() );
/**
diff --git a/libkdepim/embeddedurlpage.cpp b/libkdepim/embeddedurlpage.cpp
index 12b25dedb..e73911f00 100644
--- a/libkdepim/embeddedurlpage.cpp
+++ b/libkdepim/embeddedurlpage.cpp
@@ -33,8 +33,8 @@
using namespace KPIM;
EmbeddedURLPage::EmbeddedURLPage( const TQString &url, const TQString &mimetype,
- TQWidget *parent, const char *name )
- : TQWidget( parent, name ), mUri(url), mMimeType( mimetype ), mPart( 0 )
+ TQWidget *tqparent, const char *name )
+ : TQWidget( tqparent, name ), mUri(url), mMimeType( mimetype ), mPart( 0 )
{
initGUI( url, mimetype );
}
@@ -54,8 +54,8 @@ void EmbeddedURLPage::loadContents()
TQString mimetype = mMimeType;
if ( mimetype == "auto" )
mimetype == KMimeType::findByURL( mUri )->name();
- // "this" is both the parent widget and the parent object
- mPart = KParts::ComponentFactory::createPartInstanceFromQuery( mimetype, TQString::null, this, 0, this, 0 );
+ // "this" is both the tqparent widget and the tqparent object
+ mPart = KParts::ComponentFactory::createPartInstanceFromQuery( mimetype, TQString(), this, 0, this, 0 );
if ( mPart ) {
mPart->openURL( mUri );
mPart->widget()->show();
diff --git a/libkdepim/embeddedurlpage.h b/libkdepim/embeddedurlpage.h
index 61f8933ad..7f5c4c9e2 100644
--- a/libkdepim/embeddedurlpage.h
+++ b/libkdepim/embeddedurlpage.h
@@ -29,12 +29,13 @@ namespace KParts { class ReadOnlyPart; }
namespace KPIM {
-class KDE_EXPORT EmbeddedURLPage : public QWidget
+class KDE_EXPORT EmbeddedURLPage : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
EmbeddedURLPage( const TQString &url, const TQString &mimetype,
- TQWidget *parent, const char *name = 0 );
+ TQWidget *tqparent, const char *name = 0 );
public slots:
void loadContents();
diff --git a/libkdepim/htmldiffalgodisplay.cpp b/libkdepim/htmldiffalgodisplay.cpp
index 2c6af164b..19b99d4e4 100644
--- a/libkdepim/htmldiffalgodisplay.cpp
+++ b/libkdepim/htmldiffalgodisplay.cpp
@@ -30,8 +30,8 @@ static TQString textToHTML( const TQString &text )
return TQStyleSheet::convertFromPlainText( text );
}
-HTMLDiffAlgoDisplay::HTMLDiffAlgoDisplay( TQWidget *parent )
- : KTextBrowser( parent )
+HTMLDiffAlgoDisplay::HTMLDiffAlgoDisplay( TQWidget *tqparent )
+ : KTextBrowser( tqparent )
{
setWrapPolicy( TQTextEdit::AtWordBoundary );
setVScrollBarMode( TQScrollView::AlwaysOff );
diff --git a/libkdepim/htmldiffalgodisplay.h b/libkdepim/htmldiffalgodisplay.h
index 4495e2003..55090f41c 100644
--- a/libkdepim/htmldiffalgodisplay.h
+++ b/libkdepim/htmldiffalgodisplay.h
@@ -32,7 +32,7 @@ namespace KPIM {
class KDE_EXPORT HTMLDiffAlgoDisplay : virtual public DiffAlgoDisplay, public KTextBrowser
{
public:
- HTMLDiffAlgoDisplay( TQWidget *parent );
+ HTMLDiffAlgoDisplay( TQWidget *tqparent );
void begin();
void end();
diff --git a/libkdepim/infoextension.cpp b/libkdepim/infoextension.cpp
index 55cb35683..3c8ac26f9 100644
--- a/libkdepim/infoextension.cpp
+++ b/libkdepim/infoextension.cpp
@@ -26,8 +26,8 @@
using namespace KParts;
-InfoExtension::InfoExtension( KParts::ReadOnlyPart *parent, const char* name)
-: TQObject(parent, name), d(0)
+InfoExtension::InfoExtension( KParts::ReadOnlyPart *tqparent, const char* name)
+: TQObject(tqparent, name), d(0)
{
}
diff --git a/libkdepim/infoextension.h b/libkdepim/infoextension.h
index 0a992a154..343f71720 100644
--- a/libkdepim/infoextension.h
+++ b/libkdepim/infoextension.h
@@ -35,18 +35,19 @@ namespace KParts
/**
* Provides a way to get information out of a PIM-Part
**/
- class KDE_EXPORT InfoExtension : public QObject
+ class KDE_EXPORT InfoExtension : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Constucts an InfoExtension.
*
- * @param parent The parent widget.
+ * @param tqparent The tqparent widget.
* @param name The name of the class.
**/
- InfoExtension( KParts::ReadOnlyPart *parent, const char* name);
+ InfoExtension( KParts::ReadOnlyPart *tqparent, const char* name);
~InfoExtension();
private:
diff --git a/libkdepim/kabcresourcecached.cpp b/libkdepim/kabcresourcecached.cpp
index beeb7b900..7e6842bfb 100644
--- a/libkdepim/kabcresourcecached.cpp
+++ b/libkdepim/kabcresourcecached.cpp
@@ -178,7 +178,7 @@ void ResourceCached::insertAddressee( const Addressee &addr )
mAddrMap.insert( addr.uid(), addr );
mAddedAddressees.insert( addr.uid(), addr );
} else {
- KABC::Addressee oldAddressee = mAddrMap.find( addr.uid() ).data();
+ KABC::Addressee oldAddressee = mAddrMap.tqfind( addr.uid() ).data();
if ( oldAddressee != addr ) {
mAddrMap.remove( addr.uid() );
mAddrMap.insert( addr.uid(), addr );
@@ -194,7 +194,7 @@ void ResourceCached::removeAddressee( const Addressee &addr )
return;
}
- if ( mDeletedAddressees.find( addr.uid() ) == mDeletedAddressees.end() )
+ if ( mDeletedAddressees.tqfind( addr.uid() ) == mDeletedAddressees.end() )
mDeletedAddressees.insert( addr.uid(), addr );
mAddrMap.remove( addr.uid() );
diff --git a/libkdepim/kabcresourcecached.h b/libkdepim/kabcresourcecached.h
index 00d6f4e8b..644819011 100644
--- a/libkdepim/kabcresourcecached.h
+++ b/libkdepim/kabcresourcecached.h
@@ -34,6 +34,7 @@ namespace KABC {
class KDE_EXPORT ResourceCached : public Resource
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/libkdepim/kaccount.cpp b/libkdepim/kaccount.cpp
index 9aab7cfec..392fea265 100644
--- a/libkdepim/kaccount.cpp
+++ b/libkdepim/kaccount.cpp
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/libkdepim/kaccount.h b/libkdepim/kaccount.h
index d81182767..7da944624 100644
--- a/libkdepim/kaccount.h
+++ b/libkdepim/kaccount.h
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -50,7 +50,7 @@ class KDE_EXPORT KAccount
Other
};
- KAccount( const uint id = 0, const TQString &name = TQString::null,
+ KAccount( const uint id = 0, const TQString &name = TQString(),
const Type type = Other );
/**
@@ -75,13 +75,13 @@ class KDE_EXPORT KAccount
* Save the settings
* If the group is empty it must be preset in the KConfig
*/
- void writeConfig( KConfig &config, const TQString &group = TQString::null );
+ void writeConfig( KConfig &config, const TQString &group = TQString() );
/**
* Read the settings
* If the group is empty it must be preset in the KConfig
*/
- void readConfig( KConfig &config, const TQString &group = TQString::null );
+ void readConfig( KConfig &config, const TQString &group = TQString() );
protected:
uint mId;
diff --git a/libkdepim/kaddrbook.cpp b/libkdepim/kaddrbook.cpp
index 187ce6375..7356bc2d8 100644
--- a/libkdepim/kaddrbook.cpp
+++ b/libkdepim/kaddrbook.cpp
@@ -32,7 +32,7 @@
#include
//-----------------------------------------------------------------------------
-void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) {
+void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *tqparent ) {
TQString email;
TQString name;
@@ -56,7 +56,7 @@ void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) {
}
#endif
- KABC::Addressee::List addressees = ab->tqfindByEmail( email );
+ KABC::Addressee::List addressees = ab->findByEmail( email );
if ( addressees.count() > 0 ) {
if ( kapp->dcopClient()->isApplicationRegistered( "kaddressbook" ) ){
@@ -78,12 +78,12 @@ void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) {
#else
TQString text = email + " " + i18n( "is not in address book" );
#endif
- KMessageBox::information( parent, text, TQString::null, "notInAddressBook" );
+ KMessageBox::information( tqparent, text, TQString(), "notInAddressBook" );
}
}
//-----------------------------------------------------------------------------
-void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) {
+void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *tqparent) {
TQString email;
TQString name;
@@ -91,7 +91,7 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) {
KABC::AddressBook *ab = KABC::StdAddressBook::self( true );
- ab->setErrorHandler( new KABC::GuiErrorHandler( parent ) );
+ ab->setErrorHandler( new KABC::GuiErrorHandler( tqparent ) );
// force a reload of the address book file so that changes that were made
// by other programs are loaded
@@ -109,7 +109,7 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) {
}
#endif
- KABC::Addressee::List addressees = ab->tqfindByEmail( email );
+ KABC::Addressee::List addressees = ab->findByEmail( email );
if ( addressees.isEmpty() ) {
KABC::Addressee a;
@@ -151,12 +151,12 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) {
TQString text = i18n("The email address %1 was added to your "
"addressbook; you can add more information to this "
"entry by opening the addressbook.").arg( addr );
- KMessageBox::information( parent, text, TQString::null, "addedtokabc" );
+ KMessageBox::information( tqparent, text, TQString(), "addedtokabc" );
}
} else {
TQString text = i18n("The email address %1 is already in your "
"addressbook.").arg( addr );
- KMessageBox::information( parent, text, TQString::null,
+ KMessageBox::information( tqparent, text, TQString(),
"alreadyInAddressBook" );
}
ab->setErrorHandler( 0 );
@@ -173,22 +173,22 @@ void KAddrBookExternal::addNewAddressee( TQWidget* )
call.send("newContact()");
}
-bool KAddrBookExternal::addVCard( const KABC::Addressee& addressee, TQWidget *parent )
+bool KAddrBookExternal::addVCard( const KABC::Addressee& addressee, TQWidget *tqparent )
{
KABC::AddressBook *ab = KABC::StdAddressBook::self( true );
bool inserted = false;
- ab->setErrorHandler( new KABC::GuiErrorHandler( parent ) );
+ ab->setErrorHandler( new KABC::GuiErrorHandler( tqparent ) );
KABC::Addressee::List addressees =
- ab->tqfindByEmail( addressee.preferredEmail() );
+ ab->findByEmail( addressee.preferredEmail() );
if ( addressees.isEmpty() ) {
if ( KAddrBookExternal::addAddressee( addressee ) ) {
TQString text = i18n("The VCard was added to your addressbook; "
"you can add more information to this "
"entry by opening the addressbook.");
- KMessageBox::information( parent, text, TQString::null, "addedtokabc" );
+ KMessageBox::information( tqparent, text, TQString(), "addedtokabc" );
inserted = true;
}
} else {
@@ -196,7 +196,7 @@ bool KAddrBookExternal::addVCard( const KABC::Addressee& addressee, TQWidget *pa
"your addressbook; however, you may save the VCard "
"into a file and import it into the addressbook "
"manually.");
- KMessageBox::information( parent, text );
+ KMessageBox::information( tqparent, text );
inserted = true;
}
@@ -229,7 +229,7 @@ bool KAddrBookExternal::addAddressee( const KABC::Addressee& addr )
TQString KAddrBookExternal::expandDistributionList( const TQString& listName )
{
if ( listName.isEmpty() )
- return TQString::null;
+ return TQString();
const TQString lowerListName = listName.lower();
KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
@@ -251,7 +251,7 @@ TQString KAddrBookExternal::expandDistributionList( const TQString& listName )
}
}
#endif
- return TQString::null;
+ return TQString();
}
KABC::Resource* KAddrBookExternal::selectResourceForSaving( KABC::AddressBook *addressBook )
diff --git a/libkdepim/kaddrbook.h b/libkdepim/kaddrbook.h
index 374753e54..b48352346 100644
--- a/libkdepim/kaddrbook.h
+++ b/libkdepim/kaddrbook.h
@@ -19,12 +19,12 @@ class TQWidget;
class KDE_EXPORT KAddrBookExternal {
public:
- static void addEmail( const TQString &addr, TQWidget *parent );
+ static void addEmail( const TQString &addr, TQWidget *tqparent );
static void addNewAddressee( TQWidget* );
- static void openEmail( const TQString &addr, TQWidget *parent );
- static void openAddressBook( TQWidget *parent );
+ static void openEmail( const TQString &addr, TQWidget *tqparent );
+ static void openAddressBook( TQWidget *tqparent );
- static bool addVCard( const KABC::Addressee& addressee, TQWidget *parent );
+ static bool addVCard( const KABC::Addressee& addressee, TQWidget *tqparent );
static TQString expandDistributionList( const TQString& listName );
diff --git a/libkdepim/kcmdesignerfields.cpp b/libkdepim/kcmdesignerfields.cpp
index bda4aa7d0..be4aa97bd 100644
--- a/libkdepim/kcmdesignerfields.cpp
+++ b/libkdepim/kcmdesignerfields.cpp
@@ -53,11 +53,11 @@
using namespace KPIM;
-class PageItem : public QCheckListItem
+class PageItem : public TQCheckListItem
{
public:
- PageItem( TQListView *parent, const TQString &path )
- : TQCheckListItem( parent, "", TQCheckListItem::CheckBox ),
+ PageItem( TQListView *tqparent, const TQString &path )
+ : TQCheckListItem( tqparent, "", TQCheckListItem::CheckBox ),
mPath( path ), mIsActive( false )
{
mName = path.mid( path.findRev( '/' ) + 1 );
@@ -85,7 +85,7 @@ class PageItem : public QCheckListItem
allowedTypes.insert( "KDatePicker", i18n( "Date" ) );
while ( it.current() ) {
- if ( allowedTypes.find( it.current()->className() ) != allowedTypes.end() ) {
+ if ( allowedTypes.tqfind( it.current()->className() ) != allowedTypes.end() ) {
TQString name = it.current()->name();
if ( name.startsWith( "X_" ) ) {
new TQListViewItem( this, name,
@@ -126,13 +126,13 @@ class PageItem : public QCheckListItem
bool mIsActive;
};
-KCMDesignerFields::KCMDesignerFields( TQWidget *parent, const char *name )
- : KCModule( parent, name )
+KCMDesignerFields::KCMDesignerFields( TQWidget *tqparent, const char *name )
+ : KCModule( tqparent, name )
{
TQTimer::singleShot( 0, this, TQT_SLOT( delayedInit() ) );
KAboutData *about = new KAboutData( I18N_NOOP( "KCMDesignerfields" ),
- I18N_NOOP( "Qt Designer Fields Dialog" ),
+ I18N_NOOP( "TQt Designer Fields Dialog" ),
0, 0, KAboutData::License_LGPL,
I18N_NOOP( "(c), 2004 Tobias Koenig" ) );
@@ -174,7 +174,7 @@ void KCMDesignerFields::deleteFile()
{
TQListViewItem *item = mPageView->selectedItem();
if ( item ) {
- PageItem *pageItem = static_cast( item->parent() ? item->parent() : item );
+ PageItem *pageItem = static_cast( item->tqparent() ? item->tqparent() : item );
if (KMessageBox::warningContinueCancel(this,
i18n( "Do you really want to delete '%1'?").arg( pageItem->text(0) ), "", KStdGuiItem::del() )
== KMessageBox::Continue)
@@ -215,9 +215,9 @@ void KCMDesignerFields::loadActivePages(const TQStringList& ai)
{
TQListViewItemIterator it( mPageView );
while ( it.current() ) {
- if ( it.current()->parent() == 0 ) {
+ if ( it.current()->tqparent() == 0 ) {
PageItem *item = static_cast( it.current() );
- if ( ai.find( item->name() ) != ai.end() ) {
+ if ( ai.tqfind( item->name() ) != ai.end() ) {
item->setOn( true );
item->setIsActive( true );
}
@@ -239,7 +239,7 @@ TQStringList KCMDesignerFields::saveActivePages()
TQStringList activePages;
while ( it.current() ) {
- if ( it.current()->parent() == 0 ) {
+ if ( it.current()->tqparent() == 0 ) {
PageItem *item = static_cast( it.current() );
activePages.append( item->name() );
}
@@ -269,7 +269,7 @@ void KCMDesignerFields::initGUI()
if ( noDesigner )
{
TQString txt =
- i18n("Warning: Qt Designer could not be found. It is probably not "
+ i18n("Warning: TQt Designer could not be found. It is probably not "
"installed. You will only be able to import existing designer files.");
TQLabel *lbl = new TQLabel( txt, this );
tqlayout->addWidget( lbl );
@@ -284,7 +284,7 @@ void KCMDesignerFields::initGUI()
mPageView->setFullWidth( true );
hbox->addWidget( mPageView );
- TQGroupBox *box = new TQGroupBox(1, Qt::Horizontal, i18n("Preview of Selected Page"), this );
+ TQGroupBox *box = new TQGroupBox(1, TQt::Horizontal, i18n("Preview of Selected Page"), this );
mPagePreview = new TQLabel( box );
mPagePreview->setMinimumWidth( 300 );
@@ -301,11 +301,11 @@ void KCMDesignerFields::initGUI()
" Elements ('Widgets') to store your own values"
" into %1. Proceed as described below:
"
""
- "
Click on 'Edit with Qt Designer'"
+ "
Click on 'Edit with TQt Designer'"
"
In the dialog, select 'Widget', then click OK"
"
Add your widgets to the form"
- "
Save the file in the directory proposed by Qt Designer"
- "
Close Qt Designer"
+ "
Save the file in the directory proposed by TQt Designer"
+ "
Close TQt Designer"
"
"
"
In case you already have a designer file (*.ui) located"
" somewhere on your hard disk, simply choose 'Import Page'
"
@@ -315,7 +315,7 @@ void KCMDesignerFields::initGUI()
" name property to 'X_Foo'."
"
Important: The widget will edit custom fields with an"
" application name of %2. To change the application name"
- " to be edited, set the widget name in Qt Designer.
" )
+ " to be edited, set the widget name in TQt Designer." )
.arg( applicationName(), applicationName() );
KActiveLabel *activeLabel = new KActiveLabel(
@@ -332,7 +332,7 @@ void KCMDesignerFields::initGUI()
hbox->addWidget( mDeleteButton );
mImportButton = new TQPushButton( i18n( "Import Page..." ), this);
hbox->addWidget( mImportButton );
- mDesignerButton = new TQPushButton( i18n( "Edit with Qt Designer..." ), this );
+ mDesignerButton = new TQPushButton( i18n( "Edit with TQt Designer..." ), this );
hbox->addWidget( mDesignerButton );
if ( noDesigner )
@@ -353,7 +353,7 @@ void KCMDesignerFields::updatePreview( TQListViewItem *item )
bool widgetItemSelected = false;
if ( item ) {
- if ( item->parent() ) {
+ if ( item->tqparent() ) {
TQString details = TQString( "
"
"
%1
%2
"
"
%3
%4
"
@@ -371,10 +371,10 @@ void KCMDesignerFields::updatePreview( TQListViewItem *item )
mPageDetails->setText( details );
- PageItem *pageItem = static_cast( item->parent() );
+ PageItem *pageItem = static_cast( item->tqparent() );
mPagePreview->setPixmap( pageItem->preview() );
} else {
- mPageDetails->setText( TQString::null );
+ mPageDetails->setText( TQString() );
PageItem *pageItem = static_cast( item );
mPagePreview->setPixmap( pageItem->preview() );
@@ -386,7 +386,7 @@ void KCMDesignerFields::updatePreview( TQListViewItem *item )
} else {
mPagePreview->setPixmap( TQPixmap() );
mPagePreview->setFrameStyle( 0 );
- mPageDetails->setText( TQString::null );
+ mPageDetails->setText( TQString() );
}
mDeleteButton->setEnabled( widgetItemSelected );
@@ -394,7 +394,7 @@ void KCMDesignerFields::updatePreview( TQListViewItem *item )
void KCMDesignerFields::itemClicked( TQListViewItem *item )
{
- if ( !item || item->parent() != 0 )
+ if ( !item || item->tqparent() != 0 )
return;
PageItem *pageItem = static_cast( item );
@@ -420,7 +420,7 @@ void KCMDesignerFields::startDesigner()
TQListViewItem *item = mPageView->selectedItem();
if ( item ) {
- PageItem *pageItem = static_cast( item->parent() ? item->parent() : item );
+ PageItem *pageItem = static_cast( item->tqparent() ? item->tqparent() : item );
cmdLine += " " + KProcess::quote( pageItem->path() );
}
diff --git a/libkdepim/kcmdesignerfields.h b/libkdepim/kcmdesignerfields.h
index 453730f94..e2e5d5a56 100644
--- a/libkdepim/kcmdesignerfields.h
+++ b/libkdepim/kcmdesignerfields.h
@@ -36,9 +36,10 @@ namespace KPIM {
class KDE_EXPORT KCMDesignerFields : public KCModule
{
Q_OBJECT
+ TQ_OBJECT
public:
- KCMDesignerFields( TQWidget *parent = 0, const char *name = 0 );
+ KCMDesignerFields( TQWidget *tqparent = 0, const char *name = 0 );
virtual void load();
virtual void save();
diff --git a/libkdepim/kconfigpropagator.cpp b/libkdepim/kconfigpropagator.cpp
index 0f59c2a00..aea940892 100644
--- a/libkdepim/kconfigpropagator.cpp
+++ b/libkdepim/kconfigpropagator.cpp
@@ -159,9 +159,9 @@ void KConfigPropagator::parseConfigEntryPath( const TQString &path,
if ( p.count() != 3 ) {
kdError() << "Path has to be of form file/group/entry" << endl;
- file = TQString::null;
- group = TQString::null;
- entry = TQString::null;
+ file = TQString();
+ group = TQString();
+ entry = TQString();
return;
}
diff --git a/libkdepim/kconfigpropagator.h b/libkdepim/kconfigpropagator.h
index 9b3c1a6f6..1bad22506 100644
--- a/libkdepim/kconfigpropagator.h
+++ b/libkdepim/kconfigpropagator.h
@@ -99,8 +99,8 @@ class KDE_EXPORT KConfigPropagator
void setTitle( const TQString &title ) { mTitle = title; }
TQString title() const { return mTitle; }
- virtual TQString arg1() const { return TQString::null; }
- virtual TQString arg2() const { return TQString::null; }
+ virtual TQString arg1() const { return TQString(); }
+ virtual TQString arg2() const { return TQString(); }
virtual void apply() = 0;
diff --git a/libkdepim/kconfigwizard.cpp b/libkdepim/kconfigwizard.cpp
index 6db0f9992..99aa0b598 100644
--- a/libkdepim/kconfigwizard.cpp
+++ b/libkdepim/kconfigwizard.cpp
@@ -31,18 +31,18 @@
#include
#include
-KConfigWizard::KConfigWizard( TQWidget *parent,
+KConfigWizard::KConfigWizard( TQWidget *tqparent,
char *name, bool modal )
- : KDialogBase( TreeList, i18n("Configuration Wizard"), Ok|Cancel, Ok, parent,
+ : KDialogBase( TreeList, i18n("Configuration Wizard"), Ok|Cancel, Ok, tqparent,
name, modal ),
mPropagator( 0 ), mChangesPage( 0 )
{
init();
}
-KConfigWizard::KConfigWizard( KConfigPropagator *propagator, TQWidget *parent,
+KConfigWizard::KConfigWizard( KConfigPropagator *propagator, TQWidget *tqparent,
char *name, bool modal )
- : KDialogBase( TreeList, i18n("Configuration Wizard"), Ok|Cancel, Ok, parent,
+ : KDialogBase( TreeList, i18n("Configuration Wizard"), Ok|Cancel, Ok, tqparent,
name, modal ),
mPropagator( propagator ), mChangesPage( 0 )
{
diff --git a/libkdepim/kconfigwizard.h b/libkdepim/kconfigwizard.h
index e5e6337e2..290b55e3e 100644
--- a/libkdepim/kconfigwizard.h
+++ b/libkdepim/kconfigwizard.h
@@ -33,16 +33,17 @@ class TQListView;
class KDE_EXPORT KConfigWizard : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
Create wizard. You have to set a propgator with setPropagator() later.
*/
- KConfigWizard( TQWidget *parent = 0, char *name = 0, bool modal = false );
+ KConfigWizard( TQWidget *tqparent = 0, char *name = 0, bool modal = false );
/**
Create wizard for given KConfigPropagator. The wizard takes ownership of
the propagator.
*/
- KConfigWizard( KConfigPropagator *propagator, TQWidget *parent = 0,
+ KConfigWizard( KConfigPropagator *propagator, TQWidget *tqparent = 0,
char *name = 0, bool modal = false );
/**
Destructor.
@@ -78,9 +79,9 @@ class KDE_EXPORT KConfigWizard : public KDialogBase
/**
Validates the supplied data. Returns a appropiate error when some data
- is invalid. Return TQString::null if all data is valid.
+ is invalid. Return TQString() if all data is valid.
*/
- virtual TQString validate() { return TQString::null; }
+ virtual TQString validate() { return TQString(); }
protected slots:
void readConfig();
diff --git a/libkdepim/kdateedit.cpp b/libkdepim/kdateedit.cpp
index c4221556c..1d54920d6 100644
--- a/libkdepim/kdateedit.cpp
+++ b/libkdepim/kdateedit.cpp
@@ -34,11 +34,11 @@
#include "kdateedit.h"
-class DateValidator : public QValidator
+class DateValidator : public TQValidator
{
public:
- DateValidator( const TQStringList &keywords, TQWidget* parent, const char* name = 0 )
- : TQValidator( parent, name ), mKeywords( keywords )
+ DateValidator( const TQStringList &keywords, TQWidget* tqparent, const char* name = 0 )
+ : TQValidator( tqparent, name ), mKeywords( keywords )
{}
virtual State validate( TQString &str, int& ) const
@@ -64,8 +64,8 @@ class DateValidator : public QValidator
TQStringList mKeywords;
};
-KDateEdit::KDateEdit( TQWidget *parent, const char *name )
- : TQComboBox( true, parent, name ),
+KDateEdit::KDateEdit( TQWidget *tqparent, const char *name )
+ : TQComboBox( true, tqparent, name ),
mReadOnly( false ),
mDiscardNextMousePress( false )
{
@@ -163,7 +163,7 @@ void KDateEdit::popup()
// The combo box is now shown pressed. Make it show not pressed again
// by causing its (invisible) list box to emit a 'selected' signal.
- // First, ensure that the list box tqcontains the date currently displayed.
+ // First, ensure that the list box contains the date currently displayed.
TQDate date = parseDate();
assignDate( date );
updateView();
@@ -171,7 +171,7 @@ void KDateEdit::popup()
TQListBox *lb = listBox();
if (lb) {
lb->setCurrentItem(0);
- TQKeyEvent* keyEvent = new TQKeyEvent(TQEvent::KeyPress, Qt::Key_Enter, 0, 0);
+ TQKeyEvent* keyEvent = new TQKeyEvent(TQEvent::KeyPress, TQt::Key_Enter, 0, 0);
TQApplication::postEvent(lb, keyEvent);
}
}
@@ -191,12 +191,12 @@ void KDateEdit::dateSelected( TQDate date )
void KDateEdit::lineEnterPressed()
{
- bool tqreplaced = false;
+ bool replaced = false;
- TQDate date = parseDate( &tqreplaced );
+ TQDate date = parseDate( &replaced );
if (assignDate( date ) ) {
- if ( tqreplaced )
+ if ( replaced )
updateView();
emit dateChanged( date );
@@ -204,13 +204,13 @@ void KDateEdit::lineEnterPressed()
}
}
-TQDate KDateEdit::parseDate( bool *tqreplaced ) const
+TQDate KDateEdit::parseDate( bool *replaced ) const
{
TQString text = currentText();
TQDate result;
- if ( tqreplaced )
- (*tqreplaced) = false;
+ if ( replaced )
+ (*replaced) = false;
if ( text.isEmpty() )
result = TQDate();
@@ -235,8 +235,8 @@ TQDate KDateEdit::parseDate( bool *tqreplaced ) const
}
result = today.addDays( i );
- if ( tqreplaced )
- (*tqreplaced) = true;
+ if ( replaced )
+ (*replaced) = true;
} else {
result = KGlobal::locale()->readDate( text );
}
@@ -256,15 +256,15 @@ bool KDateEdit::eventFilter( TQObject *object, TQEvent *event )
// Up and down arrow keys step the date
TQKeyEvent* keyEvent = (TQKeyEvent*)event;
- if ( keyEvent->key() == Qt::Key_Return ) {
+ if ( keyEvent->key() == TQt::Key_Return ) {
lineEnterPressed();
return true;
}
int step = 0;
- if ( keyEvent->key() == Qt::Key_Up )
+ if ( keyEvent->key() == TQt::Key_Up )
step = 1;
- else if ( keyEvent->key() == Qt::Key_Down )
+ else if ( keyEvent->key() == TQt::Key_Down )
step = -1;
// TODO: If it's not an input key, but something like Return, Enter, Tab, etc..., don't eat the keypress, but handle it through to the default eventfilter!
if ( step && !mReadOnly ) {
@@ -307,7 +307,7 @@ bool KDateEdit::eventFilter( TQObject *object, TQEvent *event )
void KDateEdit::mousePressEvent( TQMouseEvent *event )
{
- if ( event->button() == Qt::LeftButton && mDiscardNextMousePress ) {
+ if ( event->button() == TQt::LeftButton && mDiscardNextMousePress ) {
mDiscardNextMousePress = false;
return;
}
diff --git a/libkdepim/kdateedit.h b/libkdepim/kdateedit.h
index 0adb6ee56..cde85b0f9 100644
--- a/libkdepim/kdateedit.h
+++ b/libkdepim/kdateedit.h
@@ -36,7 +36,7 @@ class TQEvent;
/**
A date editing widget that consists of an editable combo box.
- The combo box tqcontains the date in text form, and clicking the combo
+ The combo box contains the date in text form, and clicking the combo
box arrow will display a 'popup' style date picker.
This widget also supports advanced features like allowing the user
@@ -51,12 +51,13 @@ class TQEvent;
@author David Jarvie
@author Tobias Koenig
*/
-class KDE_EXPORT KDateEdit : public QComboBox
+class KDE_EXPORT KDateEdit : public TQComboBox
{
Q_OBJECT
+ TQ_OBJECT
public:
- KDateEdit( TQWidget *parent = 0, const char *name = 0 );
+ KDateEdit( TQWidget *tqparent = 0, const char *name = 0 );
virtual ~KDateEdit();
/**
diff --git a/libkdepim/kdatepickerpopup.cpp b/libkdepim/kdatepickerpopup.cpp
index 8e3f36953..7d1f64272 100644
--- a/libkdepim/kdatepickerpopup.cpp
+++ b/libkdepim/kdatepickerpopup.cpp
@@ -26,9 +26,9 @@
#include "kdatepickerpopup.h"
-KDatePickerPopup::KDatePickerPopup( int items, const TQDate &date, TQWidget *parent,
+KDatePickerPopup::KDatePickerPopup( int items, const TQDate &date, TQWidget *tqparent,
const char *name )
- : TQPopupMenu( parent, name )
+ : TQPopupMenu( tqparent, name )
{
mItems = items;
diff --git a/libkdepim/kdatepickerpopup.h b/libkdepim/kdatepickerpopup.h
index 70ed6793f..4b5632804 100644
--- a/libkdepim/kdatepickerpopup.h
+++ b/libkdepim/kdatepickerpopup.h
@@ -42,9 +42,10 @@
@author Bram Schoenmakers
*/
-class KDE_EXPORT KDatePickerPopup: public QPopupMenu
+class KDE_EXPORT KDatePickerPopup: public TQPopupMenu
{
Q_OBJECT
+ TQ_OBJECT
public:
enum { NoDate = 1, DatePicker = 2, Words = 4 };
@@ -53,11 +54,11 @@ class KDE_EXPORT KDatePickerPopup: public QPopupMenu
@param items List of all desirable items, separated with a bitwise OR.
@param date Initial date of datepicker-widget.
- @param parent The object's parent.
+ @param tqparent The object's tqparent.
@param name The object's name.
*/
KDatePickerPopup( int items = DatePicker, const TQDate &date = TQDate::tqcurrentDate(),
- TQWidget *parent = 0, const char *name = 0 );
+ TQWidget *tqparent = 0, const char *name = 0 );
/**
@return A pointer to the private variable mDatePicker, an instance of
diff --git a/libkdepim/kdepim.widgets b/libkdepim/kdepim.widgets
index 21410ee61..2f1b5e24c 100644
--- a/libkdepim/kdepim.widgets
+++ b/libkdepim/kdepim.widgets
@@ -25,5 +25,5 @@ Group=Input (KDE-PIM)
ToolTip=Time Edit Combobox (KDE-PIM)
WhatsThis=A widget to enter a time. It can also be selected from a drop-down list.
IncludeFile=libkdepim/ktimeedit.h
-ConstructorArgs=(parent, QTime::currentTime(), name)
+ConstructorArgs=(tqparent, QTime::currentTime(), name)
Group=Input (KDE-PIM)
diff --git a/libkdepim/kfileio.cpp b/libkdepim/kfileio.cpp
index 6a7eea7c3..913ee2cc1 100644
--- a/libkdepim/kfileio.cpp
+++ b/libkdepim/kfileio.cpp
@@ -190,7 +190,7 @@ KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len,
if (aAskIfExists)
{
TQString str;
- str = i18n("File %1 exists.\nDo you want to tqreplace it?")
+ str = i18n("File %1 exists.\nDo you want to replace it?")
.arg(aFileName);
rc = KMessageBox::warningContinueCancel(0,
str, i18n("Save to File"), i18n("&Replace"));
@@ -348,8 +348,8 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck,
if ( !g.isReadable() ){
error.append(i18n("Folder %1 is inaccessible.").arg(toCheck) + "\n");
} else {
- const QFileInfoList *list = g.entryInfoList();
- QFileInfoListIterator it( *list );
+ const TQFileInfoList *list = g.entryInfoList();
+ TQFileInfoListIterator it( *list );
TQFileInfo *fi;
while ((fi = it.current()) != 0) {
TQString newToCheck = toCheck + "/" + fi->fileName();
@@ -365,7 +365,7 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck,
return error;
}
-bool checkAndCorrectPermissionsIfPossibleWithErrorHandling( TQWidget *parent,
+bool checkAndCorrectPermissionsIfPossibleWithErrorHandling( TQWidget *tqparent,
const TQString &toCheck, const bool recursive, const bool wantItReadable,
const bool wantItWritable )
{
@@ -376,7 +376,7 @@ bool checkAndCorrectPermissionsIfPossibleWithErrorHandling( TQWidget *parent,
// it is just a warning.
if ( !error.isEmpty() ) {
kdDebug() << "checkPermissions found:" << error << endl;
- KMessageBox::detailedSorry(parent,
+ KMessageBox::detailedSorry(tqparent,
i18n("Some files or folders do not have "
"the right permissions, please correct them "
"manually."),
diff --git a/libkdepim/kfileio.h b/libkdepim/kfileio.h
index 99d4d1dce..8365f1e29 100644
--- a/libkdepim/kfileio.h
+++ b/libkdepim/kfileio.h
@@ -78,10 +78,10 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck,
* all files and folders below. If the permissions are not ok, it tries to correct
* them. If that fails then a warning with detailled information is given.
*
- * @param parent If parent is 0, then the message box becomes an
- * application-global modal dialog box. If parent
+ * @param tqparent If tqparent is 0, then the message box becomes an
+ * application-global modal dialog box. If tqparent
* is a widget, the message box becomes modal
- * relative to parent.
+ * relative to tqparent.
* @param toCheck The file or folder of which the permissions should
* be checked.
* @param recursive Set to true, it will check the contents of a folder
@@ -97,7 +97,7 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck,
* then the permissions are not ok and it was not possible to correct
* all errors.
*/
-bool checkAndCorrectPermissionsIfPossibleWithErrorHandling( TQWidget *parent,
+bool checkAndCorrectPermissionsIfPossibleWithErrorHandling( TQWidget *tqparent,
const TQString &toCheck, const bool recursive, const bool wantItReadable,
const bool wantItWritable );
}
diff --git a/libkdepim/kfoldertree.cpp b/libkdepim/kfoldertree.cpp
index 2bf6ca1be..0098adbb2 100644
--- a/libkdepim/kfoldertree.cpp
+++ b/libkdepim/kfoldertree.cpp
@@ -12,18 +12,18 @@
#include
//-----------------------------------------------------------------------------
-KFolderTreeItem::KFolderTreeItem( KFolderTree *parent, const TQString & label,
+KFolderTreeItem::KFolderTreeItem( KFolderTree *tqparent, const TQString & label,
Protocol protocol, Type type )
- : KListViewItem( parent, label ), mProtocol( protocol ), mType( type ),
+ : KListViewItem( tqparent, label ), mProtocol( protocol ), mType( type ),
mUnread(-1), mTotal(0), mSize(0), mFolderIsCloseToQuota( false )
{
}
//-----------------------------------------------------------------------------
-KFolderTreeItem::KFolderTreeItem( KFolderTreeItem *parent,
+KFolderTreeItem::KFolderTreeItem( KFolderTreeItem *tqparent,
const TQString & label, Protocol protocol, Type type,
int unread, int total )
- : KListViewItem( parent, label ), mProtocol( protocol ), mType( type ),
+ : KListViewItem( tqparent, label ), mProtocol( protocol ), mType( type ),
mUnread( unread ), mTotal( total ), mSize(0), mFolderIsCloseToQuota( false )
{
}
@@ -149,7 +149,7 @@ void KFolderTreeItem::setUnreadCount( int aUnread )
mUnread = aUnread;
- TQString unread = TQString::null;
+ TQString unread = TQString();
if (mUnread == 0)
unread = "- ";
else {
@@ -168,7 +168,7 @@ void KFolderTreeItem::setTotalCount( int aTotal )
mTotal = aTotal;
- TQString total = TQString::null;
+ TQString total = TQString();
if (mTotal == 0)
total = "- ";
else {
@@ -269,7 +269,7 @@ void KFolderTreeItem::paintCell( TQPainter * p, const TQColorGroup & cg,
// deal with the folder column if the unread column is not shown
/* The below is exceedingly silly, but Ingo insists that the unread
- * count that is shown in parenthesis after the folder name must
+ * count that is shown in tqparenthesis after the folder name must
* be configurable in color. That means that paintCell needs to do
* two painting passes which flickers. Since that flicker is not
* needed when there is the unread column, special case that. */
@@ -359,8 +359,8 @@ void KFolderTreeItem::setFolderIsCloseToQuota( bool v )
//=============================================================================
-KFolderTree::KFolderTree( TQWidget *parent, const char* name )
- : KListView( parent, name ), mUnreadIndex(-1), mTotalIndex(-1), mSizeIndex(-1)
+KFolderTree::KFolderTree( TQWidget *tqparent, const char* name )
+ : KListView( tqparent, name ), mUnreadIndex(-1), mTotalIndex(-1), mSizeIndex(-1)
{
// GUI-options
setStyleDependantFrameWidth();
@@ -464,7 +464,7 @@ bool KFolderTree::acceptDrag( TQDropEvent* event ) const
void KFolderTree::addUnreadColumn( const TQString & name, int width )
{
mUnreadIndex = addColumn( name, width );
- setColumnAlignment( mUnreadIndex, tqApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight );
+ setColumnAlignment( mUnreadIndex, tqApp->reverseLayout() ? TQt::AlignLeft : TQt::AlignRight );
header()->adjustHeaderSize();
}
@@ -472,7 +472,7 @@ void KFolderTree::addUnreadColumn( const TQString & name, int width )
void KFolderTree::addTotalColumn( const TQString & name, int width )
{
mTotalIndex = addColumn( name, width );
- setColumnAlignment( mTotalIndex, tqApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight );
+ setColumnAlignment( mTotalIndex, tqApp->reverseLayout() ? TQt::AlignLeft : TQt::AlignRight );
header()->adjustHeaderSize();
}
@@ -507,7 +507,7 @@ void KFolderTree::removeTotalColumn()
void KFolderTree::addSizeColumn( const TQString & name, int width )
{
mSizeIndex = addColumn( name, width );
- setColumnAlignment( mSizeIndex, tqApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight );
+ setColumnAlignment( mSizeIndex, tqApp->reverseLayout() ? TQt::AlignLeft : TQt::AlignRight );
header()->adjustHeaderSize();
}
diff --git a/libkdepim/kfoldertree.h b/libkdepim/kfoldertree.h
index 5ababa1cc..db0f8baf7 100644
--- a/libkdepim/kfoldertree.h
+++ b/libkdepim/kfoldertree.h
@@ -61,7 +61,7 @@ struct KPaintInfo {
showTodo(false),
showSpamHam(false),
showWatchedIgnored(false),
- showStatus(false),
+ showtqStatus(false),
showSigned(false),
showCrypto(false),
showReceiver(false),
@@ -108,7 +108,7 @@ struct KPaintInfo {
bool showTodo;
bool showSpamHam;
bool showWatchedIgnored;
- bool showStatus;
+ bool showtqStatus;
bool showSigned;
bool showCrypto;
bool showReceiver;
@@ -171,11 +171,11 @@ class KDE_EXPORT KFolderTreeItem : public KListViewItem
};
/** constructs a root-item */
- KFolderTreeItem( KFolderTree *parent, const TQString & label=TQString::null,
+ KFolderTreeItem( KFolderTree *tqparent, const TQString & label=TQString(),
Protocol protocol=NONE, Type type=Root );
/** constructs a child-item */
- KFolderTreeItem( KFolderTreeItem *parent, const TQString & label=TQString::null,
+ KFolderTreeItem( KFolderTreeItem *tqparent, const TQString & label=TQString(),
Protocol protocol=NONE, Type type=Other, int unread=0, int total=0 );
/** compare */
@@ -242,9 +242,10 @@ class KDE_EXPORT KFolderTreeItem : public KListViewItem
class KDE_EXPORT KFolderTree : public KListView
{
Q_OBJECT
+ TQ_OBJECT
public:
- KFolderTree( TQWidget *parent, const char *name=0 );
+ KFolderTree( TQWidget *tqparent, const char *name=0 );
/** registers MIMETypes that are handled
@param mimeType the name of the MIMEType
diff --git a/libkdepim/kimportdialog.cpp b/libkdepim/kimportdialog.cpp
index cb59200a6..904415982 100644
--- a/libkdepim/kimportdialog.cpp
+++ b/libkdepim/kimportdialog.cpp
@@ -130,7 +130,7 @@ TQString KImportColumn::convert()
class ColumnItem : public TQListViewItem {
public:
- ColumnItem(KImportColumn *col,TQListView *parent) : TQListViewItem(parent), mColumn(col)
+ ColumnItem(KImportColumn *col,TQListView *tqparent) : TQListViewItem(tqparent), mColumn(col)
{
setText(0,mColumn->header());
}
@@ -148,8 +148,8 @@ class ColumnItem : public TQListViewItem {
data objects, this class has to be inherited by a special class, which
reimplements the convertRow() function.
*/
-KImportDialog::KImportDialog(TQWidget* parent)
- : KDialogBase(parent,"importdialog",true,i18n("Import Text File"),Ok|Cancel),
+KImportDialog::KImportDialog(TQWidget* tqparent)
+ : KDialogBase(tqparent,"importdialog",true,i18n("Import Text File"),Ok|Cancel),
mSeparator(","),
mCurrentRow(0)
{
@@ -303,7 +303,7 @@ void KImportDialog::readFile( int rows )
mData.clear();
int row, column;
- enum { S_START, S_QUOTED_FIELD, S_MAYBE_END_OF_QUOTED_FIELD, S_END_OF_QUOTED_FIELD,
+ enum { S_START, S_TQUOTED_FIELD, S_MAYBE_END_OF_TQUOTED_FIELD, S_END_OF_TQUOTED_FIELD,
S_MAYBE_NORMAL_FIELD, S_NORMAL_FIELD } state = S_START;
TQChar m_textquote = '"';
@@ -347,7 +347,7 @@ void KImportDialog::readFile( int rows )
case S_START :
if (x == m_textquote) {
field += x;
- state = S_QUOTED_FIELD;
+ state = S_TQUOTED_FIELD;
} else if (x == mSeparator) {
++column;
} else if (x == '\n') {
@@ -358,10 +358,10 @@ void KImportDialog::readFile( int rows )
state = S_MAYBE_NORMAL_FIELD;
}
break;
- case S_QUOTED_FIELD :
+ case S_TQUOTED_FIELD :
if (x == m_textquote) {
field += x;
- state = S_MAYBE_END_OF_QUOTED_FIELD;
+ state = S_MAYBE_END_OF_TQUOTED_FIELD;
} else if (x == '\n') {
setData(row - m_startline, column, field);
field = "";
@@ -376,10 +376,10 @@ void KImportDialog::readFile( int rows )
field += x;
}
break;
- case S_MAYBE_END_OF_QUOTED_FIELD :
+ case S_MAYBE_END_OF_TQUOTED_FIELD :
if (x == m_textquote) {
field += x;
- state = S_QUOTED_FIELD;
+ state = S_TQUOTED_FIELD;
} else if (x == mSeparator || x == '\n') {
setData(row - m_startline, column, field);
field = "";
@@ -391,10 +391,10 @@ void KImportDialog::readFile( int rows )
}
state = S_START;
} else {
- state = S_END_OF_QUOTED_FIELD;
+ state = S_END_OF_TQUOTED_FIELD;
}
break;
- case S_END_OF_QUOTED_FIELD :
+ case S_END_OF_TQUOTED_FIELD :
if (x == mSeparator || x == '\n') {
setData(row - m_startline, column, field);
field = "";
@@ -406,13 +406,13 @@ void KImportDialog::readFile( int rows )
}
state = S_START;
} else {
- state = S_END_OF_QUOTED_FIELD;
+ state = S_END_OF_TQUOTED_FIELD;
}
break;
case S_MAYBE_NORMAL_FIELD :
if (x == m_textquote) {
field = "";
- state = S_QUOTED_FIELD;
+ state = S_TQUOTED_FIELD;
}
case S_NORMAL_FIELD :
if (x == mSeparator || x == '\n') {
@@ -443,7 +443,7 @@ void KImportDialog::setCellText(int row, int col, const TQString& text)
if ((mTable->numRows() - 1) < row) mTable->setNumRows(row + 1);
if ((mTable->numCols() - 1) < col) mTable->setNumCols(col + 1);
- KImportColumn *c = mColumnDict.find(col);
+ KImportColumn *c = mColumnDict.tqfind(col);
TQString formattedText;
if (c) formattedText = c->preview(text,findFormat(col));
else formattedText = text;
@@ -492,7 +492,7 @@ void KImportDialog::tableSelected()
TQTableSelection selection = mTable->selection(mTable->currentSelection());
TQListViewItem *item = mHeaderList->firstChild();
- KImportColumn *col = mColumnDict.find(selection.leftCol());
+ KImportColumn *col = mColumnDict.tqfind(selection.leftCol());
if (col) {
while(item) {
if (item->text(0) == col->header()) {
@@ -633,7 +633,7 @@ void KImportDialog::removeColumn()
for(int i=selection.leftCol();i<=selection.rightCol();++i) {
if (i >= 0) {
mTable->horizontalHeader()->setLabel(i,TQString::number(i+1));
- KImportColumn *col = mColumnDict.find(i);
+ KImportColumn *col = mColumnDict.tqfind(i);
if (col) {
mColumnDict.remove(i);
mFormats.remove(i);
@@ -674,7 +674,7 @@ void KImportDialog::applyConverter()
int KImportDialog::findFormat(int column)
{
- TQMap::ConstIterator formatIt = mFormats.find(column);
+ TQMap::ConstIterator formatIt = mFormats.tqfind(column);
int format;
if (formatIt == mFormats.end()) format = KImportColumn::FormatUndefined;
else format = *formatIt;
@@ -713,7 +713,7 @@ void KImportDialog::setData( uint row, uint col, const TQString &value )
rowVector->resize( col + 1 );
}
- KImportColumn *c = mColumnDict.find( col );
+ KImportColumn *c = mColumnDict.tqfind( col );
if ( c )
rowVector->at( col ) = c->preview( val, findFormat(col) );
else
diff --git a/libkdepim/kimportdialog.h b/libkdepim/kimportdialog.h
index d7dd634eb..b16f335f6 100644
--- a/libkdepim/kimportdialog.h
+++ b/libkdepim/kimportdialog.h
@@ -76,8 +76,9 @@ class KImportColumn
class KImportDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- KImportDialog(TQWidget* parent);
+ KImportDialog(TQWidget* tqparent);
public slots:
bool setFile(const TQString& file);
diff --git a/libkdepim/kincidencechooser.cpp b/libkdepim/kincidencechooser.cpp
index 2cef98f3a..431d650de 100644
--- a/libkdepim/kincidencechooser.cpp
+++ b/libkdepim/kincidencechooser.cpp
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#include
@@ -44,8 +44,8 @@
int KIncidenceChooser::chooseMode = KIncidenceChooser::ask ;
-KIncidenceChooser::KIncidenceChooser(TQWidget *parent, char *name) :
- KDialog(parent,name,true)
+KIncidenceChooser::KIncidenceChooser(TQWidget *tqparent, char *name) :
+ KDialog(tqparent,name,true)
{
KDialog *topFrame = this;
TQGridLayout *topLayout = new TQGridLayout(topFrame,5,3);
@@ -104,7 +104,7 @@ KIncidenceChooser::KIncidenceChooser(TQWidget *parent, char *name) :
#else
mDiffBut = 0;
#endif
- mBg = new TQButtonGroup ( 1, Qt::Horizontal, i18n("Sync Preferences"), topFrame);
+ mBg = new TQButtonGroup ( 1, TQt::Horizontal, i18n("Sync Preferences"), topFrame);
topLayout->addMultiCellWidget(mBg, iii,iii,0,2);
++iii;
mBg->insert( new TQRadioButton ( i18n("Take local entry on conflict"), mBg ), KIncidenceChooser::local);
diff --git a/libkdepim/kincidencechooser.h b/libkdepim/kincidencechooser.h
index 9d9e016ad..4dc6b2ef1 100644
--- a/libkdepim/kincidencechooser.h
+++ b/libkdepim/kincidencechooser.h
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#ifndef _KINCIDENCECHOOSER_H
#define _KINCIDENCECHOOSER_H
@@ -42,12 +42,13 @@ class TQButtonGroup;
class KDE_EXPORT KIncidenceChooser : public KDialog
{
Q_OBJECT
+ TQ_OBJECT
public:
enum mode {
local, remote, newest, ask, both
};
/** Initialize dialog and pages */
- KIncidenceChooser( TQWidget *parent=0, char *name=0 );
+ KIncidenceChooser( TQWidget *tqparent=0, char *name=0 );
~KIncidenceChooser();
//void setChooseText( TQString );
void setIncidence( KCal::Incidence *, KCal::Incidence * );
diff --git a/libkdepim/kmailcompletion.cpp b/libkdepim/kmailcompletion.cpp
index e7e9e17f2..98a3cb9ee 100644
--- a/libkdepim/kmailcompletion.cpp
+++ b/libkdepim/kmailcompletion.cpp
@@ -44,8 +44,8 @@ TQString KMailCompletion::makeCompletion( const TQString &string )
// this should be in postProcessMatch, but postProcessMatch is const and will not allow nextMatch
if ( !match.isEmpty() ){
const TQString firstMatch( match );
- while ( match.find( TQRegExp( "(@)|(<.*>)" ) ) == -1 ) {
- /* local email do not require @domain part, if match is an address we'll find
+ while ( match.tqfind( TQRegExp( "(@)|(<.*>)" ) ) == -1 ) {
+ /* local email do not require @domain part, if match is an address we'll tqfind
* last+first in m_keyMap and we'll know that match is already a valid email.
*
* Distribution list do not have last+first entry, they will be in mailAddr
@@ -53,7 +53,7 @@ TQString KMailCompletion::makeCompletion( const TQString &string )
const TQStringList &mailAddr = m_keyMap[ match ]; //get all mailAddr for this keyword
bool isEmail = false;
for ( TQStringList::ConstIterator sit ( mailAddr.begin() ), sEnd( mailAddr.end() ); sit != sEnd; ++sit )
- if ( (*sit).find( "<" + match + ">" ) != -1 || (*sit) == match ) {
+ if ( (*sit).tqfind( "<" + match + ">" ) != -1 || (*sit) == match ) {
isEmail = true;
break;
}
@@ -62,7 +62,7 @@ TQString KMailCompletion::makeCompletion( const TQString &string )
// match is a keyword, skip it and try to find match
match = nextMatch();
if ( firstMatch == match ){
- match = TQString::null;
+ match = TQString();
break;
}
} else
@@ -77,7 +77,7 @@ void KMailCompletion::addItemWithKeys( const TQString& email, int weight, const
Q_ASSERT( keyWords != 0 );
for ( TQStringList::ConstIterator it( keyWords->begin() ); it != keyWords->end(); ++it ) {
TQStringList &emailList = m_keyMap[ (*it) ]; //lookup email-list for given keyword
- if ( emailList.find( email ) == emailList.end() ) //add email if not there
+ if ( emailList.tqfind( email ) == emailList.end() ) //add email if not there
emailList.append( email );
addItem( (*it),weight ); //inform KCompletion about keyword
}
@@ -90,7 +90,7 @@ void KMailCompletion::postProcessMatches( TQStringList * pMatches )const
return;
//KCompletion has found the keywords for us, we can now map them to mail-addr
- TQMap< TQString, bool > mailAddrDistinct; //TODO tqreplace with QSet in KDE4
+ TQMap< TQString, bool > mailAddrDistinct; //TODO replace with TQSet in KDE4
for ( TQStringList::ConstIterator sit ( pMatches->begin() ), sEnd( pMatches->end() ); sit != sEnd; ++sit ) {
const TQStringList &mailAddr = m_keyMap[ (*sit) ]; //get all mailAddr for this keyword
for ( TQStringList::ConstIterator sit ( mailAddr.begin() ), sEnd( mailAddr.end() ); sit != sEnd; ++sit ) {
diff --git a/libkdepim/kmailcompletion.h b/libkdepim/kmailcompletion.h
index 8f29d7e02..254507c19 100644
--- a/libkdepim/kmailcompletion.h
+++ b/libkdepim/kmailcompletion.h
@@ -36,6 +36,7 @@ namespace KPIM {
class KMailCompletion : public KCompletion
{
Q_OBJECT
+ TQ_OBJECT
public:
KMailCompletion();
@@ -58,14 +59,14 @@ class KMailCompletion : public KCompletion
*
* Items may be added with KCompletion::addItem, those will only be returned as match if they
* are in one of these formats:
- * \li tqcontains localpart@domain
+ * \li contains localpart@domain
* \li tqcontains
* or if they have also been added with this function.
*/
void addItemWithKeys( const TQString& email, int weight, const TQStringList * keyWords);
/**
- * Uses an internal map to tqreplace all keywords in pMatches whith corrsesponding email addresses.
+ * Uses an internal map to replace all keywords in pMatches whith corrsesponding email addresses.
*/
virtual void postProcessMatches( TQStringList * pMatches )const;
diff --git a/libkdepim/komposer/core/attachment.cpp b/libkdepim/komposer/core/attachment.cpp
index f8240380e..df803de60 100644
--- a/libkdepim/komposer/core/attachment.cpp
+++ b/libkdepim/komposer/core/attachment.cpp
@@ -61,50 +61,50 @@ Attachment::~Attachment()
delete d; d = 0;
}
-QString
+TQString
Attachment::name() const
{
return d->name;
}
-QCString
+TQCString
Attachment::cte() const
{
return d->cte;
}
-QByteArray
+TQByteArray
Attachment::data() const
{
return d->data;
}
-QCString
+TQCString
Attachment::type() const
{
return d->type;
}
-QCString
+TQCString
Attachment::subType() const
{
return d->subType;
}
-QCString
+TQCString
Attachment::paramAttr() const
{
return d->paramAttr;
}
-QString
+TQString
Attachment::paramValue() const
{
return d->paramValue;
}
-QCString
+TQCString
Attachment::contentDisposition() const
{
return d->contDisp;
diff --git a/libkdepim/komposer/core/core.cpp b/libkdepim/komposer/core/core.cpp
index f93e59cc9..bffae60ed 100644
--- a/libkdepim/komposer/core/core.cpp
+++ b/libkdepim/komposer/core/core.cpp
@@ -53,9 +53,9 @@
using namespace Komposer;
-Core::Core( TQWidget *parent, const char *name )
+Core::Core( TQWidget *tqparent, const char *name )
: KomposerIface( "KomposerIface" ),
- KMainWindow( parent, name ), m_currentEditor( 0 )
+ KMainWindow( tqparent, name ), m_currentEditor( 0 )
{
initWidgets();
initCore();
@@ -158,7 +158,7 @@ Core::selectEditor( Komposer::Editor *editor )
TQPtrList *partList = const_cast*>(
m_partManager->parts() );
- if ( partList->find( part ) == -1 )
+ if ( partList->tqfind( part ) == -1 )
addPart( part );
m_partManager->setActivePart( part );
diff --git a/libkdepim/komposer/core/core.h b/libkdepim/komposer/core/core.h
index 91ef133e9..871d67a05 100644
--- a/libkdepim/komposer/core/core.h
+++ b/libkdepim/komposer/core/core.h
@@ -45,6 +45,7 @@ namespace Komposer
class Core : public KMainWindow, virtual public KomposerIface
{
Q_OBJECT
+ TQ_OBJECT
public:
Core( TQWidget *tqparentWidget = 0, const char *name = 0 );
virtual ~Core();
diff --git a/libkdepim/komposer/core/corewidget.cpp b/libkdepim/komposer/core/corewidget.cpp
index c65893766..53e8abd2c 100644
--- a/libkdepim/komposer/core/corewidget.cpp
+++ b/libkdepim/komposer/core/corewidget.cpp
@@ -24,8 +24,8 @@
using namespace Komposer;
-CoreWidget::CoreWidget( TQWidget *parent, const char *name )
- : TQWidget( parent, name )
+CoreWidget::CoreWidget( TQWidget *tqparent, const char *name )
+ : TQWidget( tqparent, name )
{
}
diff --git a/libkdepim/komposer/core/corewidget.h b/libkdepim/komposer/core/corewidget.h
index 8b07a0a7a..8c67e77d0 100644
--- a/libkdepim/komposer/core/corewidget.h
+++ b/libkdepim/komposer/core/corewidget.h
@@ -29,11 +29,12 @@
namespace Komposer
{
- class CoreWidget : public QWidget
+ class CoreWidget : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- CoreWidget( TQWidget *parent, const char *name=0 );
+ CoreWidget( TQWidget *tqparent, const char *name=0 );
virtual TQString subject() const =0;
virtual TQStringList to() const =0;
diff --git a/libkdepim/komposer/core/editor.cpp b/libkdepim/komposer/core/editor.cpp
index 5dada393f..d9ecbd56e 100644
--- a/libkdepim/komposer/core/editor.cpp
+++ b/libkdepim/komposer/core/editor.cpp
@@ -30,8 +30,8 @@ public:
TQString id;
};
-Editor::Editor( TQObject *parent, const char *name, const TQStringList &args )
- : Plugin( parent, name, args ), d( new Private )
+Editor::Editor( TQObject *tqparent, const char *name, const TQStringList &args )
+ : Plugin( tqparent, name, args ), d( new Private )
{
}
diff --git a/libkdepim/komposer/core/editor.h b/libkdepim/komposer/core/editor.h
index a5b78915d..9cc9336dd 100644
--- a/libkdepim/komposer/core/editor.h
+++ b/libkdepim/komposer/core/editor.h
@@ -38,6 +38,7 @@ namespace Komposer {
class Editor : public Plugin
{
Q_OBJECT
+ TQ_OBJECT
public:
enum TextType {
Plain = 1 << 0,
@@ -92,7 +93,7 @@ namespace Komposer {
virtual void changeSignature( const TQString &txt ) =0;
protected:
- Editor( TQObject *parent, const char *name, const TQStringList &args );
+ Editor( TQObject *tqparent, const char *name, const TQStringList &args );
private:
class Private;
diff --git a/libkdepim/komposer/core/plugin.cpp b/libkdepim/komposer/core/plugin.cpp
index 41af47cd9..dbadaff59 100644
--- a/libkdepim/komposer/core/plugin.cpp
+++ b/libkdepim/komposer/core/plugin.cpp
@@ -35,8 +35,8 @@ public:
//Core* core;
};
-Plugin::Plugin( TQObject *parent, const char *name, const TQStringList & )
- : TQObject( parent, name ), d( new Private )
+Plugin::Plugin( TQObject *tqparent, const char *name, const TQStringList & )
+ : TQObject( tqparent, name ), d( new Private )
{
//d->core = core;
}
diff --git a/libkdepim/komposer/core/plugin.h b/libkdepim/komposer/core/plugin.h
index 2dddd09f4..bb62f3224 100644
--- a/libkdepim/komposer/core/plugin.h
+++ b/libkdepim/komposer/core/plugin.h
@@ -33,6 +33,7 @@ namespace Komposer
virtual public KXMLGUIClient
{
Q_OBJECT
+ TQ_OBJECT
public:
virtual ~Plugin();
@@ -63,7 +64,7 @@ namespace Komposer
Core *core() const;
protected:
friend class PluginManager;
- Plugin( TQObject *parent, const char *name, const TQStringList& args = TQStringList() );
+ Plugin( TQObject *tqparent, const char *name, const TQStringList& args = TQStringList() );
private:
class Private;
diff --git a/libkdepim/komposer/core/pluginmanager.cpp b/libkdepim/komposer/core/pluginmanager.cpp
index d4fd5acc8..d46d471b2 100644
--- a/libkdepim/komposer/core/pluginmanager.cpp
+++ b/libkdepim/komposer/core/pluginmanager.cpp
@@ -66,8 +66,8 @@ public:
TQValueStack pluginsToLoad;
};
-PluginManager::PluginManager( TQObject *parent )
- : TQObject( parent )
+PluginManager::PluginManager( TQObject *tqparent )
+ : TQObject( tqparent )
{
d = new Private;
@@ -414,7 +414,7 @@ PluginManager::plugin( const TQString &pluginId ) const
return 0;
}
-QString
+TQString
PluginManager::pluginName( const Plugin *plugin ) const
{
TQMap::ConstIterator it;
@@ -427,7 +427,7 @@ PluginManager::pluginName( const Plugin *plugin ) const
return TQString::tqfromLatin1( "Unknown" );
}
-QString
+TQString
PluginManager::pluginId( const Plugin *plugin ) const
{
TQMap::ConstIterator it;
@@ -440,7 +440,7 @@ PluginManager::pluginId( const Plugin *plugin ) const
return TQString::tqfromLatin1( "unknown" );
}
-QString
+TQString
PluginManager::pluginIcon( const Plugin *plugin ) const
{
TQMap::ConstIterator it;
diff --git a/libkdepim/komposer/core/pluginmanager.h b/libkdepim/komposer/core/pluginmanager.h
index 179cf48de..34cc6b9c5 100644
--- a/libkdepim/komposer/core/pluginmanager.h
+++ b/libkdepim/komposer/core/pluginmanager.h
@@ -37,9 +37,10 @@ namespace Komposer
class Plugin;
- class PluginManager : public QObject
+ class PluginManager : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
PluginManager( TQObject * );
@@ -57,7 +58,7 @@ namespace Komposer
* interface.
*/
TQValueList availablePlugins( const TQString &category
- = TQString::null ) const;
+ = TQString() ) const;
/**
* Returns a list of all plugins that are actually loaded.
@@ -65,7 +66,7 @@ namespace Komposer
* See also @ref availablePlugins().
*/
TQMap loadedPlugins( const TQString &category
- = TQString::null ) const;
+ = TQString() ) const;
/**
* @brief Search by plugin name. This is the key used as X-KDE-PluginInfo-Name
diff --git a/libkdepim/komposer/core/prefsmodule.cpp b/libkdepim/komposer/core/prefsmodule.cpp
index 3536ebb8e..1c088e9e8 100644
--- a/libkdepim/komposer/core/prefsmodule.cpp
+++ b/libkdepim/komposer/core/prefsmodule.cpp
@@ -35,14 +35,14 @@
extern "C"
{
- KDE_EXPORT KCModule *create_komposerconfig( TQWidget *parent, const char * ) {
- return new Komposer::PrefsModule( parent, "komposerprefs" );
+ KDE_EXPORT KCModule *create_komposerconfig( TQWidget *tqparent, const char * ) {
+ return new Komposer::PrefsModule( tqparent, "komposerprefs" );
}
}
using namespace Komposer;
-PrefsModule::PrefsModule( TQWidget *parent, const char *name )
- : KPrefsModule( Komposer::Prefs::self(), parent, name )
+PrefsModule::PrefsModule( TQWidget *tqparent, const char *name )
+ : KPrefsModule( Komposer::Prefs::self(), tqparent, name )
{
TQVBoxLayout *topLayout = new TQVBoxLayout( this );
@@ -71,12 +71,12 @@ PrefsModule::aboutData() const
EditorSelection::EditorSelection( const TQString &text, TQString &reference,
- TQWidget *parent )
+ TQWidget *tqparent )
: m_reference( reference )
{
- m_box = new TQGroupBox( 0, Qt::Vertical, text, parent );
+ m_box = new TQGroupBox( 0, TQt::Vertical, text, tqparent );
TQVBoxLayout *boxLayout = new TQVBoxLayout( m_box->tqlayout() );
- boxLayout->tqsetAlignment( Qt::AlignTop );
+ boxLayout->tqsetAlignment( TQt::AlignTop );
m_editorsCombo = new KComboBox( m_box );
boxLayout->addWidget( m_editorsCombo );
diff --git a/libkdepim/komposer/core/prefsmodule.h b/libkdepim/komposer/core/prefsmodule.h
index b213258ba..ab1744044 100644
--- a/libkdepim/komposer/core/prefsmodule.h
+++ b/libkdepim/komposer/core/prefsmodule.h
@@ -35,17 +35,19 @@ namespace Komposer {
class PrefsModule : public KPrefsModule
{
Q_OBJECT
+ TQ_OBJECT
public:
- PrefsModule( TQWidget *parent=0, const char *name=0 );
+ PrefsModule( TQWidget *tqparent=0, const char *name=0 );
virtual const KAboutData *aboutData() const;
};
class EditorSelection : public KPrefsWid
{
Q_OBJECT
+ TQ_OBJECT
public:
- EditorSelection( const TQString &text, TQString &reference, TQWidget *parent );
+ EditorSelection( const TQString &text, TQString &reference, TQWidget *tqparent );
~EditorSelection();
void readConfig();
diff --git a/libkdepim/komposer/core/tests/managertest.cpp b/libkdepim/komposer/core/tests/managertest.cpp
index 487a84c59..4224a2e24 100644
--- a/libkdepim/komposer/core/tests/managertest.cpp
+++ b/libkdepim/komposer/core/tests/managertest.cpp
@@ -23,8 +23,8 @@
#include "pluginmanager.h"
using namespace Komposer;
-ManagerTest::ManagerTest( TQObject* parent )
- : TQObject( parent )
+ManagerTest::ManagerTest( TQObject* tqparent )
+ : TQObject( tqparent )
{
m_manager = new PluginManager( this );
}
diff --git a/libkdepim/komposer/core/tests/managertest.h b/libkdepim/komposer/core/tests/managertest.h
index 397bfaf01..c0351b39f 100644
--- a/libkdepim/komposer/core/tests/managertest.h
+++ b/libkdepim/komposer/core/tests/managertest.h
@@ -32,8 +32,9 @@ class ManagerTest : public TQObject,
public Tester
{
Q_OBJECT
+ TQ_OBJECT
public:
- ManagerTest( TQObject* parent = 0 );
+ ManagerTest( TQObject* tqparent = 0 );
public slots:
void allTests();
diff --git a/libkdepim/komposer/core/tests/tester.cpp b/libkdepim/komposer/core/tests/tester.cpp
index b32c89644..2a0c84618 100644
--- a/libkdepim/komposer/core/tests/tester.cpp
+++ b/libkdepim/komposer/core/tests/tester.cpp
@@ -21,8 +21,8 @@
#include "tester.h"
-Tester::Tester( TQObject* parent )
- : TQObject( parent )
+Tester::Tester( TQObject* tqparent )
+ : TQObject( tqparent )
{
}
diff --git a/libkdepim/komposer/core/tests/testmanager.cpp b/libkdepim/komposer/core/tests/testmanager.cpp
index 0fcba16b9..893b35b81 100644
--- a/libkdepim/komposer/core/tests/testmanager.cpp
+++ b/libkdepim/komposer/core/tests/testmanager.cpp
@@ -11,8 +11,8 @@
using namespace Komposer;
-TestManager::TestManager( TQObject *parent )
- : TQObject( parent )
+TestManager::TestManager( TQObject *tqparent )
+ : TQObject( tqparent )
{
m_manager = new PluginManager( this );
connect( m_manager, TQT_SIGNAL(pluginLoaded(Plugin*)),
diff --git a/libkdepim/komposer/core/tests/testmanager.h b/libkdepim/komposer/core/tests/testmanager.h
index c5ff8517d..b574bc871 100644
--- a/libkdepim/komposer/core/tests/testmanager.h
+++ b/libkdepim/komposer/core/tests/testmanager.h
@@ -9,11 +9,12 @@ namespace Komposer {
}
using Komposer::Plugin;
-class TestManager : public QObject
+class TestManager : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- TestManager( TQObject *parent );
+ TestManager( TQObject *tqparent );
public slots:
void slotPluginLoaded( Plugin *plugin );
diff --git a/libkdepim/komposer/plugins/default/defaulteditor.cpp b/libkdepim/komposer/plugins/default/defaulteditor.cpp
index 56f97d223..6f7dcb7df 100644
--- a/libkdepim/komposer/plugins/default/defaulteditor.cpp
+++ b/libkdepim/komposer/plugins/default/defaulteditor.cpp
@@ -36,7 +36,7 @@
#include
#include
#include
-#include
+#include
#include
#include
@@ -46,8 +46,8 @@ typedef KGenericFactory DefaultEditorFactory;
K_EXPORT_COMPONENT_FACTORY( libkomposer_defaulteditor,
DefaultEditorFactory( "komposer_defaulteditor" ) )
-DefaultEditor::DefaultEditor( TQObject *parent, const char *name, const TQStringList &args )
- : Editor( parent, name, args ), m_textEdit( 0 )
+DefaultEditor::DefaultEditor( TQObject *tqparent, const char *name, const TQStringList &args )
+ : Editor( tqparent, name, args ), m_textEdit( 0 )
{
setInstance( DefaultEditorFactory::instance() );
@@ -69,7 +69,7 @@ DefaultEditor::widget()
return m_textEdit;
}
-QString
+TQString
DefaultEditor::text() const
{
return m_textEdit->text();
diff --git a/libkdepim/komposer/plugins/default/defaulteditor.h b/libkdepim/komposer/plugins/default/defaulteditor.h
index a877b762a..7c33bb334 100644
--- a/libkdepim/komposer/plugins/default/defaulteditor.h
+++ b/libkdepim/komposer/plugins/default/defaulteditor.h
@@ -34,8 +34,9 @@ class KActionCollection;
class DefaultEditor : public Komposer::Editor
{
Q_OBJECT
+ TQ_OBJECT
public:
- DefaultEditor( TQObject *parent, const char *name, const TQStringList &args );
+ DefaultEditor( TQObject *tqparent, const char *name, const TQStringList &args );
~DefaultEditor();
virtual TQWidget *widget();
diff --git a/libkdepim/komposer/plugins/default/defaulteditorui.rc b/libkdepim/komposer/plugins/default/defaulteditorui.rc
index 479fa8b06..de8c2e6d2 100644
--- a/libkdepim/komposer/plugins/default/defaulteditorui.rc
+++ b/libkdepim/komposer/plugins/default/defaulteditorui.rc
@@ -24,7 +24,7 @@
-