An error occurred while fetching "
"the keys from the backend:
"
"
%1
" )
.tqarg( TQString::fromLocal8Bit( err.asString() ) );
- KMessageBox::error( tqparent, msg, i18n( "Key Listing Failed" ) );
+ KMessageBox::error( parent, msg, i18n( "Key Listing Failed" ) );
}
#endif // __KLEO_UI_SHOW_KEY_LIST_ERROR_H__
diff --git a/certmanager/lib/ui/keyselectiondialog.h b/certmanager/lib/ui/keyselectiondialog.h
index c0bfa7eef..44634a396 100644
--- a/certmanager/lib/ui/keyselectiondialog.h
+++ b/certmanager/lib/ui/keyselectiondialog.h
@@ -90,7 +90,7 @@ namespace Kleo {
unsigned int keyUsage=AllKeys,
bool extendedSelection=false,
bool rememberChoice=false,
- TQWidget * tqparent=0, const char * name=0,
+ TQWidget * parent=0, const char * name=0,
bool modal=true );
KeySelectionDialog( const TQString & title,
const TQString & text,
@@ -99,7 +99,7 @@ namespace Kleo {
unsigned int keyUsage=AllKeys,
bool extendedSelection=false,
bool rememberChoice=false,
- TQWidget * tqparent=0, const char * name=0,
+ TQWidget * parent=0, const char * name=0,
bool modal=true );
KeySelectionDialog( const TQString & title,
const TQString & text,
@@ -107,7 +107,7 @@ namespace Kleo {
unsigned int keyUsage=AllKeys,
bool extendedSelection=false,
bool rememberChoice=false,
- TQWidget * tqparent=0, const char * name=0,
+ TQWidget * parent=0, const char * name=0,
bool modal=true );
~KeySelectionDialog();
diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp
index 0cef145b2..2dfe083d5 100644
--- a/certmanager/lib/ui/messagebox.cpp
+++ b/certmanager/lib/ui/messagebox.cpp
@@ -77,8 +77,8 @@ class AuditLogViewer : public KDialogBase {
// Q_OBJECT
TQ_OBJECT
public:
- explicit AuditLogViewer( const TQString & log, TQWidget * tqparent=0, const char * name=0, WFlags f=0 )
- : KDialogBase( tqparent, name, false, i18n("View GnuPG Audit Log"),
+ explicit AuditLogViewer( const TQString & log, TQWidget * parent=0, const char * name=0, WFlags f=0 )
+ : KDialogBase( parent, name, false, i18n("View GnuPG Audit Log"),
Close|User1|User2, Close, false, KGuiItem_save(), KGuiItem_copy() ),
m_log( /* sic */ ),
m_textEdit( new TQTextEdit( this, "m_textEdit" ) )
@@ -144,13 +144,13 @@ private:
} // anon namespace
// static
-void MessageBox::auditLog( TQWidget * tqparent, const Job * job, const TQString & caption ) {
+void MessageBox::auditLog( TQWidget * parent, const Job * job, const TQString & caption ) {
if ( !job )
return;
if ( !GpgME::hasFeature( AuditLogFeature ) || !job->isAuditLogSupported() ) {
- KMessageBox::information( tqparent, i18n("Your system does not have support for GnuPG Audit Logs"),
+ KMessageBox::information( parent, i18n("Your system does not have support for GnuPG Audit Logs"),
i18n("System Error") );
return;
}
@@ -158,7 +158,7 @@ void MessageBox::auditLog( TQWidget * tqparent, const Job * job, const TQString
const GpgME::Error err = job->auditLogError();
if ( err.code() != GPG_ERR_NO_DATA ) {
- KMessageBox::information( tqparent, i18n("An error occurred while trying to retrieve the GnuPG Audit Log:\n%1")
+ KMessageBox::information( parent, i18n("An error occurred while trying to retrieve the GnuPG Audit Log:\n%1")
.tqarg( TQString::fromLocal8Bit( err.asString() ) ),
i18n("GnuPG Audit Log Error") );
return;
@@ -167,29 +167,29 @@ void MessageBox::auditLog( TQWidget * tqparent, const Job * job, const TQString
const TQString log = job->auditLogAsHtml();
if ( log.isEmpty() ) {
- KMessageBox::information( tqparent, i18n("No GnuPG Audit Log available for this operation."),
+ KMessageBox::information( parent, i18n("No GnuPG Audit Log available for this operation."),
i18n("No GnuPG Audit Log") );
return;
}
- auditLog( tqparent, log, caption );
+ auditLog( parent, log, caption );
}
// static
-void MessageBox::auditLog( TQWidget * tqparent, const TQString & log, const TQString & caption ) {
- AuditLogViewer * const alv = new AuditLogViewer( log, tqparent, "alv", TQt::WDestructiveClose );
+void MessageBox::auditLog( TQWidget * parent, const TQString & log, const TQString & caption ) {
+ AuditLogViewer * const alv = new AuditLogViewer( log, parent, "alv", TQt::WDestructiveClose );
alv->setCaption( caption );
alv->show();
}
// static
-void MessageBox::auditLog( TQWidget * tqparent, const Job * job ) {
- auditLog( tqparent, job, i18n("GnuPG Audit Log Viewer") );
+void MessageBox::auditLog( TQWidget * parent, const Job * job ) {
+ auditLog( parent, job, i18n("GnuPG Audit Log Viewer") );
}
// static
-void MessageBox::auditLog( TQWidget * tqparent, const TQString & log ) {
- auditLog( tqparent, log, i18n("GnuPG Audit Log Viewer") );
+void MessageBox::auditLog( TQWidget * parent, const TQString & log ) {
+ auditLog( parent, log, i18n("GnuPG Audit Log Viewer") );
}
static TQString to_information_string( const SigningResult & result ) {
@@ -221,63 +221,63 @@ static TQString to_error_string( const SigningResult & sresult, const Encryption
}
// static
-void MessageBox::information( TQWidget * tqparent, const SigningResult & result, const Job * job, int options ) {
- information( tqparent, result, job, i18n("Signing Result"), options );
+void MessageBox::information( TQWidget * parent, const SigningResult & result, const Job * job, int options ) {
+ information( parent, result, job, i18n("Signing Result"), options );
}
// static
-void MessageBox::information( TQWidget * tqparent, const SigningResult & result, const Job * job, const TQString & caption, int options ) {
- make( tqparent, TQMessageBox::Information, to_information_string( result ), job, caption, options );
+void MessageBox::information( TQWidget * parent, const SigningResult & result, const Job * job, const TQString & caption, int options ) {
+ make( parent, TQMessageBox::Information, to_information_string( result ), job, caption, options );
}
// static
-void MessageBox::error( TQWidget * tqparent, const SigningResult & result, const Job * job, int options ) {
- error( tqparent, result, job, i18n("Signing Error"), options );
+void MessageBox::error( TQWidget * parent, const SigningResult & result, const Job * job, int options ) {
+ error( parent, result, job, i18n("Signing Error"), options );
}
// static
-void MessageBox::error( TQWidget * tqparent, const SigningResult & result, const Job * job, const TQString & caption, int options ) {
- make( tqparent, TQMessageBox::Critical, to_error_string( result ), job, caption, options );
+void MessageBox::error( TQWidget * parent, const SigningResult & result, const Job * job, const TQString & caption, int options ) {
+ make( parent, TQMessageBox::Critical, to_error_string( result ), job, caption, options );
}
// static
-void MessageBox::information( TQWidget * tqparent, const EncryptionResult & result, const Job * job, int options ) {
- information( tqparent, result, job, i18n("Encryption Result"), options );
+void MessageBox::information( TQWidget * parent, const EncryptionResult & result, const Job * job, int options ) {
+ information( parent, result, job, i18n("Encryption Result"), options );
}
// static
-void MessageBox::information( TQWidget * tqparent, const EncryptionResult & result, const Job * job, const TQString & caption, int options ) {
- make( tqparent, TQMessageBox::Information, to_information_string( result ), job, caption, options );
+void MessageBox::information( TQWidget * parent, const EncryptionResult & result, const Job * job, const TQString & caption, int options ) {
+ make( parent, TQMessageBox::Information, to_information_string( result ), job, caption, options );
}
// static
-void MessageBox::error( TQWidget * tqparent, const EncryptionResult & result, const Job * job, int options ) {
- error( tqparent, result, job, i18n("Encryption Error"), options );
+void MessageBox::error( TQWidget * parent, const EncryptionResult & result, const Job * job, int options ) {
+ error( parent, result, job, i18n("Encryption Error"), options );
}
// static
-void MessageBox::error( TQWidget * tqparent, const EncryptionResult & result, const Job * job, const TQString & caption, int options ) {
- make( tqparent, TQMessageBox::Critical, to_error_string( result ), job, caption, options );
+void MessageBox::error( TQWidget * parent, const EncryptionResult & result, const Job * job, const TQString & caption, int options ) {
+ make( parent, TQMessageBox::Critical, to_error_string( result ), job, caption, options );
}
// static
-void MessageBox::information( TQWidget * tqparent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, int options ) {
- information( tqparent, sresult, eresult, job, i18n("Encryption Result"), options );
+void MessageBox::information( TQWidget * parent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, int options ) {
+ information( parent, sresult, eresult, job, i18n("Encryption Result"), options );
}
// static
-void MessageBox::information( TQWidget * tqparent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, const TQString & caption, int options ) {
- make( tqparent, TQMessageBox::Information, to_information_string( sresult, eresult ), job, caption, options );
+void MessageBox::information( TQWidget * parent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, const TQString & caption, int options ) {
+ make( parent, TQMessageBox::Information, to_information_string( sresult, eresult ), job, caption, options );
}
// static
-void MessageBox::error( TQWidget * tqparent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, int options ) {
- error( tqparent, sresult, eresult, job, i18n("Encryption Error"), options );
+void MessageBox::error( TQWidget * parent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, int options ) {
+ error( parent, sresult, eresult, job, i18n("Encryption Error"), options );
}
// static
-void MessageBox::error( TQWidget * tqparent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, const TQString & caption, int options ) {
- make( tqparent, TQMessageBox::Critical, to_error_string( sresult, eresult ), job, caption, options );
+void MessageBox::error( TQWidget * parent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, const TQString & caption, int options ) {
+ make( parent, TQMessageBox::Critical, to_error_string( sresult, eresult ), job, caption, options );
}
// static
@@ -307,15 +307,15 @@ bool MessageBox::showAuditLogButton( const Kleo::Job * job ) {
// static
-void MessageBox::make( TQWidget * tqparent, TQMessageBox::Icon icon, const TQString & text, const Job * job, const TQString & caption, int options ) {
+void MessageBox::make( TQWidget * parent, TQMessageBox::Icon icon, const TQString & text, const Job * job, const TQString & caption, int options ) {
KDialogBase * dialog = showAuditLogButton( job )
? new KDialogBase( caption, KDialogBase::Yes | KDialogBase::No,
KDialogBase::Yes, KDialogBase::Yes,
- tqparent, "error", true, true,
+ parent, "error", true, true,
KStdGuiItem::ok(), KGuiItem_showAuditLog() )
: new KDialogBase( caption, KDialogBase::Yes,
KDialogBase::Yes, KDialogBase::Yes,
- tqparent, "error", true, true,
+ parent, "error", true, true,
KStdGuiItem::ok() ) ;
if ( options & KMessageBox::PlainCaption )
dialog->setPlainCaption( caption );
diff --git a/certmanager/lib/ui/messagebox.h b/certmanager/lib/ui/messagebox.h
index 64cd1a2ed..69dea34c5 100644
--- a/certmanager/lib/ui/messagebox.h
+++ b/certmanager/lib/ui/messagebox.h
@@ -54,30 +54,30 @@ namespace Kleo {
class MessageBox {
public:
- static void information( TQWidget * tqparent, const GpgME::SigningResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify );
- static void information( TQWidget * tqparent, const GpgME::SigningResult & result, const Kleo::Job * job, int options=KMessageBox::Notify );
- static void error( TQWidget * tqparent, const GpgME::SigningResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify );
- static void error( TQWidget * tqparent, const GpgME::SigningResult & result, const Kleo::Job * job, int options=KMessageBox::Notify );
-
- static void information( TQWidget * tqparent, const GpgME::EncryptionResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify );
- static void information( TQWidget * tqparent, const GpgME::EncryptionResult & result, const Kleo::Job * job, int options=KMessageBox::Notify );
- static void error( TQWidget * tqparent, const GpgME::EncryptionResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify );
- static void error( TQWidget * tqparent, const GpgME::EncryptionResult & result, const Kleo::Job * job, int options=KMessageBox::Notify );
-
- static void information( TQWidget * tqparent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify );
- static void information( TQWidget * tqparent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, int options=KMessageBox::Notify );
- static void error( TQWidget * tqparent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify );
- static void error( TQWidget * tqparent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, int options=KMessageBox::Notify );
-
- static void auditLog( TQWidget * tqparent, const Kleo::Job * job, const TQString & caption );
- static void auditLog( TQWidget * tqparent, const Kleo::Job * job );
- static void auditLog( TQWidget * tqparent, const TQString & log, const TQString & caption );
- static void auditLog( TQWidget * tqparent, const TQString & log );
+ static void information( TQWidget * parent, const GpgME::SigningResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify );
+ static void information( TQWidget * parent, const GpgME::SigningResult & result, const Kleo::Job * job, int options=KMessageBox::Notify );
+ static void error( TQWidget * parent, const GpgME::SigningResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify );
+ static void error( TQWidget * parent, const GpgME::SigningResult & result, const Kleo::Job * job, int options=KMessageBox::Notify );
+
+ static void information( TQWidget * parent, const GpgME::EncryptionResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify );
+ static void information( TQWidget * parent, const GpgME::EncryptionResult & result, const Kleo::Job * job, int options=KMessageBox::Notify );
+ static void error( TQWidget * parent, const GpgME::EncryptionResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify );
+ static void error( TQWidget * parent, const GpgME::EncryptionResult & result, const Kleo::Job * job, int options=KMessageBox::Notify );
+
+ static void information( TQWidget * parent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify );
+ static void information( TQWidget * parent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, int options=KMessageBox::Notify );
+ static void error( TQWidget * parent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify );
+ static void error( TQWidget * parent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, int options=KMessageBox::Notify );
+
+ static void auditLog( TQWidget * parent, const Kleo::Job * job, const TQString & caption );
+ static void auditLog( TQWidget * parent, const Kleo::Job * job );
+ static void auditLog( TQWidget * parent, const TQString & log, const TQString & caption );
+ static void auditLog( TQWidget * parent, const TQString & log );
static bool showAuditLogButton( const Kleo::Job * job );
private:
- static void make( TQWidget * tqparent, TQMessageBox::Icon icon, const TQString & text, const Kleo::Job * job, const TQString & caption, int options );
+ static void make( TQWidget * parent, TQMessageBox::Icon icon, const TQString & text, const Kleo::Job * job, const TQString & caption, int options );
};
diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp
index 91ecdef6f..d88278878 100644
--- a/certmanager/lib/ui/passphrasedialog.cpp
+++ b/certmanager/lib/ui/passphrasedialog.cpp
@@ -66,8 +66,8 @@ struct Kleo::PassphraseDialog::Private {
Kleo::PassphraseDialog::PassphraseDialog( const TQString & msg, const TQString & caption,
- TQWidget * tqparent, const char * name, bool modal )
- : KDialogBase( tqparent, name, modal, caption, Ok|Cancel, Ok ), d( 0 )
+ TQWidget * parent, const char * name, bool modal )
+ : KDialogBase( parent, name, modal, caption, Ok|Cancel, Ok ), d( 0 )
{
d = new Private();
diff --git a/certmanager/lib/ui/passphrasedialog.h b/certmanager/lib/ui/passphrasedialog.h
index 6ff4289c4..15e6c132e 100644
--- a/certmanager/lib/ui/passphrasedialog.h
+++ b/certmanager/lib/ui/passphrasedialog.h
@@ -59,7 +59,7 @@ namespace Kleo {
public:
PassphraseDialog( const TQString & description,
const TQString & caption=TQString(),
- TQWidget * tqparent=0, const char * name=0,
+ TQWidget * parent=0, const char * name=0,
bool modal=true );
~PassphraseDialog();
diff --git a/certmanager/lib/ui/progressbar.cpp b/certmanager/lib/ui/progressbar.cpp
index b6518c60e..6fe2f5311 100644
--- a/certmanager/lib/ui/progressbar.cpp
+++ b/certmanager/lib/ui/progressbar.cpp
@@ -39,8 +39,8 @@
static const int busyTimerTickInterval = 100;
static const int busyTimerTickIncrement = 5;
-Kleo::ProgressBar::ProgressBar( TQWidget * tqparent, const char * name, WFlags f )
- : TQProgressBar( 0, tqparent, name, f ),
+Kleo::ProgressBar::ProgressBar( TQWidget * parent, const char * name, WFlags f )
+ : TQProgressBar( 0, parent, name, f ),
mRealProgress( -1 )
{
mBusyTimer = new TQTimer( this );
diff --git a/certmanager/lib/ui/progressbar.h b/certmanager/lib/ui/progressbar.h
index 705fe11f1..f5a9644fe 100644
--- a/certmanager/lib/ui/progressbar.h
+++ b/certmanager/lib/ui/progressbar.h
@@ -46,7 +46,7 @@ namespace Kleo {
Q_OBJECT
TQ_OBJECT
public:
- ProgressBar( TQWidget * tqparent=0, const char * name=0, WFlags f=0 );
+ ProgressBar( TQWidget * parent=0, const char * name=0, WFlags f=0 );
public slots:
void slotProgress( const TQString & message, int type, int current, int total );
diff --git a/indexlib/manager.h b/indexlib/manager.h
index 6224a9db4..3dc1bdef6 100644
--- a/indexlib/manager.h
+++ b/indexlib/manager.h
@@ -56,12 +56,12 @@ class memory_manager {
virtual void resize( unsigned ) = 0;
};
-template
+template
struct thing_manager {
public:
- const unsigned char* ronly_base( unsigned idx ) const { return get_tqparent()->ronly_base( idx ); }
- unsigned char* rw_base( unsigned idx ) const { return get_tqparent()->rw_base( idx ); }
+ const unsigned char* ronly_base( unsigned idx ) const { return get_parent()->ronly_base( idx ); }
+ unsigned char* rw_base( unsigned idx ) const { return get_parent()->rw_base( idx ); }
};
diff --git a/indexlib/mempool.h b/indexlib/mempool.h
index fca5596d5..acf624948 100644
--- a/indexlib/mempool.h
+++ b/indexlib/mempool.h
@@ -127,7 +127,7 @@ struct mempool /* : boost::noncopyable */ {
};
START_THING( list_node, thing )
- void set_tqparent( const mempool* p ) { this->parent_ = p; }
+ void set_parent( const mempool* p ) { this->parent_ = p; }
MEMBER( uint16_t, order, 0 )
MEMBER( uint32_t, next, 2 )
MEMBER( uint32_t, prev, 6 )
diff --git a/indexlib/mempool.tcc b/indexlib/mempool.tcc
index fcb65942c..19a5e6d44 100644
--- a/indexlib/mempool.tcc
+++ b/indexlib/mempool.tcc
@@ -142,7 +142,7 @@ template
typename mempool::list_nodeptr mempool::get_node( uint32_t p ) const {
assert( p );
list_nodeptr res = list_nodeptr::cast_from_uint32( p + Traits::type_offset() );
- res->set_tqparent( this );
+ res->set_parent( this );
return res;
}
diff --git a/kabc/frontend/mainWindow.ui.h b/kabc/frontend/mainWindow.ui.h
index 421c0d332..445b5945c 100644
--- a/kabc/frontend/mainWindow.ui.h
+++ b/kabc/frontend/mainWindow.ui.h
@@ -20,8 +20,8 @@ using namespace KABC;
class AddresseeItem : public TQListViewItem
{
public:
- AddresseeItem( TQListView *tqparent, const Addressee &a ) :
- TQListViewItem( tqparent, a.realName(), a.uid() ), mAddressee( a ) {}
+ AddresseeItem( TQListView *parent, const Addressee &a ) :
+ TQListViewItem( parent, a.realName(), a.uid() ), mAddressee( a ) {}
void setAddressee( const Addressee &a ) { mAddressee = a; }
Addressee &addressee() { return mAddressee; }
diff --git a/kabc/kabc2mutt/kabc2mutt.cpp b/kabc/kabc2mutt/kabc2mutt.cpp
index c12967862..96cf79232 100644
--- a/kabc/kabc2mutt/kabc2mutt.cpp
+++ b/kabc/kabc2mutt/kabc2mutt.cpp
@@ -29,8 +29,8 @@
static std::ostream & operator<< ( std::ostream &os, const TQString &s );
-KABC2Mutt::KABC2Mutt( TQObject *tqparent, const char *name )
- : TQObject( tqparent, name ), mFormat( Aliases ),
+KABC2Mutt::KABC2Mutt( TQObject *parent, const char *name )
+ : TQObject( parent, name ), mFormat( Aliases ),
mIgnoreCase( false ), mAllAddresses( false ),
mAlternateKeyFormat( false ),
mAddressBook( 0 )
diff --git a/kabc/kabc2mutt/kabc2mutt.h b/kabc/kabc2mutt/kabc2mutt.h
index 855b48dbd..6b41fe24f 100644
--- a/kabc/kabc2mutt/kabc2mutt.h
+++ b/kabc/kabc2mutt/kabc2mutt.h
@@ -31,7 +31,7 @@ class KABC2Mutt : public TQObject
enum Format { Aliases, Query };
- KABC2Mutt( TQObject *tqparent, const char *name = 0 );
+ KABC2Mutt( TQObject *parent, const char *name = 0 );
void setQuery( const TQString &query ) { mQuery = query; }
void setFormat( Format format ) { mFormat = format; }
diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp
index 61b8ec90b..a23c4436b 100644
--- a/kaddressbook/addresseditwidget.cpp
+++ b/kaddressbook/addresseditwidget.cpp
@@ -57,8 +57,8 @@
class TabPressEater : public TQObject
{
public:
- TabPressEater( TQObject *tqparent )
- : TQObject( tqparent, "TabPressEater" )
+ TabPressEater( TQObject *parent )
+ : TQObject( parent, "TabPressEater" )
{
}
@@ -68,7 +68,7 @@ class TabPressEater : public TQObject
if ( event->type() == TQEvent::KeyPress ) {
TQKeyEvent *keyEvent = (TQKeyEvent*)event;
if ( keyEvent->key() == TQt::Key_Tab ) {
- TQApplication::sendEvent( tqparent(), event );
+ TQApplication::sendEvent( parent(), event );
return true;
} else
return false;
@@ -79,8 +79,8 @@ class TabPressEater : public TQObject
};
-AddressEditWidget::AddressEditWidget( TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name )
+AddressEditWidget::AddressEditWidget( TQWidget *parent, const char *name )
+ : TQWidget( parent, name )
{
TQBoxLayout *tqlayout = new TQVBoxLayout( this, 4, 2 );
tqlayout->setSpacing( KDialog::spacingHint() );
@@ -257,10 +257,10 @@ void AddressEditWidget::updateAddressEdit()
}
AddressEditDialog::AddressEditDialog( const KABC::Address::List &list,
- int selected, TQWidget *tqparent,
+ int selected, TQWidget *parent,
const char *name )
: KDialogBase( Plain, i18n( "street/postal", "Edit Address" ), Ok | Cancel, Ok,
- tqparent, name, true, true ),
+ parent, name, true, true ),
mPreviousAddress( 0 )
{
mAddressList = list;
@@ -599,9 +599,9 @@ void AddressEditDialog::fillCountryCombo()
}
-AddressTypeDialog::AddressTypeDialog( int type, TQWidget *tqparent )
+AddressTypeDialog::AddressTypeDialog( int type, TQWidget *parent )
: KDialogBase( Plain, i18n( "street/postal", "Edit Address Type" ), Ok | Cancel, Ok,
- tqparent, "AddressTypeDialog" )
+ parent, "AddressTypeDialog" )
{
TQWidget *page = plainPage();
TQVBoxLayout *tqlayout = new TQVBoxLayout( page );
diff --git a/kaddressbook/addresseditwidget.h b/kaddressbook/addresseditwidget.h
index 40465d373..b68583f0a 100644
--- a/kaddressbook/addresseditwidget.h
+++ b/kaddressbook/addresseditwidget.h
@@ -55,7 +55,7 @@ class AddressEditWidget : public TQWidget
TQ_OBJECT
public:
- AddressEditWidget( TQWidget *tqparent, const char *name = 0 );
+ AddressEditWidget( TQWidget *parent, const char *name = 0 );
~AddressEditWidget();
KABC::Address::List addresses();
@@ -97,7 +97,7 @@ class AddressEditDialog : public KDialogBase
public:
AddressEditDialog( const KABC::Address::List &list, int selected,
- TQWidget *tqparent, const char *name = 0 );
+ TQWidget *parent, const char *name = 0 );
~AddressEditDialog();
KABC::Address::List addresses();
@@ -142,7 +142,7 @@ class AddressEditDialog : public KDialogBase
class AddressTypeDialog : public KDialogBase
{
public:
- AddressTypeDialog( int type, TQWidget *tqparent );
+ AddressTypeDialog( int type, TQWidget *parent );
~AddressTypeDialog();
int type() const;
diff --git a/kaddressbook/addresseeeditorbase.h b/kaddressbook/addresseeeditorbase.h
index 3dc670b4f..3dc9749f7 100644
--- a/kaddressbook/addresseeeditorbase.h
+++ b/kaddressbook/addresseeeditorbase.h
@@ -34,8 +34,8 @@ class AddresseeEditorBase : public TQWidget
TQ_OBJECT
public:
- AddresseeEditorBase( TQWidget *tqparent, const char *name = 0 )
- : TQWidget( tqparent, name )
+ AddresseeEditorBase( TQWidget *parent, const char *name = 0 )
+ : TQWidget( parent, name )
{
}
diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp
index 7b1276c83..a742c3f76 100644
--- a/kaddressbook/addresseeeditordialog.cpp
+++ b/kaddressbook/addresseeeditordialog.cpp
@@ -35,10 +35,10 @@
#include "addresseeeditordialog.h"
AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core,
- TQWidget *tqparent, const char *name )
+ TQWidget *parent, const char *name )
: KDialogBase( KDialogBase::Plain, i18n( "Edit Contact" ),
KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Apply,
- KDialogBase::Ok, tqparent, name, false )
+ KDialogBase::Ok, parent, name, false )
{
// Set this to be the group leader for all subdialogs - this means
// modal subdialogs will only affect this dialog, not the other windows
diff --git a/kaddressbook/addresseeeditordialog.h b/kaddressbook/addresseeeditordialog.h
index 7d0258e97..eedb3ae4f 100644
--- a/kaddressbook/addresseeeditordialog.h
+++ b/kaddressbook/addresseeeditordialog.h
@@ -39,7 +39,7 @@ class AddresseeEditorDialog : public KDialogBase
public:
AddresseeEditorDialog( KAB::Core *core,
- TQWidget *tqparent, const char *name = 0 );
+ TQWidget *parent, const char *name = 0 );
~AddresseeEditorDialog();
void setAddressee( const KABC::Addressee& );
diff --git a/kaddressbook/addresseeeditorextension.cpp b/kaddressbook/addresseeeditorextension.cpp
index 61ba5c18e..72e119d9a 100644
--- a/kaddressbook/addresseeeditorextension.cpp
+++ b/kaddressbook/addresseeeditorextension.cpp
@@ -33,8 +33,8 @@
#include "addresseeeditorextension.h"
-AddresseeEditorExtension::AddresseeEditorExtension( KAB::Core *core, TQWidget *tqparent, const char *name )
- : KAB::ExtensionWidget( core, tqparent, name )
+AddresseeEditorExtension::AddresseeEditorExtension( KAB::Core *core, TQWidget *parent, const char *name )
+ : KAB::ExtensionWidget( core, parent, name )
{
TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
diff --git a/kaddressbook/addresseeeditorextension.h b/kaddressbook/addresseeeditorextension.h
index 0c1a735b0..b54ef86a2 100644
--- a/kaddressbook/addresseeeditorextension.h
+++ b/kaddressbook/addresseeeditorextension.h
@@ -33,7 +33,7 @@ class AddresseeEditorExtension : public KAB::ExtensionWidget
TQ_OBJECT
public:
- AddresseeEditorExtension( KAB::Core *core, TQWidget *tqparent, const char *name = 0 );
+ AddresseeEditorExtension( KAB::Core *core, TQWidget *parent, const char *name = 0 );
~AddresseeEditorExtension();
/**
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index da551648d..6892f909b 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -67,8 +67,8 @@
#include "addresseeeditorwidget.h"
-AddresseeEditorWidget::AddresseeEditorWidget( TQWidget *tqparent, const char *name )
- : AddresseeEditorBase( tqparent, name ),
+AddresseeEditorWidget::AddresseeEditorWidget( TQWidget *parent, const char *name )
+ : AddresseeEditorBase( parent, name ),
mBlockSignals( false ), mReadOnly( false )
{
kdDebug(5720) << "AddresseeEditorWidget()" << endl;
diff --git a/kaddressbook/addresseeeditorwidget.h b/kaddressbook/addresseeeditorwidget.h
index 3e04dcd7b..56a98adb5 100644
--- a/kaddressbook/addresseeeditorwidget.h
+++ b/kaddressbook/addresseeeditorwidget.h
@@ -69,7 +69,7 @@ class AddresseeEditorWidget : public AddresseeEditorBase
TQ_OBJECT
public:
- AddresseeEditorWidget( TQWidget *tqparent, const char *name = 0 );
+ AddresseeEditorWidget( TQWidget *parent, const char *name = 0 );
~AddresseeEditorWidget();
void setAddressee( const KABC::Addressee& );
diff --git a/kaddressbook/addviewdialog.cpp b/kaddressbook/addviewdialog.cpp
index 15bfe7a00..d63a33fab 100644
--- a/kaddressbook/addviewdialog.cpp
+++ b/kaddressbook/addviewdialog.cpp
@@ -34,10 +34,10 @@
#include "addviewdialog.h"
AddViewDialog::AddViewDialog( TQDict *viewFactoryDict,
- TQWidget *tqparent, const char *name )
+ TQWidget *parent, const char *name )
: KDialogBase( KDialogBase::Plain, i18n( "Add View" ),
KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok,
- tqparent, name ),
+ parent, name ),
mViewFactoryDict( viewFactoryDict )
{
mTypeId = 0;
diff --git a/kaddressbook/addviewdialog.h b/kaddressbook/addviewdialog.h
index 6e1fcd446..27a91682b 100644
--- a/kaddressbook/addviewdialog.h
+++ b/kaddressbook/addviewdialog.h
@@ -44,7 +44,7 @@ class AddViewDialog : public KDialogBase
TQ_OBJECT
public:
- AddViewDialog( TQDict *viewFactoryDict, TQWidget *tqparent,
+ AddViewDialog( TQDict *viewFactoryDict, TQWidget *parent,
const char *name = 0 );
~AddViewDialog();
diff --git a/kaddressbook/advancedcustomfields.cpp b/kaddressbook/advancedcustomfields.cpp
index 3606fdac3..ee3c179f1 100644
--- a/kaddressbook/advancedcustomfields.cpp
+++ b/kaddressbook/advancedcustomfields.cpp
@@ -85,8 +85,8 @@ class KABCStorage : public KPIM::DesignerFields::Storage
AdvancedCustomFields::AdvancedCustomFields( const TQString &uiFile, KABC::AddressBook *ab,
- TQWidget *tqparent, const char *name )
- : KAB::ContactEditorWidget( ab, tqparent, name )
+ TQWidget *parent, const char *name )
+ : KAB::ContactEditorWidget( ab, parent, name )
{
initGUI( uiFile );
}
diff --git a/kaddressbook/advancedcustomfields.h b/kaddressbook/advancedcustomfields.h
index fd00b58e1..ea184f9b8 100644
--- a/kaddressbook/advancedcustomfields.h
+++ b/kaddressbook/advancedcustomfields.h
@@ -43,7 +43,7 @@ class AdvancedCustomFields : public KAB::ContactEditorWidget
public:
AdvancedCustomFields( const TQString &uiFile, KABC::AddressBook *ab,
- TQWidget *tqparent, const char *name = 0 );
+ TQWidget *parent, const char *name = 0 );
void loadContact( KABC::Addressee *addr );
void storeContact( KABC::Addressee *addr );
diff --git a/kaddressbook/contacteditorwidgetmanager.cpp b/kaddressbook/contacteditorwidgetmanager.cpp
index e0afc9d6a..1e3677c55 100644
--- a/kaddressbook/contacteditorwidgetmanager.cpp
+++ b/kaddressbook/contacteditorwidgetmanager.cpp
@@ -107,8 +107,8 @@ void ContactEditorWidgetManager::reload()
///////////////////////////////////////////////////////////////////////////////
-ContactEditorTabPage::ContactEditorTabPage( TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name )
+ContactEditorTabPage::ContactEditorTabPage( TQWidget *parent, const char *name )
+ : TQWidget( parent, name )
{
mLayout = new TQGridLayout( this, 0, 2, KDialog::marginHint(),
KDialog::spacingHint() );
diff --git a/kaddressbook/contacteditorwidgetmanager.h b/kaddressbook/contacteditorwidgetmanager.h
index ae9c69b93..5c7ff9fb1 100644
--- a/kaddressbook/contacteditorwidgetmanager.h
+++ b/kaddressbook/contacteditorwidgetmanager.h
@@ -70,7 +70,7 @@ class ContactEditorTabPage : public TQWidget
TQ_OBJECT
public:
- ContactEditorTabPage( TQWidget *tqparent, const char *name = 0 );
+ ContactEditorTabPage( TQWidget *parent, const char *name = 0 );
/**
Adds a widget to the tab.
diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp
index d78c48c61..1466e9900 100644
--- a/kaddressbook/customfieldswidget.cpp
+++ b/kaddressbook/customfieldswidget.cpp
@@ -42,9 +42,9 @@
#include "customfieldswidget.h"
-AddFieldDialog::AddFieldDialog( TQWidget *tqparent, const char *name )
+AddFieldDialog::AddFieldDialog( TQWidget *parent, const char *name )
: KDialogBase( Plain, i18n( "Add Field" ), Ok | Cancel,
- Ok, tqparent, name, true, true )
+ Ok, parent, name, true, true )
{
TQWidget *page = plainPage();
@@ -121,8 +121,8 @@ void AddFieldDialog::nameChanged( const TQString &name )
enableButton( Ok, !name.isEmpty() );
}
-FieldWidget::FieldWidget( TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name )
+FieldWidget::FieldWidget( TQWidget *parent, const char *name )
+ : TQWidget( parent, name )
{
TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(),
KDialog::spacingHint() );
@@ -377,8 +377,8 @@ void FieldWidget::recalculateLayout()
}
CustomFieldsWidget::CustomFieldsWidget( KABC::AddressBook *ab,
- TQWidget *tqparent, const char *name )
- : KAB::ContactEditorWidget( ab, tqparent, name )
+ TQWidget *parent, const char *name )
+ : KAB::ContactEditorWidget( ab, parent, name )
{
initGUI();
diff --git a/kaddressbook/customfieldswidget.h b/kaddressbook/customfieldswidget.h
index c1dc6b8c8..07c5812e1 100644
--- a/kaddressbook/customfieldswidget.h
+++ b/kaddressbook/customfieldswidget.h
@@ -64,7 +64,7 @@ class AddFieldDialog : public KDialogBase
TQ_OBJECT
public:
- AddFieldDialog( TQWidget *tqparent, const char *name = 0 );
+ AddFieldDialog( TQWidget *parent, const char *name = 0 );
TQString title() const;
TQString identifier() const;
@@ -89,7 +89,7 @@ class FieldWidget : public TQWidget
TQ_OBJECT
public:
- FieldWidget( TQWidget *tqparent, const char *name = 0 );
+ FieldWidget( TQWidget *parent, const char *name = 0 );
void addField( const TQString &identifier, const TQString &title,
const TQString &type, bool isGlobal );
@@ -124,7 +124,7 @@ class CustomFieldsWidget : public KAB::ContactEditorWidget
TQ_OBJECT
public:
- CustomFieldsWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
+ CustomFieldsWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
void loadContact( KABC::Addressee *addr );
void storeContact( KABC::Addressee *addr );
@@ -151,9 +151,9 @@ class CustomFieldsWidget : public KAB::ContactEditorWidget
class CustomFieldsWidgetFactory : public KAB::ContactEditorWidgetFactory
{
public:
- KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
+ KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
{
- return new CustomFieldsWidget( ab, tqparent, name );
+ return new CustomFieldsWidget( ab, parent, name );
}
TQString pageTitle() const { return i18n( "Custom Fields" ); }
diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp
index 2c6d39c95..b206e886d 100644
--- a/kaddressbook/distributionlisteditor.cpp
+++ b/kaddressbook/distributionlisteditor.cpp
@@ -64,7 +64,7 @@ public:
};
-KPIM::DistributionListEditor::Line::Line( KABC::AddressBook* book, TQWidget* tqparent ) : TQWidget( tqparent ), m_addressBook( book )
+KPIM::DistributionListEditor::Line::Line( KABC::AddressBook* book, TQWidget* parent ) : TQWidget( parent ), m_addressBook( book )
{
Q_ASSERT( m_addressBook );
TQBoxLayout* tqlayout = new TQHBoxLayout( this );
@@ -147,14 +147,14 @@ KPIM::DistributionList::Entry KPIM::DistributionListEditor::Line::entry() const
}
-KPIM::DistributionListEditor::LineEdit::LineEdit( TQWidget* tqparent ) : KPIM::AddresseeLineEdit( tqparent )
+KPIM::DistributionListEditor::LineEdit::LineEdit( TQWidget* parent ) : KPIM::AddresseeLineEdit( parent )
{
allowDistributionLists( false );
}
-KPIM::DistributionListEditor::EditorWidget::EditorWidget( KABC::AddressBook* book, TQWidget* tqparent )
- : KDialogBase( tqparent, /*name=*/0, /*modal=*/ true, /*caption=*/TQString(), KDialogBase::Ok|KDialogBase::Cancel ), d( new DistributionListEditor::EditorWidgetPrivate )
+KPIM::DistributionListEditor::EditorWidget::EditorWidget( KABC::AddressBook* book, TQWidget* parent )
+ : KDialogBase( parent, /*name=*/0, /*modal=*/ true, /*caption=*/TQString(), KDialogBase::Ok|KDialogBase::Cancel ), d( new DistributionListEditor::EditorWidgetPrivate )
{
d->addressBook = book;
Q_ASSERT( d->addressBook );
diff --git a/kaddressbook/distributionlisteditor.h b/kaddressbook/distributionlisteditor.h
index 448221ce4..6cbe9310a 100644
--- a/kaddressbook/distributionlisteditor.h
+++ b/kaddressbook/distributionlisteditor.h
@@ -41,7 +41,7 @@ class EditorWidget : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- explicit EditorWidget( KABC::AddressBook* book, TQWidget* tqparent = 0 );
+ explicit EditorWidget( KABC::AddressBook* book, TQWidget* parent = 0 );
~EditorWidget();
void setDistributionList( const KPIM::DistributionList& list );
diff --git a/kaddressbook/distributionlisteditor_p.h b/kaddressbook/distributionlisteditor_p.h
index e4754e5a9..8be9aadce 100644
--- a/kaddressbook/distributionlisteditor_p.h
+++ b/kaddressbook/distributionlisteditor_p.h
@@ -44,7 +44,7 @@ class LineEdit : public KPIM::AddresseeLineEdit
Q_OBJECT
TQ_OBJECT
public:
- explicit LineEdit( TQWidget* tqparent = 0 );
+ explicit LineEdit( TQWidget* parent = 0 );
};
@@ -53,7 +53,7 @@ class Line : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- explicit Line( KABC::AddressBook* book, TQWidget* tqparent = 0 );
+ explicit Line( KABC::AddressBook* book, TQWidget* parent = 0 );
void setEntry( const KPIM::DistributionList::Entry& entry );
KPIM::DistributionList::Entry entry() const;
diff --git a/kaddressbook/distributionlistentryview.cpp b/kaddressbook/distributionlistentryview.cpp
index 7b515782f..030f58197 100644
--- a/kaddressbook/distributionlistentryview.cpp
+++ b/kaddressbook/distributionlistentryview.cpp
@@ -20,7 +20,7 @@
#include
#include
-KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWidget* tqparent ) : TQWidget( tqparent ), m_core( core ), m_emailGroup( 0 )
+KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWidget* parent ) : TQWidget( parent ), m_core( core ), m_emailGroup( 0 )
{
m_mainLayout = new TQVBoxLayout( this );
m_mainLayout->setSpacing( KDialog::spacingHint() );
diff --git a/kaddressbook/distributionlistentryview.h b/kaddressbook/distributionlistentryview.h
index 3eba6efa8..e8a58146d 100644
--- a/kaddressbook/distributionlistentryview.h
+++ b/kaddressbook/distributionlistentryview.h
@@ -27,7 +27,7 @@ class DistributionListEntryView : public TQWidget
TQ_OBJECT
public:
- explicit DistributionListEntryView( KAB::Core* core, TQWidget* tqparent = 0 );
+ explicit DistributionListEntryView( KAB::Core* core, TQWidget* parent = 0 );
void setEntry( const KPIM::DistributionList& list, const KPIM::DistributionList::Entry& entry );
public slots:
diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp
index 9b4d3f727..c721ae6f5 100644
--- a/kaddressbook/distributionlistpicker.cpp
+++ b/kaddressbook/distributionlistpicker.cpp
@@ -41,7 +41,7 @@
#include
#include
-KPIM::DistributionListPickerDialog::DistributionListPickerDialog( KABC::AddressBook* book, TQWidget* tqparent ) : KDialogBase( tqparent, 0, true, TQString(), Ok | Cancel | User1 ), m_book( book )
+KPIM::DistributionListPickerDialog::DistributionListPickerDialog( KABC::AddressBook* book, TQWidget* parent ) : KDialogBase( parent, 0, true, TQString(), Ok | Cancel | User1 ), m_book( book )
{
Q_ASSERT( m_book );
setModal( true );
diff --git a/kaddressbook/distributionlistpicker.h b/kaddressbook/distributionlistpicker.h
index 9d7d23faf..22e814f4c 100644
--- a/kaddressbook/distributionlistpicker.h
+++ b/kaddressbook/distributionlistpicker.h
@@ -40,7 +40,7 @@ class DistributionListPickerDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- explicit DistributionListPickerDialog( KABC::AddressBook* book, TQWidget* tqparent = 0 );
+ explicit DistributionListPickerDialog( KABC::AddressBook* book, TQWidget* parent = 0 );
TQString selectedDistributionList() const;
void setLabelText( const TQString& text );
diff --git a/kaddressbook/editors/cryptowidget.cpp b/kaddressbook/editors/cryptowidget.cpp
index a4d8b8bb0..89d41ab35 100644
--- a/kaddressbook/editors/cryptowidget.cpp
+++ b/kaddressbook/editors/cryptowidget.cpp
@@ -68,8 +68,8 @@ TQString CryptoWidgetFactory::pageIdentifier() const
return "crypto";
}
-CryptoWidget::CryptoWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
- : KAB::ContactEditorWidget( ab, tqparent, name ), mReadOnly( false )
+CryptoWidget::CryptoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+ : KAB::ContactEditorWidget( ab, parent, name ), mReadOnly( false )
{
TQGridLayout *topLayout = new TQGridLayout( this, 2, 5, KDialog::marginHint(),
KDialog::spacingHint() );
diff --git a/kaddressbook/editors/cryptowidget.h b/kaddressbook/editors/cryptowidget.h
index 12f3ba992..4fda99d5a 100644
--- a/kaddressbook/editors/cryptowidget.h
+++ b/kaddressbook/editors/cryptowidget.h
@@ -39,7 +39,7 @@ class CryptoWidget : public KAB::ContactEditorWidget
TQ_OBJECT
public:
- CryptoWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
+ CryptoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
~CryptoWidget();
void loadContact( KABC::Addressee *addr );
@@ -60,9 +60,9 @@ class CryptoWidgetFactory : public KAB::ContactEditorWidgetFactory
{
public:
CryptoWidgetFactory();
- KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
+ KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
{
- return new CryptoWidget( ab, tqparent, name );
+ return new CryptoWidget( ab, parent, name );
}
TQString pageTitle() const;
diff --git a/kaddressbook/editors/imaddresswidget.cpp b/kaddressbook/editors/imaddresswidget.cpp
index 1d64c5b98..4b3516ea1 100644
--- a/kaddressbook/editors/imaddresswidget.cpp
+++ b/kaddressbook/editors/imaddresswidget.cpp
@@ -33,18 +33,18 @@
#include "imaddresswidget.h"
-IMAddressWidget::IMAddressWidget( TQWidget *tqparent, TQValueList protocols )
- : IMAddressBase( tqparent )
+IMAddressWidget::IMAddressWidget( TQWidget *parent, TQValueList protocols )
+ : IMAddressBase( parent )
{
mProtocols = protocols;
populateProtocols();
init();
}
-IMAddressWidget::IMAddressWidget( TQWidget *tqparent, TQValueList protocols,
+IMAddressWidget::IMAddressWidget( TQWidget *parent, TQValueList protocols,
KPluginInfo *protocol, const TQString& address,
const IMContext& context )
- : IMAddressBase( tqparent )
+ : IMAddressBase( parent )
{
Q_UNUSED( context );
diff --git a/kaddressbook/editors/imaddresswidget.h b/kaddressbook/editors/imaddresswidget.h
index 3cec21cfd..5ac2a1960 100644
--- a/kaddressbook/editors/imaddresswidget.h
+++ b/kaddressbook/editors/imaddresswidget.h
@@ -45,8 +45,8 @@ class IMAddressWidget : public IMAddressBase
TQ_OBJECT
public:
- IMAddressWidget( TQWidget *tqparent, TQValueList protocols);
- IMAddressWidget( TQWidget *tqparent, TQValueList protocols,
+ IMAddressWidget( TQWidget *parent, TQValueList protocols);
+ IMAddressWidget( TQWidget *parent, TQValueList protocols,
KPluginInfo *protocol, const TQString& address,
const IMContext& context = Any );
diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp
index 0c4717b95..533b7d4b7 100644
--- a/kaddressbook/editors/imeditorwidget.cpp
+++ b/kaddressbook/editors/imeditorwidget.cpp
@@ -43,9 +43,9 @@
#include "imeditorwidget.h"
-IMAddressLVI::IMAddressLVI( KListView *tqparent, KPluginInfo *protocol,
+IMAddressLVI::IMAddressLVI( KListView *parent, KPluginInfo *protocol,
const TQString &address, const IMContext &context )
- : KListViewItem( tqparent )
+ : KListViewItem( parent )
{
setProtocol( protocol );
setAddress( address );
@@ -140,8 +140,8 @@ void IMAddressLVI::activate()
/*===========================================================================*/
-IMEditorWidget::IMEditorWidget( TQWidget *tqparent, const TQString &preferredIM, const char *name )
- : KDialogBase( tqparent, name, false, i18n( "Edit Instant Messenging Address" ),
+IMEditorWidget::IMEditorWidget( TQWidget *parent, const TQString &preferredIM, const char *name )
+ : KDialogBase( parent, name, false, i18n( "Edit Instant Messenging Address" ),
Help | Ok | Cancel, Ok, false ),
mReadOnly( false )
{
diff --git a/kaddressbook/editors/imeditorwidget.h b/kaddressbook/editors/imeditorwidget.h
index f1f2708db..3c9b85cee 100644
--- a/kaddressbook/editors/imeditorwidget.h
+++ b/kaddressbook/editors/imeditorwidget.h
@@ -52,7 +52,7 @@ class IMEditorWidget : public KDialogBase
TQ_OBJECT
public:
- IMEditorWidget( TQWidget *tqparent, const TQString &preferredIM, const char *name = 0 );
+ IMEditorWidget( TQWidget *parent, const TQString &preferredIM, const char *name = 0 );
~IMEditorWidget() {};
void loadContact( KABC::Addressee *addr );
@@ -100,7 +100,7 @@ class IMEditorWidget : public KDialogBase
class IMAddressLVI : public KListViewItem
{
public:
- IMAddressLVI( KListView *tqparent, KPluginInfo * protocol,
+ IMAddressLVI( KListView *parent, KPluginInfo * protocol,
const TQString &address, const IMContext &context = Any );
void setAddress( const TQString &address );
diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp
index 75677a698..4ecee68a1 100644
--- a/kaddressbook/emaileditwidget.cpp
+++ b/kaddressbook/emaileditwidget.cpp
@@ -58,8 +58,8 @@ class EmailValidator : public TQRegExpValidator
class EmailItem : public TQListBoxText
{
public:
- EmailItem( TQListBox *tqparent, const TQString &text, bool preferred )
- : TQListBoxText( tqparent, text ), mPreferred( preferred )
+ EmailItem( TQListBox *parent, const TQString &text, bool preferred )
+ : TQListBoxText( parent, text ), mPreferred( preferred )
{}
void setPreferred( bool preferred ) { mPreferred = preferred; }
@@ -86,8 +86,8 @@ class EmailItem : public TQListBoxText
bool mPreferred;
};
-EmailEditWidget::EmailEditWidget( TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name )
+EmailEditWidget::EmailEditWidget( TQWidget *parent, const char *name )
+ : TQWidget( parent, name )
{
TQGridLayout *topLayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(),
KDialog::spacingHint() );
@@ -171,11 +171,11 @@ void EmailEditWidget::textChanged( const TQString &text )
}
-EmailEditDialog::EmailEditDialog( const TQStringList &list, TQWidget *tqparent,
+EmailEditDialog::EmailEditDialog( const TQStringList &list, TQWidget *parent,
const char *name )
: KDialogBase( KDialogBase::Plain, i18n( "Edit Email Addresses" ),
KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Help,
- tqparent, name, true )
+ parent, name, true )
{
TQWidget *page = plainPage();
diff --git a/kaddressbook/emaileditwidget.h b/kaddressbook/emaileditwidget.h
index c73308f0b..3f26bd9e3 100644
--- a/kaddressbook/emaileditwidget.h
+++ b/kaddressbook/emaileditwidget.h
@@ -47,7 +47,7 @@ class EmailEditWidget : public TQWidget
TQ_OBJECT
public:
- EmailEditWidget( TQWidget *tqparent, const char *name = 0 );
+ EmailEditWidget( TQWidget *parent, const char *name = 0 );
~EmailEditWidget();
void setEmails( const TQStringList &list );
@@ -74,7 +74,7 @@ class EmailEditDialog : public KDialogBase
TQ_OBJECT
public:
- EmailEditDialog( const TQStringList &list, TQWidget *tqparent,
+ EmailEditDialog( const TQStringList &list, TQWidget *parent,
const char *name = 0 );
~EmailEditDialog();
diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp
index 77f53a976..6e854ebca 100644
--- a/kaddressbook/extensionmanager.cpp
+++ b/kaddressbook/extensionmanager.cpp
@@ -44,9 +44,9 @@ ExtensionData::ExtensionData() : action( 0 ), widget( 0 ), weight( 0 ), isDetail
{
}
-ExtensionManager::ExtensionManager( TQWidget* extensionBar, TQWidgetStack* detailsStack, KAB::Core *core, TQObject *tqparent,
+ExtensionManager::ExtensionManager( TQWidget* extensionBar, TQWidgetStack* detailsStack, KAB::Core *core, TQObject *parent,
const char *name )
- : TQObject( tqparent, name ), mExtensionBar( extensionBar ), mCore( core ),
+ : TQObject( parent, name ), mExtensionBar( extensionBar ), mCore( core ),
mMapper( 0 ), mDetailsStack( detailsStack ), mActiveDetailsWidget( 0 )
{
Q_ASSERT( mExtensionBar );
diff --git a/kaddressbook/extensionmanager.h b/kaddressbook/extensionmanager.h
index 5c5a14c4d..f0af5ecce 100644
--- a/kaddressbook/extensionmanager.h
+++ b/kaddressbook/extensionmanager.h
@@ -59,7 +59,7 @@ class ExtensionManager : public TQObject
TQ_OBJECT
public:
- ExtensionManager( TQWidget *extensionBar, TQWidgetStack *detailsStack, KAB::Core *core, TQObject *tqparent, const char *name = 0 );
+ ExtensionManager( TQWidget *extensionBar, TQWidgetStack *detailsStack, KAB::Core *core, TQObject *parent, const char *name = 0 );
~ExtensionManager();
/**
diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp
index 1eac56b08..5a828ad1a 100644
--- a/kaddressbook/features/distributionlistngwidget.cpp
+++ b/kaddressbook/features/distributionlistngwidget.cpp
@@ -44,7 +44,7 @@
#include
#include
-KAB::DistributionListNg::ListBox::ListBox( TQWidget* tqparent ) : KListBox( tqparent )
+KAB::DistributionListNg::ListBox::ListBox( TQWidget* parent ) : KListBox( parent )
{
setAcceptDrops( true );
}
@@ -84,9 +84,9 @@ namespace DistributionListNg {
class Factory : public KAB::ExtensionFactory
{
public:
- KAB::ExtensionWidget *extension( KAB::Core *core, TQWidget *tqparent, const char *name )
+ KAB::ExtensionWidget *extension( KAB::Core *core, TQWidget *parent, const char *name )
{
- return new KAB::DistributionListNg::MainWidget( core, tqparent, name );
+ return new KAB::DistributionListNg::MainWidget( core, parent, name );
}
TQString identifier() const
@@ -115,7 +115,7 @@ TQString KAB::DistributionListNg::MainWidget::identifier() const
return "distribution_list_editor_ng";
}
-KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *tqparent, const char *name ) : KAB::ExtensionWidget( core, tqparent, name )
+KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *parent, const char *name ) : KAB::ExtensionWidget( core, parent, name )
{
TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
tqlayout->setSpacing( KDialog::spacingHint() );
diff --git a/kaddressbook/features/distributionlistngwidget.h b/kaddressbook/features/distributionlistngwidget.h
index 090fe0d50..aa6b9ddc0 100644
--- a/kaddressbook/features/distributionlistngwidget.h
+++ b/kaddressbook/features/distributionlistngwidget.h
@@ -49,7 +49,7 @@ class ListBox : public KListBox
Q_OBJECT
TQ_OBJECT
public:
- ListBox( TQWidget* tqparent = 0 );
+ ListBox( TQWidget* parent = 0 );
signals:
@@ -70,7 +70,7 @@ class MainWidget : public KAB::ExtensionWidget
TQ_OBJECT
public:
- explicit MainWidget( KAB::Core *core, TQWidget *tqparent = 0, const char *name = 0 );
+ explicit MainWidget( KAB::Core *core, TQWidget *parent = 0, const char *name = 0 );
//impl
TQString title() const;
diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp
index fc8af3abd..9001311d7 100644
--- a/kaddressbook/features/distributionlistwidget.cpp
+++ b/kaddressbook/features/distributionlistwidget.cpp
@@ -55,9 +55,9 @@ typedef KABC::DistributionList DistributionList;
class DistributionListFactory : public KAB::ExtensionFactory
{
public:
- KAB::ExtensionWidget *extension( KAB::Core *core, TQWidget *tqparent, const char *name )
+ KAB::ExtensionWidget *extension( KAB::Core *core, TQWidget *parent, const char *name )
{
- return new DistributionListWidget( core, tqparent, name );
+ return new DistributionListWidget( core, parent, name );
}
TQString identifier() const
@@ -81,8 +81,8 @@ extern "C" {
class DeletePressedCatcher : public TQObject
{
public:
- DeletePressedCatcher( DistributionListWidget *tqparent )
- : TQObject( tqparent, "DeletePressedCatcher" ), mWidget( tqparent )
+ DeletePressedCatcher( DistributionListWidget *parent )
+ : TQObject( parent, "DeletePressedCatcher" ), mWidget( parent )
{
}
@@ -109,9 +109,9 @@ class DeletePressedCatcher : public TQObject
class ContactItem : public TQListViewItem
{
public:
- ContactItem( DistributionListView *tqparent, const KABC::Addressee &addressee,
+ ContactItem( DistributionListView *parent, const KABC::Addressee &addressee,
const TQString &email = TQString() ) :
- TQListViewItem( tqparent ),
+ TQListViewItem( parent ),
mAddressee( addressee ),
mEmail( email )
{
@@ -146,9 +146,9 @@ class ContactItem : public TQListViewItem
TQString mEmail;
};
-DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *tqparent,
+DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *parent,
const char *name )
- : KAB::ExtensionWidget( core, tqparent, name )
+ : KAB::ExtensionWidget( core, parent, name )
#ifndef KDEPIM_NEW_DISTRLISTS
, mManager( 0 )
#endif
@@ -590,8 +590,8 @@ void DistributionListWidget::changed()
}
#endif
-DistributionListView::DistributionListView( TQWidget *tqparent, const char* name )
- : KListView( tqparent, name )
+DistributionListView::DistributionListView( TQWidget *parent, const char* name )
+ : KListView( parent, name )
{
setDragEnabled( true );
setAcceptDrops( true );
@@ -622,9 +622,9 @@ void DistributionListView::dropEvent( TQDropEvent *e )
EmailSelector::EmailSelector( const TQStringList &emails,
- const TQString ¤t, TQWidget *tqparent )
+ const TQString ¤t, TQWidget *parent )
: KDialogBase( KDialogBase::Plain, i18n("Select Email Address"), Ok|Cancel, Ok,
- tqparent )
+ parent )
{
TQFrame *topFrame = plainPage();
TQBoxLayout *topLayout = new TQVBoxLayout( topFrame );
@@ -657,9 +657,9 @@ TQString EmailSelector::selected() const
}
TQString EmailSelector::getEmail( const TQStringList &emails,
- const TQString ¤t, TQWidget *tqparent, bool &canceled )
+ const TQString ¤t, TQWidget *parent, bool &canceled )
{
- EmailSelector dlg( emails, current, tqparent );
+ EmailSelector dlg( emails, current, parent );
if(dlg.exec())
{
canceled = false;
diff --git a/kaddressbook/features/distributionlistwidget.h b/kaddressbook/features/distributionlistwidget.h
index 6890a6a72..7729b50d4 100644
--- a/kaddressbook/features/distributionlistwidget.h
+++ b/kaddressbook/features/distributionlistwidget.h
@@ -51,7 +51,7 @@ class DistributionListWidget : public KAB::ExtensionWidget
TQ_OBJECT
public:
- DistributionListWidget( KAB::Core*, TQWidget *tqparent, const char *name = 0 );
+ DistributionListWidget( KAB::Core*, TQWidget *parent, const char *name = 0 );
virtual ~DistributionListWidget();
void contactsSelectionChanged();
@@ -111,7 +111,7 @@ class DistributionListView : public KListView
TQ_OBJECT
public:
- DistributionListView( TQWidget *tqparent, const char* name = 0 );
+ DistributionListView( TQWidget *parent, const char* name = 0 );
protected:
void dragEnterEvent( TQDragEnterEvent *e );
@@ -127,12 +127,12 @@ class EmailSelector : public KDialogBase
{
public:
EmailSelector( const TQStringList &emails, const TQString ¤t,
- TQWidget *tqparent );
+ TQWidget *parent );
TQString selected() const;
static TQString getEmail( const TQStringList &emails, const TQString ¤t,
- TQWidget *tqparent, bool &canceled );
+ TQWidget *parent, bool &canceled );
private:
TQButtonGroup *mButtonGroup;
diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp
index 0629052ab..6578b6e1e 100644
--- a/kaddressbook/features/resourceselection.cpp
+++ b/kaddressbook/features/resourceselection.cpp
@@ -57,8 +57,8 @@ class AddressBookWrapper : public KABC::AddressBook
class ResourceItem : public TQCheckListItem
{
public:
- ResourceItem( KListView *tqparent, KABC::Resource *resource )
- : TQCheckListItem( tqparent, resource->resourceName(), CheckBox ),
+ ResourceItem( KListView *parent, KABC::Resource *resource )
+ : TQCheckListItem( parent, resource->resourceName(), CheckBox ),
mResource( resource ), mChecked( false ),
mIsSubresource( false ), mSubItemsCreated( false ),
mResourceIdentifier()
@@ -68,9 +68,9 @@ class ResourceItem : public TQCheckListItem
mChecked = isOn();
}
- ResourceItem( KPIM::ResourceABC *resourceABC, ResourceItem* tqparent,
+ ResourceItem( KPIM::ResourceABC *resourceABC, ResourceItem* parent,
const TQString& resourceIdent )
- : TQCheckListItem( tqparent, resourceABC->subresourceLabel( resourceIdent ), CheckBox ),
+ : TQCheckListItem( parent, resourceABC->subresourceLabel( resourceIdent ), CheckBox ),
mResource( resourceABC ), mChecked( false ),
mIsSubresource( true ), mSubItemsCreated( false ),
mResourceIdentifier( resourceIdent )
@@ -134,8 +134,8 @@ void ResourceItem::stateChange( bool active )
////
-ResourceSelection::ResourceSelection( KAB::Core *core, TQWidget *tqparent, const char *name )
- : KAB::ExtensionWidget( core, tqparent, name ), mManager( 0 )
+ResourceSelection::ResourceSelection( KAB::Core *core, TQWidget *parent, const char *name )
+ : KAB::ExtensionWidget( core, parent, name ), mManager( 0 )
{
initGUI();
@@ -520,9 +520,9 @@ void ResourceSelection::initGUI()
class ResourceSelectionFactory : public KAB::ExtensionFactory
{
public:
- KAB::ExtensionWidget *extension( KAB::Core *core, TQWidget *tqparent, const char *name )
+ KAB::ExtensionWidget *extension( KAB::Core *core, TQWidget *parent, const char *name )
{
- return new ResourceSelection( core, tqparent, name );
+ return new ResourceSelection( core, parent, name );
}
TQString identifier() const
diff --git a/kaddressbook/features/resourceselection.h b/kaddressbook/features/resourceselection.h
index e8939812b..609f942f2 100644
--- a/kaddressbook/features/resourceselection.h
+++ b/kaddressbook/features/resourceselection.h
@@ -41,7 +41,7 @@ class ResourceSelection : public KAB::ExtensionWidget
TQ_OBJECT
public:
- ResourceSelection( KAB::Core*, TQWidget *tqparent, const char *name );
+ ResourceSelection( KAB::Core*, TQWidget *parent, const char *name );
virtual ~ResourceSelection();
TQString title() const;
diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp
index bb9e255b3..5e1586e11 100644
--- a/kaddressbook/filtereditdialog.cpp
+++ b/kaddressbook/filtereditdialog.cpp
@@ -45,9 +45,9 @@
#include "kabprefs.h"
#include "filtereditdialog.h"
-FilterEditDialog::FilterEditDialog( TQWidget *tqparent, const char *name )
+FilterEditDialog::FilterEditDialog( TQWidget *parent, const char *name )
: KDialogBase( Plain, i18n( "Edit Address Book Filter" ),
- Help | Ok | Cancel, Ok, tqparent, name, false, true )
+ Help | Ok | Cancel, Ok, parent, name, false, true )
{
initGUI();
@@ -161,9 +161,9 @@ void FilterEditDialog::slotHelp()
kapp->invokeHelp( "using-filters" );
}
-FilterDialog::FilterDialog( TQWidget *tqparent, const char *name )
+FilterDialog::FilterDialog( TQWidget *parent, const char *name )
: KDialogBase( Plain, i18n( "Edit Address Book Filters" ),
- Ok | Cancel, Ok, tqparent, name, false, true )
+ Ok | Cancel, Ok, parent, name, false, true )
{
initGUI();
}
diff --git a/kaddressbook/filtereditdialog.h b/kaddressbook/filtereditdialog.h
index 1d3c64395..23dcfabd5 100644
--- a/kaddressbook/filtereditdialog.h
+++ b/kaddressbook/filtereditdialog.h
@@ -43,7 +43,7 @@ class FilterDialog : public KDialogBase
TQ_OBJECT
public:
- FilterDialog( TQWidget *tqparent, const char *name = 0 );
+ FilterDialog( TQWidget *parent, const char *name = 0 );
~FilterDialog();
void setFilters( const Filter::List &list );
@@ -73,7 +73,7 @@ class FilterEditDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- FilterEditDialog( TQWidget *tqparent, const char *name = 0 );
+ FilterEditDialog( TQWidget *parent, const char *name = 0 );
~FilterEditDialog();
void setFilter( const Filter &filter );
diff --git a/kaddressbook/filterselectionwidget.cpp b/kaddressbook/filterselectionwidget.cpp
index 1b4873175..32bdf7bf6 100644
--- a/kaddressbook/filterselectionwidget.cpp
+++ b/kaddressbook/filterselectionwidget.cpp
@@ -29,8 +29,8 @@
#include "filterselectionwidget.h"
-FilterSelectionWidget::FilterSelectionWidget( TQWidget *tqparent, const char *name )
- : TQHBox( tqparent, name )
+FilterSelectionWidget::FilterSelectionWidget( TQWidget *parent, const char *name )
+ : TQHBox( parent, name )
{
setSpacing( KDialog::spacingHint() );
diff --git a/kaddressbook/filterselectionwidget.h b/kaddressbook/filterselectionwidget.h
index da8077c46..162ea4ccb 100644
--- a/kaddressbook/filterselectionwidget.h
+++ b/kaddressbook/filterselectionwidget.h
@@ -39,7 +39,7 @@ class FilterSelectionWidget : public TQHBox
TQ_OBJECT
public:
- FilterSelectionWidget( TQWidget *tqparent, const char *name = 0 );
+ FilterSelectionWidget( TQWidget *parent, const char *name = 0 );
~FilterSelectionWidget();
void setItems( const TQStringList &names );
diff --git a/kaddressbook/freebusywidget.cpp b/kaddressbook/freebusywidget.cpp
index 5a4199072..7b81d9ccb 100644
--- a/kaddressbook/freebusywidget.cpp
+++ b/kaddressbook/freebusywidget.cpp
@@ -32,8 +32,8 @@
#include "freebusywidget.h"
-FreeBusyWidget::FreeBusyWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
- : KAB::ContactEditorWidget( ab, tqparent, name )
+FreeBusyWidget::FreeBusyWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+ : KAB::ContactEditorWidget( ab, parent, name )
{
TQHBoxLayout *tqlayout = new TQHBoxLayout( this, KDialog::marginHint(),
KDialog::spacingHint() );
diff --git a/kaddressbook/freebusywidget.h b/kaddressbook/freebusywidget.h
index a758f1418..f06a574e5 100644
--- a/kaddressbook/freebusywidget.h
+++ b/kaddressbook/freebusywidget.h
@@ -34,7 +34,7 @@ class FreeBusyWidget : public KAB::ContactEditorWidget
TQ_OBJECT
public:
- FreeBusyWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
+ FreeBusyWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
~FreeBusyWidget();
void loadContact( KABC::Addressee *addr );
@@ -51,9 +51,9 @@ class FreeBusyWidget : public KAB::ContactEditorWidget
class FreeBusyWidgetFactory : public KAB::ContactEditorWidgetFactory
{
public:
- KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
+ KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
{
- return new FreeBusyWidget( ab, tqparent, name );
+ return new FreeBusyWidget( ab, parent, name );
}
TQString pageIdentifier() const { return "misc"; }
diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp
index 2b9b32c96..725dde3dc 100644
--- a/kaddressbook/geowidget.cpp
+++ b/kaddressbook/geowidget.cpp
@@ -44,8 +44,8 @@
#include "geowidget.h"
-GeoWidget::GeoWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
- : KAB::ContactEditorWidget( ab, tqparent, name ), mReadOnly( false )
+GeoWidget::GeoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+ : KAB::ContactEditorWidget( ab, parent, name ), mReadOnly( false )
{
TQLabel *label = 0;
@@ -157,9 +157,9 @@ void GeoWidget::editGeoData()
-GeoDialog::GeoDialog( TQWidget *tqparent, const char *name )
+GeoDialog::GeoDialog( TQWidget *parent, const char *name )
: KDialogBase( Plain, i18n( "Geo Data Input" ), Ok | Cancel, Ok,
- tqparent, name, true, true ),
+ parent, name, true, true ),
mUpdateSexagesimalInput( true )
{
TQFrame *page = plainPage();
@@ -482,8 +482,8 @@ int GeoDialog::nearestCity( double x, double y ) const
}
-GeoMapWidget::GeoMapWidget( TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name ), mLatitude( 0 ), mLongitude( 0 )
+GeoMapWidget::GeoMapWidget( TQWidget *parent, const char *name )
+ : TQWidget( parent, name ), mLatitude( 0 ), mLongitude( 0 )
{
setBackgroundMode( NoBackground );
diff --git a/kaddressbook/geowidget.h b/kaddressbook/geowidget.h
index f6f8dffd5..7021b4fd0 100644
--- a/kaddressbook/geowidget.h
+++ b/kaddressbook/geowidget.h
@@ -54,7 +54,7 @@ class GeoWidget : public KAB::ContactEditorWidget
TQ_OBJECT
public:
- GeoWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
+ GeoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
~GeoWidget();
void loadContact( KABC::Addressee *addr );
@@ -81,7 +81,7 @@ class GeoDialog : public KDialogBase
TQ_OBJECT
public:
- GeoDialog( TQWidget *tqparent, const char *name = 0 );
+ GeoDialog( TQWidget *parent, const char *name = 0 );
~GeoDialog();
void setLatitude( double latitude );
@@ -127,7 +127,7 @@ class GeoMapWidget : public TQWidget
TQ_OBJECT
public:
- GeoMapWidget( TQWidget *tqparent, const char *name = 0 );
+ GeoMapWidget( TQWidget *parent, const char *name = 0 );
~GeoMapWidget();
void setLatitude( double latitude );
@@ -151,9 +151,9 @@ class GeoMapWidget : public TQWidget
class GeoWidgetFactory : public KAB::ContactEditorWidgetFactory
{
public:
- KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
+ KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
{
- return new GeoWidget( ab, tqparent, name );
+ return new GeoWidget( ab, parent, name );
}
TQString pageIdentifier() const { return "misc"; }
diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index b4219322c..5e1dc85f1 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -47,8 +47,8 @@
#include "imagewidget.h"
-ImageLoader::ImageLoader( TQWidget *tqparent )
- : TQObject( 0, "ImageLoader" ), mParent( tqparent )
+ImageLoader::ImageLoader( TQWidget *parent )
+ : TQObject( 0, "ImageLoader" ), mParent( parent )
{
}
@@ -103,8 +103,8 @@ KABC::Picture ImageLoader::loadPicture( const KURL &url, bool *ok )
}
-ImageButton::ImageButton( const TQString &title, TQWidget *tqparent )
- : TQPushButton( title, tqparent ),
+ImageButton::ImageButton( const TQString &title, TQWidget *parent )
+ : TQPushButton( title, parent ),
mReadOnly( false ), mImageLoader( 0 )
{
setAcceptDrops( true );
@@ -247,8 +247,8 @@ void ImageButton::clear()
}
ImageBaseWidget::ImageBaseWidget( const TQString &title,
- TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name ), mReadOnly( false )
+ TQWidget *parent, const char *name )
+ : TQWidget( parent, name ), mReadOnly( false )
{
mImageLoader = new ImageLoader( this );
@@ -290,8 +290,8 @@ KABC::Picture ImageBaseWidget::image() const
}
-ImageWidget::ImageWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
- : KAB::ContactEditorWidget( ab, tqparent, name )
+ImageWidget::ImageWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+ : KAB::ContactEditorWidget( ab, parent, name )
{
TQHBoxLayout *tqlayout = new TQHBoxLayout( this, KDialog::marginHint(),
KDialog::spacingHint() );
diff --git a/kaddressbook/imagewidget.h b/kaddressbook/imagewidget.h
index 52b9c9c6c..6dbac1955 100644
--- a/kaddressbook/imagewidget.h
+++ b/kaddressbook/imagewidget.h
@@ -41,7 +41,7 @@ class ImageLoader : public TQObject
TQ_OBJECT
public:
- ImageLoader( TQWidget *tqparent );
+ ImageLoader( TQWidget *parent );
KABC::Picture loadPicture( const KURL &url, bool *ok );
@@ -59,7 +59,7 @@ class ImageButton : public TQPushButton
TQ_OBJECT
public:
- ImageButton( const TQString &title, TQWidget *tqparent );
+ ImageButton( const TQString &title, TQWidget *parent );
void setReadOnly( bool readOnly );
@@ -101,7 +101,7 @@ class ImageBaseWidget : public TQWidget
TQ_OBJECT
public:
- ImageBaseWidget( const TQString &title, TQWidget *tqparent, const char *name = 0 );
+ ImageBaseWidget( const TQString &title, TQWidget *parent, const char *name = 0 );
~ImageBaseWidget();
/**
@@ -129,7 +129,7 @@ class ImageBaseWidget : public TQWidget
class ImageWidget : public KAB::ContactEditorWidget
{
public:
- ImageWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
+ ImageWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
void loadContact( KABC::Addressee *addr );
void storeContact( KABC::Addressee *addr );
@@ -145,9 +145,9 @@ class ImageWidget : public KAB::ContactEditorWidget
class ImageWidgetFactory : public KAB::ContactEditorWidgetFactory
{
public:
- KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
+ KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
{
- return new ImageWidget( ab, tqparent, name );
+ return new ImageWidget( ab, parent, name );
}
TQString pageIdentifier() const { return "misc"; }
diff --git a/kaddressbook/imeditwidget.cpp b/kaddressbook/imeditwidget.cpp
index c7507afcf..2f40f5de3 100644
--- a/kaddressbook/imeditwidget.cpp
+++ b/kaddressbook/imeditwidget.cpp
@@ -43,8 +43,8 @@
#include "imeditwidget.h"
#include "imeditorwidget.h"
-IMEditWidget::IMEditWidget( TQWidget *tqparent, KABC::Addressee &addr, const char *name )
- : TQWidget( tqparent, name ), mAddressee(addr)
+IMEditWidget::IMEditWidget( TQWidget *parent, KABC::Addressee &addr, const char *name )
+ : TQWidget( parent, name ), mAddressee(addr)
{
TQGridLayout *topLayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(),
KDialog::spacingHint() );
diff --git a/kaddressbook/imeditwidget.h b/kaddressbook/imeditwidget.h
index d528fafe2..03c25fcbb 100644
--- a/kaddressbook/imeditwidget.h
+++ b/kaddressbook/imeditwidget.h
@@ -47,7 +47,7 @@ class IMEditWidget : public TQWidget
TQ_OBJECT
public:
- IMEditWidget(TQWidget *tqparent, KABC::Addressee &addr, const char *name = 0 );
+ IMEditWidget(TQWidget *parent, KABC::Addressee &addr, const char *name = 0 );
~IMEditWidget();
void setIMs( const TQStringList &list );
diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp
index 6b3463270..aaad464f1 100644
--- a/kaddressbook/incsearchwidget.cpp
+++ b/kaddressbook/incsearchwidget.cpp
@@ -37,8 +37,8 @@
#include "incsearchwidget.h"
-IncSearchWidget::IncSearchWidget( TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name )
+IncSearchWidget::IncSearchWidget( TQWidget *parent, const char *name )
+ : TQWidget( parent, name )
{
TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 2, KDialog::spacingHint() );
diff --git a/kaddressbook/incsearchwidget.h b/kaddressbook/incsearchwidget.h
index fa3a99a2b..4277828d0 100644
--- a/kaddressbook/incsearchwidget.h
+++ b/kaddressbook/incsearchwidget.h
@@ -38,7 +38,7 @@ class IncSearchWidget : public TQWidget
TQ_OBJECT
public:
- IncSearchWidget( TQWidget *tqparent, const char *name = 0 );
+ IncSearchWidget( TQWidget *parent, const char *name = 0 );
~IncSearchWidget();
KABC::Field::List currentFields() const;
diff --git a/kaddressbook/interfaces/configurewidget.cpp b/kaddressbook/interfaces/configurewidget.cpp
index 1f9325ed0..16bec28a7 100644
--- a/kaddressbook/interfaces/configurewidget.cpp
+++ b/kaddressbook/interfaces/configurewidget.cpp
@@ -27,9 +27,9 @@
using namespace KAB;
-ConfigureWidget::ConfigureWidget( KABC::AddressBook *ab, TQWidget *tqparent,
+ConfigureWidget::ConfigureWidget( KABC::AddressBook *ab, TQWidget *parent,
const char *name )
- : TQWidget( tqparent, name ), mAddressBook( ab )
+ : TQWidget( parent, name ), mAddressBook( ab )
{
}
diff --git a/kaddressbook/interfaces/configurewidget.h b/kaddressbook/interfaces/configurewidget.h
index 89e980084..04cea9cf7 100644
--- a/kaddressbook/interfaces/configurewidget.h
+++ b/kaddressbook/interfaces/configurewidget.h
@@ -38,7 +38,7 @@ namespace KAB {
class KDE_EXPORT ConfigureWidget : public TQWidget
{
public:
- ConfigureWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
+ ConfigureWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
~ConfigureWidget();
/**
diff --git a/kaddressbook/interfaces/contacteditorwidget.cpp b/kaddressbook/interfaces/contacteditorwidget.cpp
index 230f8d019..3059b7a40 100644
--- a/kaddressbook/interfaces/contacteditorwidget.cpp
+++ b/kaddressbook/interfaces/contacteditorwidget.cpp
@@ -26,8 +26,8 @@
using namespace KAB;
ContactEditorWidget::ContactEditorWidget( KABC::AddressBook *ab,
- TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name ), mAddressBook( ab ), mModified( false )
+ TQWidget *parent, const char *name )
+ : TQWidget( parent, name ), mAddressBook( ab ), mModified( false )
{
}
diff --git a/kaddressbook/interfaces/contacteditorwidget.h b/kaddressbook/interfaces/contacteditorwidget.h
index dc8039b60..5903981dd 100644
--- a/kaddressbook/interfaces/contacteditorwidget.h
+++ b/kaddressbook/interfaces/contacteditorwidget.h
@@ -42,7 +42,7 @@ class KDE_EXPORT ContactEditorWidget : public TQWidget
public:
typedef TQValueList List;
- ContactEditorWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
+ ContactEditorWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
~ContactEditorWidget();
/**
@@ -117,7 +117,7 @@ class KDE_EXPORT ContactEditorWidget : public TQWidget
class ContactEditorWidgetFactory : public KLibFactory
{
public:
- virtual ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent,
+ virtual ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent,
const char *name = 0 ) = 0;
/**
diff --git a/kaddressbook/interfaces/core.cpp b/kaddressbook/interfaces/core.cpp
index b604d6564..f359bc3ab 100644
--- a/kaddressbook/interfaces/core.cpp
+++ b/kaddressbook/interfaces/core.cpp
@@ -25,8 +25,8 @@
using namespace KAB;
-Core::Core( KXMLGUIClient *client, TQObject *tqparent, const char *name )
- : TQObject( tqparent, name ), mGUIClient( client )
+Core::Core( KXMLGUIClient *client, TQObject *parent, const char *name )
+ : TQObject( parent, name ), mGUIClient( client )
{
}
diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h
index b4289249f..ac572004f 100644
--- a/kaddressbook/interfaces/core.h
+++ b/kaddressbook/interfaces/core.h
@@ -58,7 +58,7 @@ class KDE_EXPORT Core : public TQObject
TQ_OBJECT
public:
- Core( KXMLGUIClient *client, TQObject *tqparent, const char *name = 0 );
+ Core( KXMLGUIClient *client, TQObject *parent, const char *name = 0 );
/**
Returns a pointer to the StdAddressBook of the application.
@@ -96,10 +96,10 @@ class KDE_EXPORT Core : public TQObject
resource or a null pointer if no resource was selected by
the user.
*/
- virtual KABC::Resource *requestResource( TQWidget *tqparent ) = 0;
+ virtual KABC::Resource *requestResource( TQWidget *parent ) = 0;
/**
- Returns the tqparent widget.
+ Returns the parent widget.
*/
virtual TQWidget *widget() const = 0;
diff --git a/kaddressbook/interfaces/extensionwidget.cpp b/kaddressbook/interfaces/extensionwidget.cpp
index bae99b03f..63f90200b 100644
--- a/kaddressbook/interfaces/extensionwidget.cpp
+++ b/kaddressbook/interfaces/extensionwidget.cpp
@@ -27,9 +27,9 @@
using namespace KAB;
-ExtensionWidget::ExtensionWidget( Core *core, TQWidget *tqparent,
+ExtensionWidget::ExtensionWidget( Core *core, TQWidget *parent,
const char *name )
- : TQWidget( tqparent, name ), mCore( core )
+ : TQWidget( parent, name ), mCore( core )
{
}
diff --git a/kaddressbook/interfaces/extensionwidget.h b/kaddressbook/interfaces/extensionwidget.h
index 7b3daca9f..8302c5b9a 100644
--- a/kaddressbook/interfaces/extensionwidget.h
+++ b/kaddressbook/interfaces/extensionwidget.h
@@ -42,7 +42,7 @@ class KDE_EXPORT ExtensionWidget : public TQWidget
TQ_OBJECT
public:
- ExtensionWidget( Core *core, TQWidget *tqparent, const char *name = 0 );
+ ExtensionWidget( Core *core, TQWidget *parent, const char *name = 0 );
~ExtensionWidget();
/**
@@ -92,7 +92,7 @@ class KDE_EXPORT ExtensionWidget : public TQWidget
class ExtensionFactory : public KLibFactory
{
public:
- virtual ExtensionWidget *extension( KAB::Core *core, TQWidget *tqparent,
+ virtual ExtensionWidget *extension( KAB::Core *core, TQWidget *parent,
const char *name = 0 ) = 0;
virtual ConfigureWidget *configureWidget( TQWidget*, const char* = 0 )
diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp
index 8e8864d85..6b4340fdf 100644
--- a/kaddressbook/interfaces/xxport.cpp
+++ b/kaddressbook/interfaces/xxport.cpp
@@ -40,9 +40,9 @@ class XXPort::XXPortPrivate
KApplication *mKApp;
};
-XXPort::XXPort( KABC::AddressBook *ab, TQWidget *tqparent,
+XXPort::XXPort( KABC::AddressBook *ab, TQWidget *parent,
const char *name )
- : TQObject( tqparent, name ), mAddressBook( ab ), mParentWidget( tqparent ),
+ : TQObject( parent, name ), mAddressBook( ab ), mParentWidget( parent ),
d( new XXPortPrivate )
{
setInstance( new KInstance( "kaddressbook" ) );
diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h
index 0f24f5c0e..996767185 100644
--- a/kaddressbook/interfaces/xxport.h
+++ b/kaddressbook/interfaces/xxport.h
@@ -45,10 +45,10 @@ class KApplication;
*/
#define K_EXPORT_KADDRESSBOOK_XXFILTER_CATALOG( libname, XXPortClass, catalog ) \
class KDE_NO_EXPORT localXXPortFactory : public KAB::XXPortFactory { \
- KAB::XXPort *xxportObject( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) \
+ KAB::XXPort *xxportObject( KABC::AddressBook *ab, TQWidget *parent, const char *name ) \
{ const char *cat = catalog; \
if (cat) KGlobal::locale()->insertCatalogue(cat); \
- return new XXPortClass( ab, tqparent, name ); \
+ return new XXPortClass( ab, parent, name ); \
} \
}; \
K_EXPORT_COMPONENT_FACTORY( libname, localXXPortFactory )
@@ -71,7 +71,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
TQ_OBJECT
public:
- XXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
+ XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
~XXPort();
/**
@@ -143,7 +143,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
KABC::AddressBook *addressBook() const;
/**
- Returns a pointer to the tqparent widget. It can be used as tqparent for
+ Returns a pointer to the parent widget. It can be used as parent for
message boxes.
*/
TQWidget *parentWidget() const;
@@ -163,7 +163,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
class XXPortFactory : public KLibFactory
{
public:
- virtual XXPort *xxportObject( KABC::AddressBook *ab, TQWidget *tqparent,
+ virtual XXPort *xxportObject( KABC::AddressBook *ab, TQWidget *parent,
const char *name = 0 ) = 0;
protected:
diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp
index e4a712a9d..2b603fe23 100644
--- a/kaddressbook/jumpbuttonbar.cpp
+++ b/kaddressbook/jumpbuttonbar.cpp
@@ -43,7 +43,7 @@ class JumpButton : public TQPushButton
{
public:
JumpButton( const TQString &firstChar, const TQString &lastChar,
- TQWidget *tqparent );
+ TQWidget *parent );
TQString firstChar() const { return mChar; }
@@ -52,8 +52,8 @@ class JumpButton : public TQPushButton
};
JumpButton::JumpButton( const TQString &firstChar, const TQString &lastChar,
- TQWidget *tqparent )
- : TQPushButton( "", tqparent ), mChar( firstChar )
+ TQWidget *parent )
+ : TQPushButton( "", parent ), mChar( firstChar )
{
setToggleButton( true );
if ( !lastChar.isEmpty() )
@@ -62,8 +62,8 @@ JumpButton::JumpButton( const TQString &firstChar, const TQString &lastChar,
setText( firstChar.upper() );
}
-JumpButtonBar::JumpButtonBar( KAB::Core *core, TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name ), mCore( core )
+JumpButtonBar::JumpButtonBar( KAB::Core *core, TQWidget *parent, const char *name )
+ : TQWidget( parent, name ), mCore( core )
{
setMinimumSize( 1, 1 );
diff --git a/kaddressbook/jumpbuttonbar.h b/kaddressbook/jumpbuttonbar.h
index 6408582d9..d7471cea7 100644
--- a/kaddressbook/jumpbuttonbar.h
+++ b/kaddressbook/jumpbuttonbar.h
@@ -50,7 +50,7 @@ class JumpButtonBar : public TQWidget
TQ_OBJECT
public:
- JumpButtonBar( KAB::Core *core, TQWidget *tqparent, const char *name = 0 );
+ JumpButtonBar( KAB::Core *core, TQWidget *parent, const char *name = 0 );
~JumpButtonBar();
public slots:
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index db10f8f96..fac69a0a3 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -92,16 +92,16 @@
#include "kabcore.h"
-KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *tqparent,
+KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent,
const TQString &file, const char *name )
- : KAB::Core( client, TQT_TQOBJECT(tqparent), name ), mStatusBar( 0 ), mViewManager( 0 ),
+ : KAB::Core( client, TQT_TQOBJECT(parent), name ), mStatusBar( 0 ), mViewManager( 0 ),
mExtensionManager( 0 ), mJumpButtonBar( 0 ), mCategorySelectDialog( 0 ),
mCategoryEditDialog( 0 ), mLdapSearchDialog( 0 ), mReadWrite( readWrite ),
mModified( false )
{
- mWidget = new TQWidget( tqparent, name );
+ mWidget = new TQWidget( parent, name );
- mIsPart = !tqparent->isA( "KAddressBookMain" );
+ mIsPart = !parent->isA( "KAddressBookMain" );
mAddressBookChangedTimer = new TQTimer( this );
connect( mAddressBookChangedTimer, TQT_SIGNAL( timeout() ),
@@ -114,7 +114,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *tqparent,
mAddressBook = new KABC::AddressBook;
mAddressBook->addResource( new KABC::ResourceFile( file ) );
if ( !mAddressBook->load() ) {
- KMessageBox::error( tqparent, i18n("Unable to load '%1'.").tqarg( file ) );
+ KMessageBox::error( parent, i18n("Unable to load '%1'.").tqarg( file ) );
}
}
mAddressBook->setErrorHandler( new KABC::GuiErrorHandler( mWidget ) );
@@ -140,7 +140,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *tqparent,
mAddressBook->addCustomField( i18n( "Blog" ), KABC::Field::Personal,
"BlogFeed", "KADDRESSBOOK" );
- mSearchManager = new KAB::SearchManager( mAddressBook, TQT_TQOBJECT(tqparent) );
+ mSearchManager = new KAB::SearchManager( mAddressBook, TQT_TQOBJECT(parent) );
connect( mSearchManager, TQT_SIGNAL( contactsUpdated() ),
this, TQT_SLOT( slotContactsUpdated() ) );
@@ -270,7 +270,7 @@ TQStringList KABCore::selectedUIDs() const
return mViewManager->selectedUids();
}
-KABC::Resource *KABCore::requestResource( TQWidget *tqparent )
+KABC::Resource *KABCore::requestResource( TQWidget *parent )
{
TQPtrList kabcResources = addressBook()->resources();
@@ -301,7 +301,7 @@ KABC::Resource *KABCore::requestResource( TQWidget *tqparent )
}
}
- KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, tqparent );
+ KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, parent );
return static_cast( res ); // upcast
}
@@ -1152,10 +1152,10 @@ void KABCore::addressBookChanged()
updateCategories();
}
-AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( TQWidget *tqparent,
+AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( TQWidget *parent,
const char *name )
{
- AddresseeEditorDialog *dialog = new AddresseeEditorDialog( this, tqparent,
+ AddresseeEditorDialog *dialog = new AddresseeEditorDialog( this, parent,
name ? name : "editorDialog" );
connect( dialog, TQT_SIGNAL( contactModified( const KABC::Addressee& ) ),
TQT_SLOT( contactModified( const KABC::Addressee& ) ) );
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index aed5e08f1..f8c166a2a 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -86,7 +86,7 @@ class KDE_EXPORT KABCore : public KAB::Core
TQ_OBJECT
public:
- KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *tqparent,
+ KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent,
const TQString &file = TQString(), const char *name = 0 );
~KABCore();
@@ -131,10 +131,10 @@ class KDE_EXPORT KABCore : public KAB::Core
resource or a null pointer if no resource was selected by
the user.
*/
- KABC::Resource *requestResource( TQWidget *tqparent );
+ KABC::Resource *requestResource( TQWidget *parent );
/**
- Returns the tqparent widget.
+ Returns the parent widget.
*/
TQWidget *widget() const;
@@ -435,7 +435,7 @@ class KDE_EXPORT KABCore : public KAB::Core
void updateCategories();
TQStringList allCategories() const;
- AddresseeEditorDialog *createAddresseeEditorDialog( TQWidget *tqparent,
+ AddresseeEditorDialog *createAddresseeEditorDialog( TQWidget *parent,
const char *name = 0 );
TQWidget *mWidget;
diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp
index 88cd03109..5f978b4d1 100644
--- a/kaddressbook/kaddressbook_part.cpp
+++ b/kaddressbook/kaddressbook_part.cpp
@@ -43,9 +43,9 @@ typedef KParts::GenericFactory< KAddressbookPart > KAddressbookFactory;
K_EXPORT_COMPONENT_FACTORY( libkaddressbookpart, KAddressbookFactory )
KAddressbookPart::KAddressbookPart( TQWidget *parentWidget, const char *widgetName,
- TQObject *tqparent, const char *name,
+ TQObject *parent, const char *name,
const TQStringList & )
- : DCOPObject( "KAddressBookIface" ), KParts::ReadOnlyPart( tqparent, name )
+ : DCOPObject( "KAddressBookIface" ), KParts::ReadOnlyPart( parent, name )
{
setInstance( KAddressbookFactory::instance() );
diff --git a/kaddressbook/kaddressbook_part.h b/kaddressbook/kaddressbook_part.h
index 264209314..366d65cbd 100644
--- a/kaddressbook/kaddressbook_part.h
+++ b/kaddressbook/kaddressbook_part.h
@@ -41,7 +41,7 @@ class KAddressbookPart: public KParts::ReadOnlyPart, virtual public KAddressBook
public:
KAddressbookPart( TQWidget *parentWidget, const char *widgetName,
- TQObject *tqparent, const char *name, const TQStringList& );
+ TQObject *parent, const char *name, const TQStringList& );
virtual ~KAddressbookPart();
static KAboutData *createAboutData();
diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp
index 9f1aa3cec..43d709d2d 100644
--- a/kaddressbook/kaddressbookview.cpp
+++ b/kaddressbook/kaddressbookview.cpp
@@ -37,9 +37,9 @@
#include "kaddressbookview.h"
-KAddressBookView::KAddressBookView( KAB::Core *core, TQWidget *tqparent,
+KAddressBookView::KAddressBookView( KAB::Core *core, TQWidget *parent,
const char *name )
- : TQWidget( tqparent, name ), mCore( core ), mFieldList()
+ : TQWidget( parent, name ), mCore( core ), mFieldList()
{
initGUI();
@@ -194,10 +194,10 @@ void KAddressBookView::updateView()
}
ViewConfigureWidget *ViewFactory::configureWidget( KABC::AddressBook *ab,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name )
{
- return new ViewConfigureWidget( ab, tqparent, name );
+ return new ViewConfigureWidget( ab, parent, name );
}
#include "kaddressbookview.moc"
diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h
index eca5521bc..ed4cfc6c4 100644
--- a/kaddressbook/kaddressbookview.h
+++ b/kaddressbook/kaddressbookview.h
@@ -61,7 +61,7 @@ class KDE_EXPORT KAddressBookView : public TQWidget
public:
enum DefaultFilterType { None = 0, Active = 1, Specific = 2 };
- KAddressBookView( KAB::Core *core, TQWidget *tqparent, const char *name );
+ KAddressBookView( KAB::Core *core, TQWidget *parent, const char *name );
virtual ~KAddressBookView();
/**
@@ -251,8 +251,8 @@ class KDE_EXPORT KAddressBookView : public TQWidget
KABC::Addressee::List addressees();
/**
- This method returns the widget that should be used as the tqparent for
- all view components. By using this widget as the tqparent and not
+ This method returns the widget that should be used as the parent for
+ all view components. By using this widget as the parent and not
'this', the view subclass has the option of placing other widgets
around the view (ie: search fields, etc). Do not delete this widget!
*/
@@ -276,7 +276,7 @@ class KDE_EXPORT KAddressBookView : public TQWidget
class KDE_EXPORT ViewFactory : public KLibFactory
{
public:
- virtual KAddressBookView *view( KAB::Core *core, TQWidget *tqparent,
+ virtual KAddressBookView *view( KAB::Core *core, TQWidget *parent,
const char *name = 0 ) = 0;
/**
@return The type of the view. This is normally a small one word
@@ -301,7 +301,7 @@ class KDE_EXPORT ViewFactory : public KLibFactory
not be called.
*/
virtual ViewConfigureWidget *configureWidget( KABC::AddressBook *ab,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name = 0 );
protected:
diff --git a/kaddressbook/kcmconfigs/addhostdialog.cpp b/kaddressbook/kcmconfigs/addhostdialog.cpp
index a6174dffd..155f6f6ba 100644
--- a/kaddressbook/kcmconfigs/addhostdialog.cpp
+++ b/kaddressbook/kcmconfigs/addhostdialog.cpp
@@ -33,8 +33,8 @@
#include
#include "addhostdialog.h"
-AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* tqparent, const char* name )
- : KDialogBase( Plain, i18n( "Add Host" ), Ok | Cancel, Ok, tqparent, name, true, true )
+AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* parent, const char* name )
+ : KDialogBase( Plain, i18n( "Add Host" ), Ok | Cancel, Ok, parent, name, true, true )
{
mServer = server;
diff --git a/kaddressbook/kcmconfigs/addhostdialog.h b/kaddressbook/kcmconfigs/addhostdialog.h
index 956892d9f..6a57861a1 100644
--- a/kaddressbook/kcmconfigs/addhostdialog.h
+++ b/kaddressbook/kcmconfigs/addhostdialog.h
@@ -38,7 +38,7 @@ class AddHostDialog : public KDialogBase
TQ_OBJECT
public:
- AddHostDialog( KPIM::LdapServer* server, TQWidget* tqparent = 0, const char* name = 0 );
+ AddHostDialog( KPIM::LdapServer* server, TQWidget* parent = 0, const char* name = 0 );
~AddHostDialog();
signals:
diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index f1a3f525d..8c04002d5 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -41,8 +41,8 @@
#include "addresseewidget.h"
NamePartWidget::NamePartWidget( const TQString &title, const TQString &label,
- TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name ), mTitle( title ), mLabel( label )
+ TQWidget *parent, const char *name )
+ : TQWidget( parent, name ), mTitle( title ), mLabel( label )
{
TQHBoxLayout *tqlayout = new TQHBoxLayout( this );
@@ -131,8 +131,8 @@ void NamePartWidget::selectionChanged( TQListBoxItem *item )
-AddresseeWidget::AddresseeWidget( TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name )
+AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name )
+ : TQWidget( parent, name )
{
TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
KDialog::spacingHint() );
diff --git a/kaddressbook/kcmconfigs/addresseewidget.h b/kaddressbook/kcmconfigs/addresseewidget.h
index 8c81ac23d..b7c55b9ea 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.h
+++ b/kaddressbook/kcmconfigs/addresseewidget.h
@@ -39,7 +39,7 @@ class NamePartWidget : public TQWidget
TQ_OBJECT
public:
- NamePartWidget( const TQString &title, const TQString &label, TQWidget *tqparent,
+ NamePartWidget( const TQString &title, const TQString &label, TQWidget *parent,
const char *name = 0 );
~NamePartWidget();
@@ -72,7 +72,7 @@ class AddresseeWidget : public TQWidget
TQ_OBJECT
public:
- AddresseeWidget( TQWidget *tqparent, const char *name = 0 );
+ AddresseeWidget( TQWidget *parent, const char *name = 0 );
~AddresseeWidget();
void restoreSettings();
diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
index 62716886b..68f4643ab 100644
--- a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
+++ b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
@@ -30,8 +30,8 @@
#include "extensionwidget.h"
ExtensionConfigDialog::ExtensionConfigDialog( KAB::ExtensionFactory *factory, KConfig *config,
- TQWidget *tqparent, const char *name )
- : KDialogBase( Plain, i18n( "Extension Settings" ), Ok | Cancel, Ok, tqparent,
+ TQWidget *parent, const char *name )
+ : KDialogBase( Plain, i18n( "Extension Settings" ), Ok | Cancel, Ok, parent,
name, true, true ), mWidget( 0 ), mConfig( config )
{
TQFrame *page = plainPage();
diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.h b/kaddressbook/kcmconfigs/extensionconfigdialog.h
index de5f506b8..6c595b443 100644
--- a/kaddressbook/kcmconfigs/extensionconfigdialog.h
+++ b/kaddressbook/kcmconfigs/extensionconfigdialog.h
@@ -39,7 +39,7 @@ class ExtensionConfigDialog : public KDialogBase
public:
ExtensionConfigDialog( KAB::ExtensionFactory *factory, KConfig *config,
- TQWidget *tqparent, const char *name = 0 );
+ TQWidget *parent, const char *name = 0 );
~ExtensionConfigDialog();
protected slots:
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index f2899ba35..a3775b369 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -45,8 +45,8 @@
#include "kabconfigwidget.h"
-KABConfigWidget::KABConfigWidget( TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name )
+KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
+ : TQWidget( parent, name )
{
TQVBoxLayout *topLayout = new TQVBoxLayout( this, 0,
KDialog::spacingHint() );
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.h b/kaddressbook/kcmconfigs/kabconfigwidget.h
index e169f2ef5..1a4fc666a 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.h
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.h
@@ -42,7 +42,7 @@ class KABConfigWidget : public TQWidget
TQ_OBJECT
public:
- KABConfigWidget( TQWidget *tqparent, const char *name = 0 );
+ KABConfigWidget( TQWidget *parent, const char *name = 0 );
void restoreSettings();
void saveSettings();
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
index a504af0bb..3ceca5b52 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
@@ -35,13 +35,13 @@
extern "C"
{
- KDE_EXPORT KCModule *create_kabconfig( TQWidget *tqparent, const char * ) {
- return new KCMKabConfig( tqparent, "kcmkabconfig" );
+ KDE_EXPORT KCModule *create_kabconfig( TQWidget *parent, const char * ) {
+ return new KCMKabConfig( parent, "kcmkabconfig" );
}
}
-KCMKabConfig::KCMKabConfig( TQWidget *tqparent, const char *name )
- : KCModule( tqparent, name )
+KCMKabConfig::KCMKabConfig( TQWidget *parent, const char *name )
+ : KCModule( parent, name )
{
TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
mConfigWidget = new KABConfigWidget( this, "mConfigWidget" );
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.h b/kaddressbook/kcmconfigs/kcmkabconfig.h
index 74232946f..42348145b 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.h
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.h
@@ -34,7 +34,7 @@ class KCMKabConfig : public KCModule
TQ_OBJECT
public:
- KCMKabConfig( TQWidget *tqparent = 0, const char *name = 0 );
+ KCMKabConfig( TQWidget *parent = 0, const char *name = 0 );
virtual void load();
virtual void save();
diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
index 8c0fa7316..d6974a1b8 100644
--- a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
@@ -33,13 +33,13 @@
extern "C"
{
- KDE_EXPORT KCModule *create_kabcustomfields( TQWidget *tqparent, const char * ) {
- return new KCMKabCustomFields( tqparent, "kcmkabcustomfields" );
+ KDE_EXPORT KCModule *create_kabcustomfields( TQWidget *parent, const char * ) {
+ return new KCMKabCustomFields( parent, "kcmkabcustomfields" );
}
}
-KCMKabCustomFields::KCMKabCustomFields( TQWidget *tqparent, const char *name )
- : KCMDesignerFields( tqparent, name )
+KCMKabCustomFields::KCMKabCustomFields( TQWidget *parent, const char *name )
+ : KCMDesignerFields( parent, name )
{
}
diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.h b/kaddressbook/kcmconfigs/kcmkabcustomfields.h
index 4eb30a880..72874e1b1 100644
--- a/kaddressbook/kcmconfigs/kcmkabcustomfields.h
+++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.h
@@ -28,7 +28,7 @@
class KCMKabCustomFields : public KPIM::KCMDesignerFields
{
public:
- KCMKabCustomFields( TQWidget *tqparent = 0, const char *name = 0 );
+ KCMKabCustomFields( TQWidget *parent = 0, const char *name = 0 );
protected:
TQString localUiDir();
diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
index b2f657c87..e6f25529c 100644
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
@@ -36,13 +36,13 @@
extern "C"
{
- KDE_EXPORT KCModule *create_kabldapconfig( TQWidget *tqparent, const char * ) {
- return new KCMKabLdapConfig( tqparent, "kcmkabldapconfig" );
+ KDE_EXPORT KCModule *create_kabldapconfig( TQWidget *parent, const char * ) {
+ return new KCMKabLdapConfig( parent, "kcmkabldapconfig" );
}
}
-KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *tqparent, const char *name )
- : KCModule( tqparent, name )
+KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *parent, const char *name )
+ : KCModule( parent, name )
{
TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
mConfigWidget = new LDAPOptionsWidget( this );
diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.h b/kaddressbook/kcmconfigs/kcmkabldapconfig.h
index 10ec0d211..cfa7028dd 100644
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.h
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.h
@@ -36,7 +36,7 @@ class KCMKabLdapConfig : public KCModule
TQ_OBJECT
public:
- KCMKabLdapConfig( TQWidget *tqparent = 0, const char *name = 0 );
+ KCMKabLdapConfig( TQWidget *parent = 0, const char *name = 0 );
virtual void load();
virtual void save();
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
index 996da4287..a091c0f0c 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
@@ -45,8 +45,8 @@
class LDAPItem : public TQCheckListItem
{
public:
- LDAPItem( TQListView *tqparent, const KPIM::LdapServer &server, bool isActive = false )
- : TQCheckListItem( tqparent, tqparent->lastItem(), TQString(), TQCheckListItem::CheckBox ),
+ LDAPItem( TQListView *parent, const KPIM::LdapServer &server, bool isActive = false )
+ : TQCheckListItem( parent, parent->lastItem(), TQString(), TQCheckListItem::CheckBox ),
mIsActive( isActive )
{
setServer( server );
@@ -69,8 +69,8 @@ class LDAPItem : public TQCheckListItem
bool mIsActive;
};
-LDAPOptionsWidget::LDAPOptionsWidget( TQWidget* tqparent, const char* name )
- : TQWidget( tqparent, name )
+LDAPOptionsWidget::LDAPOptionsWidget( TQWidget* parent, const char* name )
+ : TQWidget( parent, name )
{
initGUI();
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.h b/kaddressbook/kcmconfigs/ldapoptionswidget.h
index 17fbe6e6f..f8e834b62 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.h
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.h
@@ -37,7 +37,7 @@ class LDAPOptionsWidget : public TQWidget
TQ_OBJECT
public:
- LDAPOptionsWidget( TQWidget* tqparent = 0, const char* name = 0 );
+ LDAPOptionsWidget( TQWidget* parent = 0, const char* name = 0 );
~LDAPOptionsWidget();
void restoreSettings();
diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp
index 1b6e77440..739672fc7 100644
--- a/kaddressbook/keywidget.cpp
+++ b/kaddressbook/keywidget.cpp
@@ -38,8 +38,8 @@
#include "keywidget.h"
-KeyWidget::KeyWidget( TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name )
+KeyWidget::KeyWidget( TQWidget *parent, const char *name )
+ : TQWidget( parent, name )
{
TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, KDialog::marginHint(),
KDialog::spacingHint() );
diff --git a/kaddressbook/keywidget.h b/kaddressbook/keywidget.h
index 7e9a7b28f..700a2fc80 100644
--- a/kaddressbook/keywidget.h
+++ b/kaddressbook/keywidget.h
@@ -37,7 +37,7 @@ class KeyWidget : public TQWidget
TQ_OBJECT
public:
- KeyWidget( TQWidget *tqparent, const char *name = 0 );
+ KeyWidget( TQWidget *parent, const char *name = 0 );
~KeyWidget();
void setKeys( const KABC::Key::List &list );
diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp
index 19b5dd6cf..8d5b90d97 100644
--- a/kaddressbook/ldapsearchdialog.cpp
+++ b/kaddressbook/ldapsearchdialog.cpp
@@ -104,8 +104,8 @@ static TQMap& adrbookattr2ldap()
class ContactListItem : public TQListViewItem
{
public:
- ContactListItem( TQListView* tqparent, const KPIM::LdapAttrMap& attrs )
- : TQListViewItem( tqparent ), mAttrs( attrs )
+ ContactListItem( TQListView* parent, const KPIM::LdapAttrMap& attrs )
+ : TQListViewItem( parent ), mAttrs( attrs )
{ }
KPIM::LdapAttrMap mAttrs;
@@ -139,9 +139,9 @@ TQValueList LDAPSearchDialog::Private::selectedItems( TQListVi
}
LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core,
- TQWidget* tqparent, const char* name )
+ TQWidget* parent, const char* name )
: KDialogBase( Plain, i18n( "Search for Addresses in Directory" ), Help | User1 | User2 |
- Cancel, Default, tqparent, name, false, true ),
+ Cancel, Default, parent, name, false, true ),
mAddressBook( ab ), mCore( core ), d( new Private )
{
setButtonCancel( KStdGuiItem::close() );
diff --git a/kaddressbook/ldapsearchdialog.h b/kaddressbook/ldapsearchdialog.h
index 0d9727f6e..04757e51f 100644
--- a/kaddressbook/ldapsearchdialog.h
+++ b/kaddressbook/ldapsearchdialog.h
@@ -53,7 +53,7 @@ class LDAPSearchDialog : public KDialogBase
TQ_OBJECT
public:
- LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core, TQWidget* tqparent, const char* name = 0 );
+ LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core, TQWidget* parent, const char* name = 0 );
~LDAPSearchDialog();
bool isOK() const { return mIsOK; }
diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp
index 248c92bdc..4bb6e3700 100644
--- a/kaddressbook/nameeditdialog.cpp
+++ b/kaddressbook/nameeditdialog.cpp
@@ -46,9 +46,9 @@
#include "nameeditdialog.h"
NameEditDialog::NameEditDialog( const KABC::Addressee &addr, int type,
- bool readOnly, TQWidget *tqparent, const char *name )
+ bool readOnly, TQWidget *parent, const char *name )
: KDialogBase( Plain, i18n( "Edit Contact Name" ), Help | Ok | Cancel,
- Ok, tqparent, name, true ), mAddressee( addr )
+ Ok, parent, name, true ), mAddressee( addr )
{
TQWidget *page = plainPage();
TQGridLayout *tqlayout = new TQGridLayout( page );
diff --git a/kaddressbook/nameeditdialog.h b/kaddressbook/nameeditdialog.h
index 8a160073c..09d13c78d 100644
--- a/kaddressbook/nameeditdialog.h
+++ b/kaddressbook/nameeditdialog.h
@@ -54,7 +54,7 @@ class NameEditDialog : public KDialogBase
};
NameEditDialog( const KABC::Addressee &addr, int type,
- bool readOnly, TQWidget *tqparent, const char *name = 0 );
+ bool readOnly, TQWidget *parent, const char *name = 0 );
~NameEditDialog();
TQString familyName() const;
diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index 4a394621b..5c5733142 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -46,8 +46,8 @@
#include "phoneeditwidget.h"
-PhoneTypeCombo::PhoneTypeCombo( TQWidget *tqparent )
- : KComboBox( tqparent, "TypeCombo" ),
+PhoneTypeCombo::PhoneTypeCombo( TQWidget *parent )
+ : KComboBox( parent, "TypeCombo" ),
mType( KABC::PhoneNumber::Home ),
mLastSelected( 0 ),
mTypeList( KABC::PhoneNumber::typeList() )
@@ -126,8 +126,8 @@ void PhoneTypeCombo::otherSelected()
update();
}
-PhoneNumberWidget::PhoneNumberWidget( TQWidget *tqparent )
- : TQWidget( tqparent )
+PhoneNumberWidget::PhoneNumberWidget( TQWidget *parent )
+ : TQWidget( parent )
{
TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 6, 11 );
@@ -166,8 +166,8 @@ void PhoneNumberWidget::setReadOnly( bool readOnly )
}
-PhoneEditWidget::PhoneEditWidget( TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name ), mReadOnly( false )
+PhoneEditWidget::PhoneEditWidget( TQWidget *parent, const char *name )
+ : TQWidget( parent, name ), mReadOnly( false )
{
TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2 );
tqlayout->setSpacing( KDialog::spacingHint() );
@@ -291,9 +291,9 @@ void PhoneEditWidget::changed( int pos )
///////////////////////////////////////////
// PhoneTypeDialog
-PhoneTypeDialog::PhoneTypeDialog( int type, TQWidget *tqparent )
+PhoneTypeDialog::PhoneTypeDialog( int type, TQWidget *parent )
: KDialogBase( Plain, i18n( "Edit Phone Number" ), Ok | Cancel, Ok,
- tqparent, "PhoneTypeDialog", true ),
+ parent, "PhoneTypeDialog", true ),
mType( type )
{
TQWidget *page = plainPage();
diff --git a/kaddressbook/phoneeditwidget.h b/kaddressbook/phoneeditwidget.h
index aa8eb4d54..a49f4aa9f 100644
--- a/kaddressbook/phoneeditwidget.h
+++ b/kaddressbook/phoneeditwidget.h
@@ -42,7 +42,7 @@ class PhoneTypeCombo : public KComboBox
TQ_OBJECT
public:
- PhoneTypeCombo( TQWidget *tqparent );
+ PhoneTypeCombo( TQWidget *parent );
~PhoneTypeCombo();
void setType( int type );
@@ -69,7 +69,7 @@ class PhoneNumberWidget : public TQWidget
TQ_OBJECT
public:
- PhoneNumberWidget( TQWidget *tqparent );
+ PhoneNumberWidget( TQWidget *parent );
void setNumber( const KABC::PhoneNumber &number );
KABC::PhoneNumber number() const;
@@ -94,7 +94,7 @@ class PhoneEditWidget : public TQWidget
TQ_OBJECT
public:
- PhoneEditWidget( TQWidget *tqparent, const char *name = 0 );
+ PhoneEditWidget( TQWidget *parent, const char *name = 0 );
~PhoneEditWidget();
void setPhoneNumbers( const KABC::PhoneNumber::List &list );
@@ -133,7 +133,7 @@ class PhoneTypeDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- PhoneTypeDialog( int type, TQWidget *tqparent );
+ PhoneTypeDialog( int type, TQWidget *parent );
int type() const;
diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp
index 13e4fb4e4..5d970b3b7 100644
--- a/kaddressbook/printing/detailledstyle.cpp
+++ b/kaddressbook/printing/detailledstyle.cpp
@@ -63,9 +63,9 @@ const char *ContactHeaderForeColor = "ContactHeaderForeColor";
const char *ContactHeaderBGColor = "ContactHeaderBGColor";
-DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *tqparent, const char *name )
- : PrintStyle( tqparent, name ),
- mPageAppearance( new AppearancePage( tqparent, "AppearancePage" ) ),
+DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *parent, const char *name )
+ : PrintStyle( parent, name ),
+ mPageAppearance( new AppearancePage( parent, "AppearancePage" ) ),
mPainter( 0 ),
mPrintProgress( 0 )
{
@@ -272,9 +272,9 @@ bool DetailledPrintStyle::printEntries( const KABC::Addressee::List &contacts,
return true;
}
-DetailledPrintStyleFactory::DetailledPrintStyleFactory( PrintingWizard *tqparent,
+DetailledPrintStyleFactory::DetailledPrintStyleFactory( PrintingWizard *parent,
const char *name )
- : PrintStyleFactory( tqparent, name )
+ : PrintStyleFactory( parent, name )
{
}
diff --git a/kaddressbook/printing/detailledstyle.h b/kaddressbook/printing/detailledstyle.h
index 977bcd494..7ae1afde8 100644
--- a/kaddressbook/printing/detailledstyle.h
+++ b/kaddressbook/printing/detailledstyle.h
@@ -39,7 +39,7 @@ class DetailledPrintStyle : public PrintStyle
TQ_OBJECT
public:
- DetailledPrintStyle( PrintingWizard *tqparent, const char *name = 0 );
+ DetailledPrintStyle( PrintingWizard *parent, const char *name = 0 );
~DetailledPrintStyle();
void print( const KABC::Addressee::List &contacts, PrintProgress* );
@@ -58,7 +58,7 @@ class DetailledPrintStyle : public PrintStyle
class DetailledPrintStyleFactory : public PrintStyleFactory
{
public:
- DetailledPrintStyleFactory( PrintingWizard *tqparent, const char *name = 0 );
+ DetailledPrintStyleFactory( PrintingWizard *parent, const char *name = 0 );
PrintStyle *create() const;
TQString description() const;
diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp
index 2301bb16c..746677ec8 100644
--- a/kaddressbook/printing/mikesstyle.cpp
+++ b/kaddressbook/printing/mikesstyle.cpp
@@ -43,8 +43,8 @@ using namespace KABPrinting;
const int mFieldSpacingHint = 2;
-MikesStyle::MikesStyle( PrintingWizard *tqparent, const char *name )
- : PrintStyle( tqparent, name )
+MikesStyle::MikesStyle( PrintingWizard *parent, const char *name )
+ : PrintStyle( parent, name )
{
setPreview( "mike-style.png" );
}
@@ -244,8 +244,8 @@ int MikesStyle::calcHeight( const KABC::Addressee &addr,
}
-MikesStyleFactory::MikesStyleFactory( PrintingWizard *tqparent, const char *name )
- : PrintStyleFactory( tqparent, name )
+MikesStyleFactory::MikesStyleFactory( PrintingWizard *parent, const char *name )
+ : PrintStyleFactory( parent, name )
{
}
diff --git a/kaddressbook/printing/mikesstyle.h b/kaddressbook/printing/mikesstyle.h
index 6b61287d6..d8c4e5ce7 100644
--- a/kaddressbook/printing/mikesstyle.h
+++ b/kaddressbook/printing/mikesstyle.h
@@ -39,7 +39,7 @@ class MikesStyle : public PrintStyle
TQ_OBJECT
public:
- MikesStyle( PrintingWizard *tqparent, const char *name );
+ MikesStyle( PrintingWizard *parent, const char *name );
~MikesStyle();
void print( const KABC::Addressee::List&, PrintProgress* );
@@ -55,7 +55,7 @@ class MikesStyle : public PrintStyle
class MikesStyleFactory : public PrintStyleFactory
{
public:
- MikesStyleFactory( PrintingWizard *tqparent, const char *name = 0 );
+ MikesStyleFactory( PrintingWizard *parent, const char *name = 0 );
PrintStyle *create() const;
TQString description() const;
diff --git a/kaddressbook/printing/printingwizard.cpp b/kaddressbook/printing/printingwizard.cpp
index e42621dee..1ea33d53b 100644
--- a/kaddressbook/printing/printingwizard.cpp
+++ b/kaddressbook/printing/printingwizard.cpp
@@ -53,9 +53,9 @@
using namespace KABPrinting;
PrintingWizard::PrintingWizard( KPrinter *printer, KABC::AddressBook* ab,
- const TQStringList& selection, TQWidget *tqparent,
+ const TQStringList& selection, TQWidget *parent,
const char* name )
- : KWizard( tqparent, name ), mPrinter( printer ), mAddressBook( ab ),
+ : KWizard( parent, name ), mPrinter( printer ), mAddressBook( ab ),
mSelection( selection ), mStyle( 0 )
{
mSelectionPage = new SelectionPage( this );
diff --git a/kaddressbook/printing/printingwizard.h b/kaddressbook/printing/printingwizard.h
index 54442075c..16b8e982d 100644
--- a/kaddressbook/printing/printingwizard.h
+++ b/kaddressbook/printing/printingwizard.h
@@ -59,7 +59,7 @@ class PrintingWizard : public KWizard
PrintingWizard( KPrinter *printer,
KABC::AddressBook* ab,
const TQStringList& selection,
- TQWidget *tqparent = 0, const char *name = 0 );
+ TQWidget *parent = 0, const char *name = 0 );
~PrintingWizard();
/**
diff --git a/kaddressbook/printing/printprogress.cpp b/kaddressbook/printing/printprogress.cpp
index 9e0e3aa91..3a9c00d19 100644
--- a/kaddressbook/printing/printprogress.cpp
+++ b/kaddressbook/printing/printprogress.cpp
@@ -34,8 +34,8 @@
using namespace KABPrinting;
-PrintProgress::PrintProgress( TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name )
+PrintProgress::PrintProgress( TQWidget *parent, const char *name )
+ : TQWidget( parent, name )
{
setCaption( i18n( "Printing: Progress" ) );
diff --git a/kaddressbook/printing/printprogress.h b/kaddressbook/printing/printprogress.h
index a27c5fc3f..f4e726589 100644
--- a/kaddressbook/printing/printprogress.h
+++ b/kaddressbook/printing/printprogress.h
@@ -43,7 +43,7 @@ class PrintProgress : public TQWidget
TQ_OBJECT
public:
- PrintProgress( TQWidget *tqparent, const char *name = 0 );
+ PrintProgress( TQWidget *parent, const char *name = 0 );
~PrintProgress();
/**
diff --git a/kaddressbook/printing/printstyle.cpp b/kaddressbook/printing/printstyle.cpp
index 1c0c79710..9387db325 100644
--- a/kaddressbook/printing/printstyle.cpp
+++ b/kaddressbook/printing/printstyle.cpp
@@ -32,8 +32,8 @@
using namespace KABPrinting;
-PrintStyle::PrintStyle( PrintingWizard* tqparent, const char* name )
- : TQObject( tqparent, name ), mWizard( tqparent ), mSortField( 0 )
+PrintStyle::PrintStyle( PrintingWizard* parent, const char* name )
+ : TQObject( parent, name ), mWizard( parent ), mSortField( 0 )
{
}
@@ -118,8 +118,8 @@ bool PrintStyle::preferredSortType()
return mSortType;
}
-PrintStyleFactory::PrintStyleFactory( PrintingWizard* tqparent, const char* name )
- : mParent( tqparent ), mName( name )
+PrintStyleFactory::PrintStyleFactory( PrintingWizard* parent, const char* name )
+ : mParent( parent ), mName( name )
{
}
diff --git a/kaddressbook/printing/printstyle.h b/kaddressbook/printing/printstyle.h
index f7e471e25..e7e6d9310 100644
--- a/kaddressbook/printing/printstyle.h
+++ b/kaddressbook/printing/printstyle.h
@@ -63,7 +63,7 @@ class PrintStyle : public TQObject
TQ_OBJECT
public:
- PrintStyle( PrintingWizard* tqparent, const char* name = 0 );
+ PrintStyle( PrintingWizard* parent, const char* name = 0 );
virtual ~PrintStyle();
/**
@@ -151,7 +151,7 @@ class PrintStyle : public TQObject
class PrintStyleFactory
{
public:
- PrintStyleFactory( PrintingWizard* tqparent, const char* name = 0 );
+ PrintStyleFactory( PrintingWizard* parent, const char* name = 0 );
virtual ~PrintStyleFactory();
virtual PrintStyle *create() const = 0;
diff --git a/kaddressbook/printing/selectionpage.cpp b/kaddressbook/printing/selectionpage.cpp
index 516431a55..e71c27891 100644
--- a/kaddressbook/printing/selectionpage.cpp
+++ b/kaddressbook/printing/selectionpage.cpp
@@ -38,8 +38,8 @@
#include "selectionpage.h"
-SelectionPage::SelectionPage( TQWidget* tqparent, const char* name )
- : TQWidget( tqparent, name )
+SelectionPage::SelectionPage( TQWidget* parent, const char* name )
+ : TQWidget( parent, name )
{
setCaption( i18n( "Choose Which Contacts to Print" ) );
diff --git a/kaddressbook/printing/selectionpage.h b/kaddressbook/printing/selectionpage.h
index dded01ecd..8e566f33b 100644
--- a/kaddressbook/printing/selectionpage.h
+++ b/kaddressbook/printing/selectionpage.h
@@ -38,7 +38,7 @@ class SelectionPage : public TQWidget
TQ_OBJECT
public:
- SelectionPage( TQWidget* tqparent = 0, const char* name = 0 );
+ SelectionPage( TQWidget* parent = 0, const char* name = 0 );
~SelectionPage();
void setFilters( const TQStringList& );
diff --git a/kaddressbook/printing/stylepage.cpp b/kaddressbook/printing/stylepage.cpp
index 760f71d6c..b1c29b464 100644
--- a/kaddressbook/printing/stylepage.cpp
+++ b/kaddressbook/printing/stylepage.cpp
@@ -34,8 +34,8 @@
#include "stylepage.h"
-StylePage::StylePage( KABC::AddressBook *ab, TQWidget* tqparent, const char* name )
- : TQWidget( tqparent, name ), mAddressBook( ab )
+StylePage::StylePage( KABC::AddressBook *ab, TQWidget* parent, const char* name )
+ : TQWidget( parent, name ), mAddressBook( ab )
{
initGUI();
diff --git a/kaddressbook/printing/stylepage.h b/kaddressbook/printing/stylepage.h
index 24d424597..920d9a9d0 100644
--- a/kaddressbook/printing/stylepage.h
+++ b/kaddressbook/printing/stylepage.h
@@ -41,7 +41,7 @@ class StylePage : public TQWidget
TQ_OBJECT
public:
- StylePage( KABC::AddressBook *ab, TQWidget* tqparent = 0, const char* name = 0 );
+ StylePage( KABC::AddressBook *ab, TQWidget* parent = 0, const char* name = 0 );
~StylePage();
/**
diff --git a/kaddressbook/searchmanager.cpp b/kaddressbook/searchmanager.cpp
index 7a24e1b9d..3bad8eb73 100644
--- a/kaddressbook/searchmanager.cpp
+++ b/kaddressbook/searchmanager.cpp
@@ -30,8 +30,8 @@
using namespace KAB;
SearchManager::SearchManager( KABC::AddressBook *ab,
- TQObject *tqparent, const char *name )
- : TQObject( tqparent, name ), mAddressBook( ab )
+ TQObject *parent, const char *name )
+ : TQObject( parent, name ), mAddressBook( ab )
{
}
diff --git a/kaddressbook/searchmanager.h b/kaddressbook/searchmanager.h
index 8443c7d36..d605ecf75 100644
--- a/kaddressbook/searchmanager.h
+++ b/kaddressbook/searchmanager.h
@@ -48,7 +48,7 @@ class SearchManager : public TQObject
};
SearchManager( KABC::AddressBook *ab,
- TQObject *tqparent, const char *name = 0 );
+ TQObject *parent, const char *name = 0 );
/**
This method takes a pattern and searches for a match of the specified
diff --git a/kaddressbook/secrecywidget.cpp b/kaddressbook/secrecywidget.cpp
index 34ff25ebf..29942cb71 100644
--- a/kaddressbook/secrecywidget.cpp
+++ b/kaddressbook/secrecywidget.cpp
@@ -29,8 +29,8 @@
#include "secrecywidget.h"
-SecrecyWidget::SecrecyWidget( TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name )
+SecrecyWidget::SecrecyWidget( TQWidget *parent, const char *name )
+ : TQWidget( parent, name )
{
TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(),
KDialog::spacingHint() );
diff --git a/kaddressbook/secrecywidget.h b/kaddressbook/secrecywidget.h
index 40492587e..c872eb2c4 100644
--- a/kaddressbook/secrecywidget.h
+++ b/kaddressbook/secrecywidget.h
@@ -35,7 +35,7 @@ class SecrecyWidget : public TQWidget
TQ_OBJECT
public:
- SecrecyWidget( TQWidget *tqparent, const char *name = 0 );
+ SecrecyWidget( TQWidget *parent, const char *name = 0 );
~SecrecyWidget();
void setSecrecy( const KABC::Secrecy &secrecy );
diff --git a/kaddressbook/simpleaddresseeeditor.cpp b/kaddressbook/simpleaddresseeeditor.cpp
index d5eb004d5..3a371dc67 100644
--- a/kaddressbook/simpleaddresseeeditor.cpp
+++ b/kaddressbook/simpleaddresseeeditor.cpp
@@ -30,8 +30,8 @@
#include "simpleaddresseeeditor.h"
-SimpleAddresseeEditor::SimpleAddresseeEditor( TQWidget *tqparent, const char *name )
- : AddresseeEditorBase( tqparent, name ),
+SimpleAddresseeEditor::SimpleAddresseeEditor( TQWidget *parent, const char *name )
+ : AddresseeEditorBase( parent, name ),
mDirty( false ),
mBlockModified( false )
{
diff --git a/kaddressbook/simpleaddresseeeditor.h b/kaddressbook/simpleaddresseeeditor.h
index 2ea10a822..fbc5d60d7 100644
--- a/kaddressbook/simpleaddresseeeditor.h
+++ b/kaddressbook/simpleaddresseeeditor.h
@@ -34,7 +34,7 @@ class SimpleAddresseeEditor : public AddresseeEditorBase
Q_OBJECT
TQ_OBJECT
public:
- SimpleAddresseeEditor( TQWidget *tqparent, const char *name = 0 );
+ SimpleAddresseeEditor( TQWidget *parent, const char *name = 0 );
~SimpleAddresseeEditor();
void setAddressee( const KABC::Addressee& );
diff --git a/kaddressbook/soundwidget.cpp b/kaddressbook/soundwidget.cpp
index bb0956363..e50e129ba 100644
--- a/kaddressbook/soundwidget.cpp
+++ b/kaddressbook/soundwidget.cpp
@@ -39,8 +39,8 @@
#include "soundwidget.h"
-SoundWidget::SoundWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
- : KAB::ContactEditorWidget( ab, tqparent, name ), mReadOnly( false )
+SoundWidget::SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+ : KAB::ContactEditorWidget( ab, parent, name ), mReadOnly( false )
{
TQGridLayout *topLayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
KDialog::spacingHint() );
diff --git a/kaddressbook/soundwidget.h b/kaddressbook/soundwidget.h
index 66fb74779..c589ec5bb 100644
--- a/kaddressbook/soundwidget.h
+++ b/kaddressbook/soundwidget.h
@@ -39,7 +39,7 @@ class SoundWidget : public KAB::ContactEditorWidget
TQ_OBJECT
public:
- SoundWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
+ SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
~SoundWidget();
void loadContact( KABC::Addressee *addr );
@@ -65,9 +65,9 @@ class SoundWidget : public KAB::ContactEditorWidget
class SoundWidgetFactory : public KAB::ContactEditorWidgetFactory
{
public:
- KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
+ KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
{
- return new SoundWidget( ab, tqparent, name );
+ return new SoundWidget( ab, parent, name );
}
TQString pageIdentifier() const { return "misc"; }
diff --git a/kaddressbook/typecombo.h b/kaddressbook/typecombo.h
index 29266fa82..2ff6591c7 100644
--- a/kaddressbook/typecombo.h
+++ b/kaddressbook/typecombo.h
@@ -37,7 +37,7 @@ class TypeCombo : public KComboBox
typedef typename T::List List;
typedef typename T::List::Iterator Iterator;
- TypeCombo( List &list, TQWidget *tqparent, const char *name = 0 );
+ TypeCombo( List &list, TQWidget *parent, const char *name = 0 );
void setLineEdit( TQLineEdit *edit ) { mLineEdit = edit; }
TQLineEdit *lineEdit() const { return mLineEdit; }
@@ -62,9 +62,9 @@ class TypeCombo : public KComboBox
};
template
-TypeCombo::TypeCombo( TypeCombo::List &list, TQWidget *tqparent,
+TypeCombo::TypeCombo( TypeCombo::List &list, TQWidget *parent,
const char *name )
- : KComboBox( tqparent, name ),
+ : KComboBox( parent, name ),
mTypeList( list )
{
}
diff --git a/kaddressbook/viewconfigurefieldspage.cpp b/kaddressbook/viewconfigurefieldspage.cpp
index 7951bc770..9ab4b26e2 100644
--- a/kaddressbook/viewconfigurefieldspage.cpp
+++ b/kaddressbook/viewconfigurefieldspage.cpp
@@ -39,11 +39,11 @@
class FieldItem : public TQListBoxText
{
public:
- FieldItem( TQListBox *tqparent, KABC::Field *field )
- : TQListBoxText( tqparent, field->label() ), mField( field ) {}
+ FieldItem( TQListBox *parent, KABC::Field *field )
+ : TQListBoxText( parent, field->label() ), mField( field ) {}
- FieldItem( TQListBox *tqparent, KABC::Field *field, int index )
- : TQListBoxText( tqparent, field->label(), tqparent->item( index ) ),
+ FieldItem( TQListBox *parent, KABC::Field *field, int index )
+ : TQListBoxText( parent, field->label(), parent->item( index ) ),
mField( field ) {}
KABC::Field *field() { return mField; }
@@ -54,9 +54,9 @@ class FieldItem : public TQListBoxText
ViewConfigureFieldsPage::ViewConfigureFieldsPage( KABC::AddressBook *ab,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name )
- : TQWidget( tqparent, name ), mAddressBook( ab )
+ : TQWidget( parent, name ), mAddressBook( ab )
{
initGUI();
}
diff --git a/kaddressbook/viewconfigurefieldspage.h b/kaddressbook/viewconfigurefieldspage.h
index 991a7e1c7..3eac607e2 100644
--- a/kaddressbook/viewconfigurefieldspage.h
+++ b/kaddressbook/viewconfigurefieldspage.h
@@ -41,7 +41,7 @@ class ViewConfigureFieldsPage : public TQWidget
TQ_OBJECT
public:
- ViewConfigureFieldsPage( KABC::AddressBook *ab, TQWidget *tqparent = 0,
+ ViewConfigureFieldsPage( KABC::AddressBook *ab, TQWidget *parent = 0,
const char *name = 0 );
void restoreSettings( KConfig* );
diff --git a/kaddressbook/viewconfigurefilterpage.cpp b/kaddressbook/viewconfigurefilterpage.cpp
index fe9cf4418..83c358f3e 100644
--- a/kaddressbook/viewconfigurefilterpage.cpp
+++ b/kaddressbook/viewconfigurefilterpage.cpp
@@ -34,9 +34,9 @@
#include "viewconfigurefilterpage.h"
#include "filter.h"
-ViewConfigureFilterPage::ViewConfigureFilterPage( TQWidget *tqparent,
+ViewConfigureFilterPage::ViewConfigureFilterPage( TQWidget *parent,
const char *name )
- : TQWidget( tqparent, name )
+ : TQWidget( parent, name )
{
TQBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
diff --git a/kaddressbook/viewconfigurefilterpage.h b/kaddressbook/viewconfigurefilterpage.h
index 4459a1cea..104db3ed4 100644
--- a/kaddressbook/viewconfigurefilterpage.h
+++ b/kaddressbook/viewconfigurefilterpage.h
@@ -37,7 +37,7 @@ class ViewConfigureFilterPage : public TQWidget
TQ_OBJECT
public:
- ViewConfigureFilterPage( TQWidget *tqparent, const char *name = 0 );
+ ViewConfigureFilterPage( TQWidget *parent, const char *name = 0 );
~ViewConfigureFilterPage();
void restoreSettings( KConfig* );
diff --git a/kaddressbook/viewconfigurewidget.cpp b/kaddressbook/viewconfigurewidget.cpp
index 1045988c2..efefbd818 100644
--- a/kaddressbook/viewconfigurewidget.cpp
+++ b/kaddressbook/viewconfigurewidget.cpp
@@ -37,9 +37,9 @@
#include "viewconfigurewidget.h"
-ViewConfigureWidget::ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *tqparent,
+ViewConfigureWidget::ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *parent,
const char *name )
- : KAB::ConfigureWidget( ab, tqparent, name )
+ : KAB::ConfigureWidget( ab, parent, name )
{
TQVBoxLayout *topLayout = new TQVBoxLayout( this );
@@ -85,9 +85,9 @@ TQVBox *ViewConfigureWidget::addPage( const TQString &item, const TQString &head
}
ViewConfigureDialog::ViewConfigureDialog( ViewConfigureWidget *wdg, const TQString &viewName,
- TQWidget *tqparent, const char *name )
+ TQWidget *parent, const char *name )
: KDialogBase( Swallow, i18n( "Modify View: " ) + viewName, Help | Ok | Cancel,
- Ok, tqparent, name, true, true ), mConfigWidget( wdg )
+ Ok, parent, name, true, true ), mConfigWidget( wdg )
{
setMainWidget( mConfigWidget );
diff --git a/kaddressbook/viewconfigurewidget.h b/kaddressbook/viewconfigurewidget.h
index 7abcf22f4..63ed11167 100644
--- a/kaddressbook/viewconfigurewidget.h
+++ b/kaddressbook/viewconfigurewidget.h
@@ -51,7 +51,7 @@ class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget
TQ_OBJECT
public:
- ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
+ ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
virtual ~ViewConfigureWidget();
/**
@@ -92,7 +92,7 @@ class ViewConfigureDialog : public KDialogBase
public:
ViewConfigureDialog( ViewConfigureWidget *wdg, const TQString &viewName,
- TQWidget *tqparent, const char *name = 0 );
+ TQWidget *parent, const char *name = 0 );
~ViewConfigureDialog();
void restoreSettings( KConfig* );
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 646fbbae9..c21e4b2cf 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -49,8 +49,8 @@
#include "viewmanager.h"
-ViewManager::ViewManager( KAB::Core *core, TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name ), mCore( core ), mActiveView( 0 ),
+ViewManager::ViewManager( KAB::Core *core, TQWidget *parent, const char *name )
+ : TQWidget( parent, name ), mCore( core ), mActiveView( 0 ),
mFilterSelectionWidget( 0 )
{
initGUI();
diff --git a/kaddressbook/viewmanager.h b/kaddressbook/viewmanager.h
index 15fd68fdd..d0a133408 100644
--- a/kaddressbook/viewmanager.h
+++ b/kaddressbook/viewmanager.h
@@ -53,7 +53,7 @@ class ViewManager : public TQWidget
TQ_OBJECT
public:
- ViewManager( KAB::Core *core, TQWidget *tqparent, const char *name = 0 );
+ ViewManager( KAB::Core *core, TQWidget *parent, const char *name = 0 );
~ViewManager();
void restoreSettings();
diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index b790b0c3f..df956398e 100644
--- a/kaddressbook/views/cardview.cpp
+++ b/kaddressbook/views/cardview.cpp
@@ -42,8 +42,8 @@
class CardViewTip : public TQLabel
{
public:
- CardViewTip( TQWidget *tqparent = 0, const char *name = 0 )
- : TQLabel( tqparent, name )
+ CardViewTip( TQWidget *parent = 0, const char *name = 0 )
+ : TQLabel( parent, name )
{
setPalette( TQToolTip::palette() );
setFrameStyle( Panel | Plain );
@@ -192,8 +192,8 @@ class CardViewItemPrivate
};
-CardViewItem::CardViewItem( CardView *tqparent, const TQString &caption )
- : d( new CardViewItemPrivate() ), mView( tqparent )
+CardViewItem::CardViewItem( CardView *parent, const TQString &caption )
+ : d( new CardViewItemPrivate() ), mView( parent )
{
d->mCaption = caption;
@@ -569,8 +569,8 @@ CardViewItem::Field *CardViewItem::fieldAt( const TQPoint & itempos ) const
}
-CardView::CardView( TQWidget *tqparent, const char *name )
- : TQScrollView( tqparent, name ),
+CardView::CardView( TQWidget *parent, const char *name )
+ : TQScrollView( parent, name ),
d( new CardViewPrivate() )
{
d->mItemList.setAutoDelete( true );
diff --git a/kaddressbook/views/cardview.h b/kaddressbook/views/cardview.h
index e2229dd2d..e3c29e5a4 100644
--- a/kaddressbook/views/cardview.h
+++ b/kaddressbook/views/cardview.h
@@ -60,12 +60,12 @@ class CardViewItem
/**
Constructor.
- @param tqparent The CardView that this card should be displayed on.
+ @param parent The CardView that this card should be displayed on.
@param caption The caption of the card. This is the text that will
appear at the top of the card. This is also the string that will
be used to sort the cards in the view.
*/
- CardViewItem( CardView *tqparent, const TQString &caption = TQString() );
+ CardViewItem( CardView *parent, const TQString &caption = TQString() );
virtual ~CardViewItem();
/**
@@ -129,7 +129,7 @@ class CardViewItem
bool isSelected() const;
/**
- Called by the tqparent card view when the mouse has been resting for
+ Called by the parent card view when the mouse has been resting for
a certain amount of time. If the label or value at pos is obscured
(trimmed) make the label display the full text.
*/
@@ -202,12 +202,12 @@ class CardView : public TQScrollView
/**
Constructor.
*/
- CardView( TQWidget *tqparent, const char *name );
+ CardView( TQWidget *parent, const char *name );
virtual ~CardView();
/**
Inserts the item into the card view. This method does not have
- to be called if you created the item with a proper tqparent. Once
+ to be called if you created the item with a proper parent. Once
inserted, the CardView takes ownership of the item.
*/
void insertItem( CardViewItem *item );
diff --git a/kaddressbook/views/colorlistbox.cpp b/kaddressbook/views/colorlistbox.cpp
index df190d3c6..a003246f4 100644
--- a/kaddressbook/views/colorlistbox.cpp
+++ b/kaddressbook/views/colorlistbox.cpp
@@ -25,8 +25,8 @@
#include "colorlistbox.h"
-ColorListBox::ColorListBox( TQWidget *tqparent, const char *name, WFlags f )
- :KListBox( tqparent, name, f ), mCurrentOnDragEnter(-1)
+ColorListBox::ColorListBox( TQWidget *parent, const char *name, WFlags f )
+ :KListBox( parent, name, f ), mCurrentOnDragEnter(-1)
{
connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) );
setAcceptDrops( true);
diff --git a/kaddressbook/views/colorlistbox.h b/kaddressbook/views/colorlistbox.h
index 566ec8b0a..acccd0b00 100644
--- a/kaddressbook/views/colorlistbox.h
+++ b/kaddressbook/views/colorlistbox.h
@@ -29,7 +29,7 @@ class ColorListBox : public KListBox
TQ_OBJECT
public:
- ColorListBox( TQWidget *tqparent=0, const char * name=0, WFlags f=0 );
+ ColorListBox( TQWidget *parent=0, const char * name=0, WFlags f=0 );
void setColor( uint index, const TQColor &color );
TQColor color( uint index ) const;
diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp
index 846be3898..8cacbfec6 100644
--- a/kaddressbook/views/configurecardviewdialog.cpp
+++ b/kaddressbook/views/configurecardviewdialog.cpp
@@ -47,9 +47,9 @@
/////////////////////////////////
// ConfigureCardViewDialog
-ConfigureCardViewWidget::ConfigureCardViewWidget( KABC::AddressBook *ab, TQWidget *tqparent,
+ConfigureCardViewWidget::ConfigureCardViewWidget( KABC::AddressBook *ab, TQWidget *parent,
const char *name )
- : ViewConfigureWidget( ab, tqparent, name )
+ : ViewConfigureWidget( ab, parent, name )
{
TQWidget *page = addPage( i18n( "Look & Feel" ), TQString(),
DesktopIcon( "looknfeel" ) );
@@ -76,8 +76,8 @@ void ConfigureCardViewWidget::saveSettings( KConfig *config )
////////////////////////
// CardViewLookNFeelPage
-CardViewLookNFeelPage::CardViewLookNFeelPage( TQWidget *tqparent, const char *name )
- : TQVBox( tqparent, name )
+CardViewLookNFeelPage::CardViewLookNFeelPage( TQWidget *parent, const char *name )
+ : TQVBox( parent, name )
{
initGUI();
}
diff --git a/kaddressbook/views/configurecardviewdialog.h b/kaddressbook/views/configurecardviewdialog.h
index 52ec9cbbe..40ddfe4fa 100644
--- a/kaddressbook/views/configurecardviewdialog.h
+++ b/kaddressbook/views/configurecardviewdialog.h
@@ -48,7 +48,7 @@ class CardViewLookAndFeelPage;
class ConfigureCardViewWidget : public ViewConfigureWidget
{
public:
- ConfigureCardViewWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name );
+ ConfigureCardViewWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name );
virtual ~ConfigureCardViewWidget();
virtual void restoreSettings( KConfig* );
@@ -83,7 +83,7 @@ class CardViewLookNFeelPage : public TQVBox {
TQ_OBJECT
public:
- CardViewLookNFeelPage( TQWidget *tqparent=0, const char *name=0 );
+ CardViewLookNFeelPage( TQWidget *parent=0, const char *name=0 );
~CardViewLookNFeelPage();
void restoreSettings( KConfig* );
diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp
index 179a819a9..b5fb9ded2 100644
--- a/kaddressbook/views/configuretableviewdialog.cpp
+++ b/kaddressbook/views/configuretableviewdialog.cpp
@@ -41,9 +41,9 @@
#include "configuretableviewdialog.h"
ConfigureTableViewWidget::ConfigureTableViewWidget( KABC::AddressBook *ab,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name )
- : ViewConfigureWidget( ab, tqparent, name )
+ : ViewConfigureWidget( ab, parent, name )
{
TQWidget *page = addPage( i18n( "Look & Feel" ), TQString(),
KGlobal::iconLoader()->loadIcon( "looknfeel",
@@ -72,8 +72,8 @@ void ConfigureTableViewWidget::saveSettings( KConfig *config )
-LookAndFeelPage::LookAndFeelPage(TQWidget *tqparent, const char *name)
- : TQWidget(tqparent, name)
+LookAndFeelPage::LookAndFeelPage(TQWidget *parent, const char *name)
+ : TQWidget(parent, name)
{
initGUI();
diff --git a/kaddressbook/views/configuretableviewdialog.h b/kaddressbook/views/configuretableviewdialog.h
index a0228cba6..3533ae0d3 100644
--- a/kaddressbook/views/configuretableviewdialog.h
+++ b/kaddressbook/views/configuretableviewdialog.h
@@ -45,7 +45,7 @@ class LookAndFeelPage;
class ConfigureTableViewWidget : public ViewConfigureWidget
{
public:
- ConfigureTableViewWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name );
+ ConfigureTableViewWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name );
virtual ~ConfigureTableViewWidget();
virtual void restoreSettings( KConfig* );
@@ -66,7 +66,7 @@ class LookAndFeelPage : public TQWidget
TQ_OBJECT
public:
- LookAndFeelPage( TQWidget *tqparent, const char *name = 0 );
+ LookAndFeelPage( TQWidget *parent, const char *name = 0 );
~LookAndFeelPage() {}
void restoreSettings( KConfig* );
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index eab88e2e3..47a1e86e1 100644
--- a/kaddressbook/views/contactlistview.cpp
+++ b/kaddressbook/views/contactlistview.cpp
@@ -47,8 +47,8 @@
/////////////////////////////////
// DynamicTip Methods
-DynamicTip::DynamicTip( ContactListView *tqparent)
- : TQToolTip( tqparent )
+DynamicTip::DynamicTip( ContactListView *parent)
+ : TQToolTip( parent )
{
}
@@ -147,12 +147,12 @@ void DynamicTip::maybeTip( const TQPoint &pos )
// ContactListViewItem Methods
ContactListViewItem::ContactListViewItem(const KABC::Addressee &a,
- ContactListView *tqparent,
+ ContactListView *parent,
KABC::AddressBook *doc,
const KABC::Field::List &fields,
KIMProxy *proxy )
- : KListViewItem(tqparent), mAddressee(a), mFields( fields ),
- parentListView( tqparent ), mDocument(doc), mIMProxy( proxy )
+ : KListViewItem(parent), mAddressee(a), mFields( fields ),
+ parentListView( parent ), mDocument(doc), mIMProxy( proxy )
{
if ( mIMProxy )
mHasIM = mIMProxy->isPresent( mAddressee.uid() );
@@ -208,7 +208,7 @@ void ContactListViewItem::paintCell(TQPainter * p,
}
-ContactListView *ContactListViewItem::tqparent()
+ContactListView *ContactListViewItem::parent()
{
return parentListView;
}
@@ -258,9 +258,9 @@ void ContactListViewItem::setHasIM( bool hasIM )
ContactListView::ContactListView(KAddressBookTableView *view,
KABC::AddressBook* /* doc */,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name )
- : KListView( tqparent, name ),
+ : KListView( parent, name ),
pabWidget( view ),
oldColumn( 0 )
{
diff --git a/kaddressbook/views/contactlistview.h b/kaddressbook/views/contactlistview.h
index 5492b9161..96966d5ca 100644
--- a/kaddressbook/views/contactlistview.h
+++ b/kaddressbook/views/contactlistview.h
@@ -44,7 +44,7 @@ class KIMProxy;
class DynamicTip : public TQToolTip
{
public:
- DynamicTip( ContactListView * tqparent );
+ DynamicTip( ContactListView * parent );
protected:
void maybeTip( const TQPoint & );
@@ -56,11 +56,11 @@ class ContactListViewItem : public KListViewItem
{
public:
- ContactListViewItem(const KABC::Addressee &a, ContactListView* tqparent,
+ ContactListViewItem(const KABC::Addressee &a, ContactListView* parent,
KABC::AddressBook *doc, const KABC::Field::List &fields, KIMProxy *proxy );
const KABC::Addressee &addressee() const { return mAddressee; }
virtual void refresh();
- virtual ContactListView* tqparent();
+ virtual ContactListView* parent();
virtual TQString key ( int, bool ) const;
void setHasIM( bool hasIM );
/** Adds the border around the cell if the user wants it.
@@ -90,7 +90,7 @@ class ContactListView : public KListView
public:
ContactListView(KAddressBookTableView *view,
KABC::AddressBook *doc,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name = 0L );
virtual ~ContactListView() {}
//void resort();
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index 1c7f2806d..211b62dd4 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -43,19 +43,19 @@
class CardViewFactory : public ViewFactory
{
public:
- KAddressBookView *view( KAB::Core *core, TQWidget *tqparent, const char *name )
+ KAddressBookView *view( KAB::Core *core, TQWidget *parent, const char *name )
{
- return new KAddressBookCardView( core, tqparent, name );
+ return new KAddressBookCardView( core, parent, name );
}
TQString type() const { return I18N_NOOP("Card"); }
TQString description() const { return i18n( "Rolodex style cards represent contacts." ); }
- ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, TQWidget *tqparent,
+ ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, TQWidget *parent,
const char *name = 0 )
{
- return new ConfigureCardViewWidget( ab, tqparent, name );
+ return new ConfigureCardViewWidget( ab, parent, name );
}
};
@@ -72,8 +72,8 @@ class AddresseeCardViewItem : public CardViewItem
AddresseeCardViewItem( const KABC::Field::List &fields,
bool showEmptyFields,
KABC::AddressBook *doc, const KABC::Addressee &addr,
- CardView *tqparent )
- : CardViewItem( tqparent, addr.realName() ),
+ CardView *parent )
+ : CardViewItem( parent, addr.realName() ),
mFields( fields ), mShowEmptyFields( showEmptyFields ),
mDocument( doc ), mAddressee( addr )
{
@@ -116,8 +116,8 @@ class AddresseeCardViewItem : public CardViewItem
};
-AddresseeCardView::AddresseeCardView( TQWidget *tqparent, const char *name )
- : CardView( tqparent, name )
+AddresseeCardView::AddresseeCardView( TQWidget *parent, const char *name )
+ : CardView( parent, name )
{
setAcceptDrops( true );
}
@@ -144,8 +144,8 @@ void AddresseeCardView::startDrag()
KAddressBookCardView::KAddressBookCardView( KAB::Core *core,
- TQWidget *tqparent, const char *name )
- : KAddressBookView( core, tqparent, name )
+ TQWidget *parent, const char *name )
+ : KAddressBookView( core, parent, name )
{
mShowEmptyFields = false;
diff --git a/kaddressbook/views/kaddressbookcardview.h b/kaddressbook/views/kaddressbookcardview.h
index 9ccc8a40e..128b146a9 100644
--- a/kaddressbook/views/kaddressbookcardview.h
+++ b/kaddressbook/views/kaddressbookcardview.h
@@ -46,7 +46,7 @@ class KAddressBookCardView : public KAddressBookView
TQ_OBJECT
public:
- KAddressBookCardView( KAB::Core *core, TQWidget *tqparent,
+ KAddressBookCardView( KAB::Core *core, TQWidget *parent,
const char *name = 0 );
virtual ~KAddressBookCardView();
@@ -80,7 +80,7 @@ class AddresseeCardView : public CardView
Q_OBJECT
TQ_OBJECT
public:
- AddresseeCardView( TQWidget *tqparent, const char *name = 0 );
+ AddresseeCardView( TQWidget *parent, const char *name = 0 );
~AddresseeCardView();
signals:
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index 16fe5cad0..b99bca85c 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -42,9 +42,9 @@
class IconViewFactory : public ViewFactory
{
public:
- KAddressBookView *view( KAB::Core *core, TQWidget *tqparent, const char *name )
+ KAddressBookView *view( KAB::Core *core, TQWidget *parent, const char *name )
{
- return new KAddressBookIconView( core, tqparent, name );
+ return new KAddressBookIconView( core, parent, name );
}
TQString type() const { return I18N_NOOP( "Icon" ); }
@@ -59,8 +59,8 @@ extern "C" {
}
}
-AddresseeIconView::AddresseeIconView( TQWidget *tqparent, const char *name )
- : KIconView( tqparent, name )
+AddresseeIconView::AddresseeIconView( TQWidget *parent, const char *name )
+ : KIconView( parent, name )
{
setSelectionMode( TQIconView::Extended );
setResizeMode( TQIconView::Adjust );
@@ -96,8 +96,8 @@ class AddresseeIconViewItem : public KIconViewItem
{
public:
AddresseeIconViewItem( const KABC::Field::List&, KABC::AddressBook *doc,
- const KABC::Addressee &addr, TQIconView *tqparent )
- : KIconViewItem( tqparent ), mDocument( doc ), mAddressee( addr )
+ const KABC::Addressee &addr, TQIconView *parent )
+ : KIconViewItem( parent ), mDocument( doc ), mAddressee( addr )
{
refresh();
}
@@ -136,8 +136,8 @@ class AddresseeIconViewItem : public KIconViewItem
KAddressBookIconView::KAddressBookIconView( KAB::Core *core,
- TQWidget *tqparent, const char *name)
- : KAddressBookView( core, tqparent, name )
+ TQWidget *parent, const char *name)
+ : KAddressBookView( core, parent, name )
{
TQVBoxLayout *tqlayout = new TQVBoxLayout( viewWidget() );
diff --git a/kaddressbook/views/kaddressbookiconview.h b/kaddressbook/views/kaddressbookiconview.h
index 5b9c8c7cc..614920c28 100644
--- a/kaddressbook/views/kaddressbookiconview.h
+++ b/kaddressbook/views/kaddressbookiconview.h
@@ -45,7 +45,7 @@ class KAddressBookIconView : public KAddressBookView
TQ_OBJECT
public:
- KAddressBookIconView( KAB::Core *core, TQWidget *tqparent,
+ KAddressBookIconView( KAB::Core *core, TQWidget *parent,
const char *name = 0 );
virtual ~KAddressBookIconView();
@@ -79,7 +79,7 @@ class AddresseeIconView : public KIconView
TQ_OBJECT
public:
- AddresseeIconView( TQWidget *tqparent, const char *name = 0 );
+ AddresseeIconView( TQWidget *parent, const char *name = 0 );
~AddresseeIconView();
signals:
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 65bcd36cf..19364d597 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -61,9 +61,9 @@
class TableViewFactory : public ViewFactory
{
public:
- KAddressBookView *view( KAB::Core *core, TQWidget *tqparent, const char *name )
+ KAddressBookView *view( KAB::Core *core, TQWidget *parent, const char *name )
{
- return new KAddressBookTableView( core, tqparent, name );
+ return new KAddressBookTableView( core, parent, name );
}
TQString type() const { return I18N_NOOP( "Table" ); }
@@ -71,10 +71,10 @@ class TableViewFactory : public ViewFactory
TQString description() const { return i18n( "A listing of contacts in a table. Each cell of "
"the table holds a field of the contact." ); }
- ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, TQWidget *tqparent,
+ ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, TQWidget *parent,
const char *name = 0 )
{
- return new ConfigureTableViewWidget( ab, tqparent, name );
+ return new ConfigureTableViewWidget( ab, parent, name );
}
};
@@ -86,8 +86,8 @@ extern "C" {
}
KAddressBookTableView::KAddressBookTableView( KAB::Core *core,
- TQWidget *tqparent, const char *name )
- : KAddressBookView( core, tqparent, name )
+ TQWidget *parent, const char *name )
+ : KAddressBookView( core, parent, name )
{
mMainLayout = new TQVBoxLayout( viewWidget(), 2 );
diff --git a/kaddressbook/views/kaddressbooktableview.h b/kaddressbook/views/kaddressbooktableview.h
index f212829f3..5c9a75105 100644
--- a/kaddressbook/views/kaddressbooktableview.h
+++ b/kaddressbook/views/kaddressbooktableview.h
@@ -65,7 +65,7 @@ friend class ContactListView;
TQ_OBJECT
public:
- KAddressBookTableView( KAB::Core *core, TQWidget *tqparent,
+ KAddressBookTableView( KAB::Core *core, TQWidget *parent,
const char *name = 0 );
virtual ~KAddressBookTableView();
diff --git a/kaddressbook/xxport/bookmark_xxport.cpp b/kaddressbook/xxport/bookmark_xxport.cpp
index 0b7c3dc7c..83cdd2b70 100644
--- a/kaddressbook/xxport/bookmark_xxport.cpp
+++ b/kaddressbook/xxport/bookmark_xxport.cpp
@@ -33,8 +33,8 @@
K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_bookmark_xxport, BookmarkXXPort )
-BookmarkXXPort::BookmarkXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
- : KAB::XXPort( ab, tqparent, name )
+BookmarkXXPort::BookmarkXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+ : KAB::XXPort( ab, parent, name )
{
createExportAction( i18n( "Export Bookmarks Menu..." ) );
}
diff --git a/kaddressbook/xxport/bookmark_xxport.h b/kaddressbook/xxport/bookmark_xxport.h
index 09d95f910..85fd602b4 100644
--- a/kaddressbook/xxport/bookmark_xxport.h
+++ b/kaddressbook/xxport/bookmark_xxport.h
@@ -33,7 +33,7 @@ class BookmarkXXPort : public KAB::XXPort
TQ_OBJECT
public:
- BookmarkXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
+ BookmarkXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
TQString identifier() const { return "bookmark"; }
diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp
index aa2d76539..22f6afadb 100644
--- a/kaddressbook/xxport/csv_xxport.cpp
+++ b/kaddressbook/xxport/csv_xxport.cpp
@@ -36,8 +36,8 @@
K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_csv_xxport, CSVXXPort )
-CSVXXPort::CSVXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
- : KAB::XXPort( ab, tqparent, name )
+CSVXXPort::CSVXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+ : KAB::XXPort( ab, parent, name )
{
createImportAction( i18n( "Import CSV List..." ) );
createExportAction( i18n( "Export CSV List..." ) );
diff --git a/kaddressbook/xxport/csv_xxport.h b/kaddressbook/xxport/csv_xxport.h
index a55f326b5..f08fa93d6 100644
--- a/kaddressbook/xxport/csv_xxport.h
+++ b/kaddressbook/xxport/csv_xxport.h
@@ -32,7 +32,7 @@ class CSVXXPort : public KAB::XXPort
TQ_OBJECT
public:
- CSVXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
+ CSVXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
TQString identifier() const { return "csv"; }
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index 9e2b8d6f6..88a2c087a 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -50,10 +50,10 @@
enum { Local = 0, Guess = 1, Latin1 = 2, Uni = 3, MSBug = 4, Codec = 5 };
-CSVImportDialog::CSVImportDialog( KABC::AddressBook *ab, TQWidget *tqparent,
+CSVImportDialog::CSVImportDialog( KABC::AddressBook *ab, TQWidget *parent,
const char * name )
: KDialogBase( Plain, i18n ( "CSV Import Dialog" ), Ok | Cancel | User1 |
- User2, Ok, tqparent, name, true, true ),
+ User2, Ok, parent, name, true, true ),
mAdjustRows( false ),
mStartLine( 0 ),
mTextQuote( '"' ),
diff --git a/kaddressbook/xxport/csvimportdialog.h b/kaddressbook/xxport/csvimportdialog.h
index f3c953ba5..95fd8a486 100644
--- a/kaddressbook/xxport/csvimportdialog.h
+++ b/kaddressbook/xxport/csvimportdialog.h
@@ -44,7 +44,7 @@ class CSVImportDialog : public KDialogBase
TQ_OBJECT
public:
- CSVImportDialog( KABC::AddressBook *ab, TQWidget *tqparent,
+ CSVImportDialog( KABC::AddressBook *ab, TQWidget *parent,
const char *name = 0 );
~CSVImportDialog();
diff --git a/kaddressbook/xxport/eudora_xxport.cpp b/kaddressbook/xxport/eudora_xxport.cpp
index bed374339..402665ab1 100644
--- a/kaddressbook/xxport/eudora_xxport.cpp
+++ b/kaddressbook/xxport/eudora_xxport.cpp
@@ -38,8 +38,8 @@
K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_eudora_xxport, EudoraXXPort )
-EudoraXXPort::EudoraXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
- : KAB::XXPort( ab, tqparent, name )
+EudoraXXPort::EudoraXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+ : KAB::XXPort( ab, parent, name )
{
createImportAction( i18n( "Import Eudora Addressbook..." ) );
}
diff --git a/kaddressbook/xxport/eudora_xxport.h b/kaddressbook/xxport/eudora_xxport.h
index de2b47845..59937fcb1 100644
--- a/kaddressbook/xxport/eudora_xxport.h
+++ b/kaddressbook/xxport/eudora_xxport.h
@@ -32,7 +32,7 @@ class EudoraXXPort : public KAB::XXPort
TQ_OBJECT
public:
- EudoraXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
+ EudoraXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
TQString identifier() const { return "eudora"; }
diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp
index 2d18cef7c..abd3234b7 100644
--- a/kaddressbook/xxport/gnokii_xxport.cpp
+++ b/kaddressbook/xxport/gnokii_xxport.cpp
@@ -77,8 +77,8 @@ static KProgressDialog *m_progressDlg;
K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_gnokii_xxport, GNOKIIXXPort )
-GNOKIIXXPort::GNOKIIXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
- : KAB::XXPort( ab, tqparent, name )
+GNOKIIXXPort::GNOKIIXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+ : KAB::XXPort( ab, parent, name )
{
this_filter = this;
m_progressDlg = NULL;
@@ -823,7 +823,7 @@ static TQString businit(void)
return i18n("Gnokii is not yet configured.");
// uncomment to debug all gnokii communication on stderr.
- // gn_log_debug_tqmask = GN_LOG_T_STDERR;
+ // gn_log_debug_mask = GN_LOG_T_STDERR;
gn_data_clear(&data);
diff --git a/kaddressbook/xxport/gnokii_xxport.h b/kaddressbook/xxport/gnokii_xxport.h
index a78ca2335..6b5361c8b 100644
--- a/kaddressbook/xxport/gnokii_xxport.h
+++ b/kaddressbook/xxport/gnokii_xxport.h
@@ -32,7 +32,7 @@ class GNOKIIXXPort : public KAB::XXPort
TQ_OBJECT
public:
- GNOKIIXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
+ GNOKIIXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
TQString identifier() const { return "gnokii"; }
diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp
index 08fe4a108..3b60ca5e1 100644
--- a/kaddressbook/xxport/kde2_xxport.cpp
+++ b/kaddressbook/xxport/kde2_xxport.cpp
@@ -39,8 +39,8 @@
K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_kde2_xxport, KDE2XXPort )
-KDE2XXPort::KDE2XXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
- : KAB::XXPort( ab, tqparent, name )
+KDE2XXPort::KDE2XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+ : KAB::XXPort( ab, parent, name )
{
createImportAction( i18n( "Import KDE 2 Addressbook..." ) );
}
diff --git a/kaddressbook/xxport/kde2_xxport.h b/kaddressbook/xxport/kde2_xxport.h
index 895a09a43..dc0675248 100644
--- a/kaddressbook/xxport/kde2_xxport.h
+++ b/kaddressbook/xxport/kde2_xxport.h
@@ -32,7 +32,7 @@ class KDE2XXPort : public KAB::XXPort
TQ_OBJECT
public:
- KDE2XXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
+ KDE2XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
TQString identifier() const { return "kde2"; }
diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp
index 8ff5cf44d..a51169e7d 100644
--- a/kaddressbook/xxport/ldif_xxport.cpp
+++ b/kaddressbook/xxport/ldif_xxport.cpp
@@ -50,8 +50,8 @@
K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_ldif_xxport, LDIFXXPort )
-LDIFXXPort::LDIFXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
- : KAB::XXPort( ab, tqparent, name )
+LDIFXXPort::LDIFXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+ : KAB::XXPort( ab, parent, name )
{
createImportAction( i18n( "Import LDIF Addressbook..." ) );
createExportAction( i18n( "Export LDIF Addressbook..." ) );
diff --git a/kaddressbook/xxport/ldif_xxport.h b/kaddressbook/xxport/ldif_xxport.h
index 2d1e9e04e..167f44305 100644
--- a/kaddressbook/xxport/ldif_xxport.h
+++ b/kaddressbook/xxport/ldif_xxport.h
@@ -33,7 +33,7 @@ class LDIFXXPort : public KAB::XXPort
TQ_OBJECT
public:
- LDIFXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
+ LDIFXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
TQString identifier() const { return "ldif"; }
diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp
index 593960e83..4c2949cc9 100644
--- a/kaddressbook/xxport/opera_xxport.cpp
+++ b/kaddressbook/xxport/opera_xxport.cpp
@@ -38,8 +38,8 @@
K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_opera_xxport, OperaXXPort )
-OperaXXPort::OperaXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
- : KAB::XXPort( ab, tqparent, name )
+OperaXXPort::OperaXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+ : KAB::XXPort( ab, parent, name )
{
createImportAction( i18n( "Import Opera Addressbook..." ) );
}
diff --git a/kaddressbook/xxport/opera_xxport.h b/kaddressbook/xxport/opera_xxport.h
index b33c91521..2395f5a26 100644
--- a/kaddressbook/xxport/opera_xxport.h
+++ b/kaddressbook/xxport/opera_xxport.h
@@ -33,7 +33,7 @@ class OperaXXPort : public KAB::XXPort
TQ_OBJECT
public:
- OperaXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
+ OperaXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
TQString identifier() const { return "opera"; }
diff --git a/kaddressbook/xxport/pab_mapihd.cpp b/kaddressbook/xxport/pab_mapihd.cpp
index b1ab4e5f4..6d61cb339 100644
--- a/kaddressbook/xxport/pab_mapihd.cpp
+++ b/kaddressbook/xxport/pab_mapihd.cpp
@@ -151,7 +151,7 @@ pabrec_entry e=pr_unknown;
return e;
}
-pabfields_t::pabfields_t(pabrec & R, TQWidget * /*tqparent*/)
+pabfields_t::pabfields_t(pabrec & R, TQWidget * /*parent*/)
{
// Skip the first two words, because they're always the
// same 000c 0014 ==> 0014 gives us the types, so we
diff --git a/kaddressbook/xxport/pab_mapihd.h b/kaddressbook/xxport/pab_mapihd.h
index 7db97873a..c54be4500 100644
--- a/kaddressbook/xxport/pab_mapihd.h
+++ b/kaddressbook/xxport/pab_mapihd.h
@@ -105,7 +105,7 @@
word_t literal(int k);
content_t order(int k);
public:
- pabfields_t(pabrec & R, TQWidget *tqparent);
+ pabfields_t(pabrec & R, TQWidget *parent);
public:
KABC::Addressee get( );
bool isOK(void) { return OK; }
diff --git a/kaddressbook/xxport/pab_pablib.h b/kaddressbook/xxport/pab_pablib.h
index 13f2b7200..c26cbdf23 100644
--- a/kaddressbook/xxport/pab_pablib.h
+++ b/kaddressbook/xxport/pab_pablib.h
@@ -36,7 +36,7 @@ class pab
TQFile in;
const char *pabfile;
TQString cap;
- TQWidget *tqparent;
+ TQWidget *parent;
public:
pab(const char *pabFile);
~pab();
diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp
index 8075a7da2..021f671c8 100644
--- a/kaddressbook/xxport/pab_xxport.cpp
+++ b/kaddressbook/xxport/pab_xxport.cpp
@@ -40,8 +40,8 @@
K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_pab_xxport, PABXXPort )
-PABXXPort::PABXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
- : KAB::XXPort( ab, tqparent, name )
+PABXXPort::PABXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+ : KAB::XXPort( ab, parent, name )
{
createImportAction( i18n("Import MS Exchange Personal Address Book (.PAB)") );
}
diff --git a/kaddressbook/xxport/pab_xxport.h b/kaddressbook/xxport/pab_xxport.h
index 70eef1a3f..c0450df65 100644
--- a/kaddressbook/xxport/pab_xxport.h
+++ b/kaddressbook/xxport/pab_xxport.h
@@ -33,7 +33,7 @@ class PABXXPort : public KAB::XXPort
TQ_OBJECT
public:
- PABXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
+ PABXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
TQString identifier() const { return "pab"; }
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index 9dedae791..2d4da849b 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -56,7 +56,7 @@ class VCardViewerDialog : public KDialogBase
{
public:
VCardViewerDialog( const KABC::Addressee::List &list,
- TQWidget *tqparent, const char *name = 0 );
+ TQWidget *parent, const char *name = 0 );
KABC::Addressee::List contacts() const;
@@ -78,7 +78,7 @@ class VCardViewerDialog : public KDialogBase
class VCardExportSelectionDialog : public KDialogBase
{
public:
- VCardExportSelectionDialog( TQWidget *tqparent, const char *name = 0 );
+ VCardExportSelectionDialog( TQWidget *parent, const char *name = 0 );
~VCardExportSelectionDialog();
bool exportPrivateFields() const;
@@ -93,8 +93,8 @@ class VCardExportSelectionDialog : public KDialogBase
TQCheckBox *mEncryptionKeys;
};
-VCardXXPort::VCardXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name )
- : KAB::XXPort( ab, tqparent, name )
+VCardXXPort::VCardXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+ : KAB::XXPort( ab, parent, name )
{
createImportAction( i18n( "Import vCard..." ) );
createExportAction( i18n( "Export vCard 2.1..." ), "v21" );
@@ -465,9 +465,9 @@ void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Types type )
// ---------- VCardViewer Dialog ---------------- //
VCardViewerDialog::VCardViewerDialog( const KABC::Addressee::List &list,
- TQWidget *tqparent, const char *name )
+ TQWidget *parent, const char *name )
: KDialogBase( Plain, i18n( "Import vCard" ), Yes | No | Apply | Cancel, Yes,
- tqparent, name, true, true, KStdGuiItem::no(), KStdGuiItem::yes() ),
+ parent, name, true, true, KStdGuiItem::no(), KStdGuiItem::yes() ),
mContacts( list )
{
TQFrame *page = plainPage();
@@ -537,10 +537,10 @@ void VCardViewerDialog::slotCancel()
// ---------- VCardExportSelection Dialog ---------------- //
-VCardExportSelectionDialog::VCardExportSelectionDialog( TQWidget *tqparent,
+VCardExportSelectionDialog::VCardExportSelectionDialog( TQWidget *parent,
const char *name )
: KDialogBase( Plain, i18n( "Select vCard Fields" ), Ok | Cancel, Ok,
- tqparent, name, true, true )
+ parent, name, true, true )
{
TQFrame *page = plainPage();
diff --git a/kaddressbook/xxport/vcard_xxport.h b/kaddressbook/xxport/vcard_xxport.h
index e051d53ff..44374432c 100644
--- a/kaddressbook/xxport/vcard_xxport.h
+++ b/kaddressbook/xxport/vcard_xxport.h
@@ -33,7 +33,7 @@ class VCardXXPort : public KAB::XXPort
TQ_OBJECT
public:
- VCardXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
+ VCardXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
TQString identifier() const { return "vcard"; }
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index 8eabc81c0..642f8bfe3 100644
--- a/kaddressbook/xxportmanager.cpp
+++ b/kaddressbook/xxportmanager.cpp
@@ -41,8 +41,8 @@
KURL XXPortManager::importURL = KURL();
TQString XXPortManager::importData = TQString();
-XXPortManager::XXPortManager( KAB::Core *core, TQObject *tqparent, const char *name )
- : TQObject( tqparent, name ), mCore( core )
+XXPortManager::XXPortManager( KAB::Core *core, TQObject *parent, const char *name )
+ : TQObject( parent, name ), mCore( core )
{
loadPlugins();
}
diff --git a/kaddressbook/xxportmanager.h b/kaddressbook/xxportmanager.h
index fb179d6eb..116326617 100644
--- a/kaddressbook/xxportmanager.h
+++ b/kaddressbook/xxportmanager.h
@@ -43,7 +43,7 @@ class KDE_EXPORT XXPortManager : public TQObject
TQ_OBJECT
public:
- XXPortManager( KAB::Core *core, TQObject *tqparent, const char *name = 0 );
+ XXPortManager( KAB::Core *core, TQObject *parent, const char *name = 0 );
~XXPortManager();
void restoreSettings();
diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp
index c90de6ca3..b932f9d97 100644
--- a/kaddressbook/xxportselectdialog.cpp
+++ b/kaddressbook/xxportselectdialog.cpp
@@ -44,9 +44,9 @@
#include "xxportselectdialog.h"
XXPortSelectDialog::XXPortSelectDialog( KAB::Core *core, bool sort,
- TQWidget* tqparent, const char* name )
+ TQWidget* parent, const char* name )
: KDialogBase( Plain, i18n( "Choose Which Contacts to Export" ), Help | Ok | Cancel,
- Ok, tqparent, name, true, true ), mCore( core ),
+ Ok, parent, name, true, true ), mCore( core ),
mUseSorting( sort )
{
initGUI();
diff --git a/kaddressbook/xxportselectdialog.h b/kaddressbook/xxportselectdialog.h
index 10c311b12..3e535926f 100644
--- a/kaddressbook/xxportselectdialog.h
+++ b/kaddressbook/xxportselectdialog.h
@@ -48,7 +48,7 @@ class XXPortSelectDialog : public KDialogBase
TQ_OBJECT
public:
- XXPortSelectDialog( KAB::Core *core, bool sort, TQWidget* tqparent,
+ XXPortSelectDialog( KAB::Core *core, bool sort, TQWidget* parent,
const char* name = 0 );
KABC::AddresseeList contacts();
diff --git a/kalarm/Changelog b/kalarm/Changelog
index 90b5b05bb..2671941a5 100644
--- a/kalarm/Changelog
+++ b/kalarm/Changelog
@@ -640,7 +640,7 @@ KAlarm Change Log
- Add dialog option to set an alarm's time as an interval from the current time.
- Add defer option to alarm message window.
- Provide button in alarm message window to activate KAlarm.
-- Make dialogs modal only for their tqparent window.
+- Make dialogs modal only for their parent window.
=== Version 0.2 --- 20 October 2001 ===
- Implement repeating alarms.
diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp
index 7bdd767a6..85bc17392 100644
--- a/kalarm/alarmcalendar.cpp
+++ b/kalarm/alarmcalendar.cpp
@@ -439,14 +439,14 @@ void AlarmCalendar::close()
/******************************************************************************
* Import alarms from an external calendar and merge them into KAlarm's calendar.
* The alarms are given new unique event IDs.
-* Parameters: tqparent = tqparent widget for error message boxes
+* Parameters: parent = parent widget for error message boxes
* Reply = true if all alarms in the calendar were successfully imported
* = false if any alarms failed to be imported.
*/
-bool AlarmCalendar::importAlarms(TQWidget* tqparent)
+bool AlarmCalendar::importAlarms(TQWidget* parent)
{
KURL url = KFileDialog::getOpenURL(TQString::tqfromLatin1(":importalarms"),
- TQString::tqfromLatin1("*.vcs *.ics|%1").tqarg(i18n("Calendar Files")), tqparent);
+ TQString::tqfromLatin1("*.vcs *.ics|%1").tqarg(i18n("Calendar Files")), parent);
if (url.isEmpty())
{
kdError(5950) << "AlarmCalendar::importAlarms(): Empty URL" << endl;
@@ -468,7 +468,7 @@ bool AlarmCalendar::importAlarms(TQWidget* tqparent)
if (!KStandardDirs::exists(filename))
{
kdDebug(5950) << "AlarmCalendar::importAlarms(): File '" << url.prettyURL() << "' not found" << endl;
- KMessageBox::error(tqparent, i18n("Could not load calendar '%1'.").tqarg(url.prettyURL()));
+ KMessageBox::error(parent, i18n("Could not load calendar '%1'.").tqarg(url.prettyURL()));
return false;
}
}
@@ -477,7 +477,7 @@ bool AlarmCalendar::importAlarms(TQWidget* tqparent)
if (!KIO::NetAccess::download(url, filename, MainWindow::mainMainWindow()))
{
kdError(5950) << "AlarmCalendar::importAlarms(): Download failure" << endl;
- KMessageBox::error(tqparent, i18n("Cannot download calendar:\n%1").tqarg(url.prettyURL()));
+ KMessageBox::error(parent, i18n("Cannot download calendar:\n%1").tqarg(url.prettyURL()));
return false;
}
kdDebug(5950) << "--- Downloaded to " << filename << endl;
@@ -490,7 +490,7 @@ bool AlarmCalendar::importAlarms(TQWidget* tqparent)
if (!success)
{
kdDebug(5950) << "AlarmCalendar::importAlarms(): error loading calendar '" << filename << "'" << endl;
- KMessageBox::error(tqparent, i18n("Could not load calendar '%1'.").tqarg(url.prettyURL()));
+ KMessageBox::error(parent, i18n("Could not load calendar '%1'.").tqarg(url.prettyURL()));
}
else
{
diff --git a/kalarm/alarmevent.h b/kalarm/alarmevent.h
index 75ff7cbef..b5bc41e2e 100644
--- a/kalarm/alarmevent.h
+++ b/kalarm/alarmevent.h
@@ -153,7 +153,7 @@ class KAAlarm : public KAAlarmEventBase
{
INVALID_ALARM = 0, // not an alarm
MAIN_ALARM = 1, // THE real alarm. Must be the first in the enumeration.
- // The following values may be used in combination as a bitqmask 0x0E
+ // The following values may be used in combination as a bimask 0x0E
REMINDER_ALARM = 0x02, // reminder in advance of main alarm
DEFERRED_ALARM = 0x04, // deferred alarm
DEFERRED_REMINDER_ALARM = REMINDER_ALARM | DEFERRED_ALARM, // deferred early warning
@@ -170,7 +170,7 @@ class KAAlarm : public KAAlarmEventBase
{
INVALID__ALARM = INVALID_ALARM,
MAIN__ALARM = MAIN_ALARM,
- // The following values may be used in combination as a bitqmask 0x0E
+ // The following values may be used in combination as a bimask 0x0E
REMINDER__ALARM = REMINDER_ALARM,
TIMED_DEFERRAL_FLAG = 0x08, // deferral has a time; if clear, it is date-only
DEFERRED_DATE__ALARM = DEFERRED_ALARM, // deferred alarm - date-only
@@ -263,7 +263,7 @@ class KAEvent : public KAAlarmEventBase
DATE_DEFERRAL = DEFERRAL,
TIME_DEFERRAL = DEFERRAL | TIMED_FLAG,
DISPLAYING_ = 0x80000,
- READ_ONLY_FLAGS = 0xF0000 // tqmask for all read-only internal values
+ READ_ONLY_FLAGS = 0xF0000 // mask for all read-only internal values
};
/** The category of an event, indicated by the middle part of its UID. */
enum tqStatus
@@ -288,7 +288,7 @@ class KAEvent : public KAAlarmEventBase
RECURRENCE_DATE = 0x02, // a recurrence with only a date, not a time
RECURRENCE_DATE_TIME = 0x03, // a recurrence with a date and time
LAST_RECURRENCE = 0x04, // the last recurrence
- OCCURRENCE_REPEAT = 0x10, // (bitqmask for a repetition of an occurrence)
+ OCCURRENCE_REPEAT = 0x10, // (bimask for a repetition of an occurrence)
FIRST_OR_ONLY_OCCURRENCE_REPEAT = OCCURRENCE_REPEAT | FIRST_OR_ONLY_OCCURRENCE, // a repetition of the first occurrence
RECURRENCE_DATE_REPEAT = OCCURRENCE_REPEAT | RECURRENCE_DATE, // a repetition of a date-only recurrence
RECURRENCE_DATE_TIME_REPEAT = OCCURRENCE_REPEAT | RECURRENCE_DATE_TIME, // a repetition of a date/time recurrence
diff --git a/kalarm/alarmlistview.cpp b/kalarm/alarmlistview.cpp
index 546752ea2..355cc4e3e 100644
--- a/kalarm/alarmlistview.cpp
+++ b/kalarm/alarmlistview.cpp
@@ -44,7 +44,7 @@
class AlarmListTooltip : public TQToolTip
{
public:
- AlarmListTooltip(TQWidget* tqparent) : TQToolTip(tqparent) { }
+ AlarmListTooltip(TQWidget* parent) : TQToolTip(parent) { }
virtual ~AlarmListTooltip() {}
protected:
virtual void maybeTip(const TQPoint&);
@@ -59,8 +59,8 @@ TQValueList AlarmListView::mInstanceList;
bool AlarmListView::mDragging = false;
-AlarmListView::AlarmListView(const TQValueList& order, TQWidget* tqparent, const char* name)
- : EventListViewBase(tqparent, name),
+AlarmListView::AlarmListView(const TQValueList& order, TQWidget* parent, const char* name)
+ : EventListViewBase(parent, name),
mMousePressed(false),
mDrawMessageInColour(false),
mShowExpired(false)
@@ -414,20 +414,20 @@ void AlarmListView::contentsMouseReleaseEvent(TQMouseEvent *e)
int AlarmListViewItem::mTimeHourPos = -2;
int AlarmListViewItem::mDigitWidth = -1;
-AlarmListViewItem::AlarmListViewItem(AlarmListView* tqparent, const KAEvent& event, const TQDateTime& now)
- : EventListViewItemBase(tqparent, event),
+AlarmListViewItem::AlarmListViewItem(AlarmListView* parent, const KAEvent& event, const TQDateTime& now)
+ : EventListViewItemBase(parent, event),
mMessageTruncated(false),
mTimeToAlarmShown(false)
{
setLastColumnText(); // set the message column text
DateTime dateTime = event.expired() ? event.startDateTime() : event.displayDateTime();
- if (tqparent->column(AlarmListView::TIME_COLUMN) >= 0)
- setText(tqparent->column(AlarmListView::TIME_COLUMN), alarmTimeText(dateTime));
- if (tqparent->column(AlarmListView::TIME_TO_COLUMN) >= 0)
+ if (parent->column(AlarmListView::TIME_COLUMN) >= 0)
+ setText(parent->column(AlarmListView::TIME_COLUMN), alarmTimeText(dateTime));
+ if (parent->column(AlarmListView::TIME_TO_COLUMN) >= 0)
{
TQString tta = timeToAlarmText(now);
- setText(tqparent->column(AlarmListView::TIME_TO_COLUMN), tta);
+ setText(parent->column(AlarmListView::TIME_TO_COLUMN), tta);
mTimeToAlarmShown = !tta.isNull();
}
TQTime t = dateTime.time();
@@ -468,7 +468,7 @@ AlarmListViewItem::AlarmListViewItem(AlarmListView* tqparent, const KAEvent& eve
break;
}
}
- setText(tqparent->column(AlarmListView::REPEAT_COLUMN), repeatText);
+ setText(parent->column(AlarmListView::REPEAT_COLUMN), repeatText);
mRepeatOrder.sprintf("%c%08d", '0' + repeatOrder, repeatInterval);
bool showColour = (event.action() == KAEvent::MESSAGE || event.action() == KAEvent::FILE);
diff --git a/kalarm/alarmlistview.h b/kalarm/alarmlistview.h
index 56b5c5895..f88ea4a85 100644
--- a/kalarm/alarmlistview.h
+++ b/kalarm/alarmlistview.h
@@ -31,7 +31,7 @@ class AlarmListTooltip;
class AlarmListViewItem : public EventListViewItemBase
{
public:
- AlarmListViewItem(AlarmListView* tqparent, const KAEvent&, const TQDateTime& now);
+ AlarmListViewItem(AlarmListView* parent, const KAEvent&, const TQDateTime& now);
TQTime showTimeToAlarm(bool show);
void updateTimeToAlarm(const TQDateTime& now, bool forceDisplay = false);
virtual void paintCell(TQPainter*, const TQColorGroup&, int column, int width, int align);
@@ -71,7 +71,7 @@ class AlarmListView : public EventListViewBase
COLUMN_COUNT
};
- AlarmListView(const TQValueList& order, TQWidget* tqparent = 0, const char* name = 0);
+ AlarmListView(const TQValueList& order, TQWidget* parent = 0, const char* name = 0);
~AlarmListView();
void showExpired(bool show) { mShowExpired = show; }
bool showingExpired() const { return mShowExpired; }
diff --git a/kalarm/alarmtimewidget.cpp b/kalarm/alarmtimewidget.cpp
index 4443ae2fc..2b907d9a1 100644
--- a/kalarm/alarmtimewidget.cpp
+++ b/kalarm/alarmtimewidget.cpp
@@ -55,8 +55,8 @@ TQString AlarmTimeWidget::i18n_TimeAfterPeriod()
/******************************************************************************
* Construct a widget with a group box and title.
*/
-AlarmTimeWidget::AlarmTimeWidget(const TQString& groupBoxTitle, int mode, TQWidget* tqparent, const char* name)
- : ButtonGroup(groupBoxTitle, tqparent, name),
+AlarmTimeWidget::AlarmTimeWidget(const TQString& groupBoxTitle, int mode, TQWidget* parent, const char* name)
+ : ButtonGroup(groupBoxTitle, parent, name),
mMinDateTimeIsNow(false),
mPastMax(false),
mMinMaxTimeSet(false)
@@ -67,8 +67,8 @@ AlarmTimeWidget::AlarmTimeWidget(const TQString& groupBoxTitle, int mode, TQWidg
/******************************************************************************
* Construct a widget without a group box or title.
*/
-AlarmTimeWidget::AlarmTimeWidget(int mode, TQWidget* tqparent, const char* name)
- : ButtonGroup(tqparent, name),
+AlarmTimeWidget::AlarmTimeWidget(int mode, TQWidget* parent, const char* name)
+ : ButtonGroup(parent, name),
mMinDateTimeIsNow(false),
mPastMax(false),
mMinMaxTimeSet(false)
diff --git a/kalarm/alarmtimewidget.h b/kalarm/alarmtimewidget.h
index 0b8d6d4f1..a4f438578 100644
--- a/kalarm/alarmtimewidget.h
+++ b/kalarm/alarmtimewidget.h
@@ -41,8 +41,8 @@ class AlarmTimeWidget : public ButtonGroup
DEFER_TIME = 0x01, // "Defer to ..."
NARROW = 0x02 // make a narrow widget
};
- AlarmTimeWidget(const TQString& groupBoxTitle, int mode, TQWidget* tqparent = 0, const char* name = 0);
- AlarmTimeWidget(int mode, TQWidget* tqparent = 0, const char* name = 0);
+ AlarmTimeWidget(const TQString& groupBoxTitle, int mode, TQWidget* parent = 0, const char* name = 0);
+ AlarmTimeWidget(int mode, TQWidget* parent = 0, const char* name = 0);
DateTime getDateTime(int* minsFromNow = 0, bool checkExpired = true, bool showErrorMessage = true, TQWidget** errorWidget = 0) const;
void setDateTime(const DateTime&);
void setMinDateTimeIsCurrent();
diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp
index 71ab86922..97e7bc6f7 100644
--- a/kalarm/birthdaydlg.cpp
+++ b/kalarm/birthdaydlg.cpp
@@ -58,7 +58,7 @@ class AddresseeItem : public TQListViewItem
{
public:
enum columns { NAME = 0, BIRTHDAY = 1 };
- AddresseeItem(TQListView* tqparent, const TQString& name, const TQDate& birthday);
+ AddresseeItem(TQListView* parent, const TQString& name, const TQDate& birthday);
TQDate birthday() const { return mBirthday; }
virtual TQString key(int column, bool ascending) const;
private:
@@ -70,8 +70,8 @@ class AddresseeItem : public TQListViewItem
const KABC::AddressBook* BirthdayDlg::mAddressBook = 0;
-BirthdayDlg::BirthdayDlg(TQWidget* tqparent)
- : KDialogBase(KDialogBase::Plain, i18n("Import Birthdays From KAddressBook"), Ok|Cancel, Ok, tqparent, "BirthdayDlg"),
+BirthdayDlg::BirthdayDlg(TQWidget* parent)
+ : KDialogBase(KDialogBase::Plain, i18n("Import Birthdays From KAddressBook"), Ok|Cancel, Ok, parent, "BirthdayDlg"),
mSpecialActionsButton(0)
{
TQWidget* topWidget = plainPage();
@@ -396,8 +396,8 @@ void BirthdayDlg::slotTextLostFocus()
= Class: AddresseeItem
=============================================================================*/
-AddresseeItem::AddresseeItem(TQListView* tqparent, const TQString& name, const TQDate& birthday)
- : TQListViewItem(tqparent),
+AddresseeItem::AddresseeItem(TQListView* parent, const TQString& name, const TQDate& birthday)
+ : TQListViewItem(parent),
mBirthday(birthday)
{
setText(NAME, name);
@@ -417,8 +417,8 @@ TQString AddresseeItem::key(int column, bool) const
= Class: BListView
=============================================================================*/
-BListView::BListView(TQWidget* tqparent, const char* name)
- : KListView(tqparent, name)
+BListView::BListView(TQWidget* parent, const char* name)
+ : KListView(parent, name)
{
KAccel* accel = new KAccel(this);
accel->insert(KStdAccel::SelectAll, TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()));
diff --git a/kalarm/birthdaydlg.h b/kalarm/birthdaydlg.h
index 776b5f1bd..1abd4c8a3 100644
--- a/kalarm/birthdaydlg.h
+++ b/kalarm/birthdaydlg.h
@@ -45,7 +45,7 @@ class BirthdayDlg : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- BirthdayDlg(TQWidget* tqparent = 0);
+ BirthdayDlg(TQWidget* parent = 0);
TQValueList events() const;
static void close();
@@ -82,10 +82,10 @@ class BLineEdit : public TQLineEdit
Q_OBJECT
TQ_OBJECT
public:
- BLineEdit(TQWidget* tqparent = 0, const char* name = 0)
- : TQLineEdit(tqparent, name) {}
- BLineEdit(const TQString& text, TQWidget* tqparent = 0, const char* name = 0)
- : TQLineEdit(text, tqparent, name) {}
+ BLineEdit(TQWidget* parent = 0, const char* name = 0)
+ : TQLineEdit(parent, name) {}
+ BLineEdit(const TQString& text, TQWidget* parent = 0, const char* name = 0)
+ : TQLineEdit(text, parent, name) {}
signals:
void focusLost();
protected:
@@ -97,7 +97,7 @@ class BListView : public KListView
Q_OBJECT
TQ_OBJECT
public:
- BListView(TQWidget* tqparent = 0, const char* name = 0);
+ BListView(TQWidget* parent = 0, const char* name = 0);
public slots:
virtual void slotSelectAll() { selectAll(true); }
virtual void slotDeselect() { selectAll(false); }
diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp
index f7e340f85..70acfa0e5 100644
--- a/kalarm/daemon.cpp
+++ b/kalarm/daemon.cpp
@@ -723,8 +723,8 @@ void NotificationHandler::registered(bool reregister, int result, int version)
= Class: AlarmEnableAction
=============================================================================*/
-AlarmEnableAction::AlarmEnableAction(int accel, TQObject* tqparent, const char* name)
- : KToggleAction(i18n("Enable &Alarms"), accel, tqparent, name),
+AlarmEnableAction::AlarmEnableAction(int accel, TQObject* parent, const char* name)
+ : KToggleAction(i18n("Enable &Alarms"), accel, parent, name),
mInitialised(false)
{
setCheckedState(i18n("Disable &Alarms"));
diff --git a/kalarm/daemon.h b/kalarm/daemon.h
index fff7c7554..df3fdd4d2 100644
--- a/kalarm/daemon.h
+++ b/kalarm/daemon.h
@@ -122,7 +122,7 @@ class AlarmEnableAction : public KToggleAction
Q_OBJECT
TQ_OBJECT
public:
- AlarmEnableAction(int accel, TQObject* tqparent, const char* name = 0);
+ AlarmEnableAction(int accel, TQObject* parent, const char* name = 0);
public slots:
void setCheckedActual(bool); // set state and emit switched() signal
virtual void setChecked(bool); // request state change and emit userClicked() signal
diff --git a/kalarm/deferdlg.cpp b/kalarm/deferdlg.cpp
index 4709f6a8f..8c7edd3ce 100644
--- a/kalarm/deferdlg.cpp
+++ b/kalarm/deferdlg.cpp
@@ -40,8 +40,8 @@
DeferAlarmDlg::DeferAlarmDlg(const TQString& caption, const DateTime& initialDT,
- bool cancelButton, TQWidget* tqparent, const char* name)
- : KDialogBase(tqparent, name, true, caption, Ok|Cancel|User1, Ok, false, i18n("Cancel &Deferral"))
+ bool cancelButton, TQWidget* parent, const char* name)
+ : KDialogBase(parent, name, true, caption, Ok|Cancel|User1, Ok, false, i18n("Cancel &Deferral"))
{
if (!cancelButton)
showButton(User1, false);
diff --git a/kalarm/deferdlg.h b/kalarm/deferdlg.h
index 4ab2c9cb5..f7a09f47f 100644
--- a/kalarm/deferdlg.h
+++ b/kalarm/deferdlg.h
@@ -33,7 +33,7 @@ class DeferAlarmDlg : public KDialogBase
TQ_OBJECT
public:
DeferAlarmDlg(const TQString& caption, const DateTime& initialDT,
- bool cancelButton, TQWidget* tqparent = 0, const char* name = 0);
+ bool cancelButton, TQWidget* parent = 0, const char* name = 0);
void setLimit(const DateTime&);
DateTime setLimit(const TQString& eventID);
const DateTime& getDateTime() const { return mAlarmDateTime; }
diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp
index 93b6bc5af..2d722dd99 100644
--- a/kalarm/editdlg.cpp
+++ b/kalarm/editdlg.cpp
@@ -97,8 +97,8 @@ static const int maxDelayTime = 99*60 + 59; // < 100 hours
class PickAlarmFileRadio : public PickFileRadio
{
public:
- PickAlarmFileRadio(const TQString& text, TQButtonGroup* tqparent, const char* name = 0)
- : PickFileRadio(text, tqparent, name) { }
+ PickAlarmFileRadio(const TQString& text, TQButtonGroup* parent, const char* name = 0)
+ : PickFileRadio(text, parent, name) { }
virtual TQString pickFile() // called when browse button is pressed to select a file to display
{
return KAlarm::browseFile(i18n("Choose Text or Image File to Display"), mDefaultDir, fileEdit()->text(),
@@ -114,8 +114,8 @@ class PickAlarmFileRadio : public PickFileRadio
class PickLogFileRadio : public PickFileRadio
{
public:
- PickLogFileRadio(TQPushButton* b, LineEdit* e, const TQString& text, TQButtonGroup* tqparent, const char* name = 0)
- : PickFileRadio(b, e, text, tqparent, name) { }
+ PickLogFileRadio(TQPushButton* b, LineEdit* e, const TQString& text, TQButtonGroup* parent, const char* name = 0)
+ : PickFileRadio(b, e, text, parent, name) { }
virtual TQString pickFile() // called when browse button is pressed to select a log file
{
return KAlarm::browseFile(i18n("Choose Log File"), mDefaultDir, fileEdit()->text(), TQString(),
@@ -165,9 +165,9 @@ TQString EditAlarmDlg::i18n_j_EmailSubject() { return i18n("Email subject",
* = false to edit/create an alarm.
* event != to initialise the dialogue to show the specified event's data.
*/
-EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* tqparent, const char* name,
+EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* parent, const char* name,
const KAEvent* event, bool readOnly)
- : KDialogBase(tqparent, (name ? name : Template ? "TemplEditDlg" : "EditDlg"), true, caption,
+ : KDialogBase(parent, (name ? name : Template ? "TemplEditDlg" : "EditDlg"), true, caption,
(readOnly ? Cancel|Try : Template ? Ok|Cancel|Try : Ok|Cancel|Try|Default),
(readOnly ? Cancel : Ok)),
mMainPageShown(false),
@@ -414,9 +414,9 @@ EditAlarmDlg::~EditAlarmDlg()
/******************************************************************************
* Set up the dialog controls common to display alarms.
*/
-void EditAlarmDlg::initDisplayAlarms(TQWidget* tqparent)
+void EditAlarmDlg::initDisplayAlarms(TQWidget* parent)
{
- mDisplayAlarmsFrame = new TQFrame(tqparent);
+ mDisplayAlarmsFrame = new TQFrame(parent);
mDisplayAlarmsFrame->setFrameStyle(TQFrame::NoFrame);
TQBoxLayout* frameLayout = new TQVBoxLayout(mDisplayAlarmsFrame, 0, spacingHint());
@@ -481,9 +481,9 @@ void EditAlarmDlg::initDisplayAlarms(TQWidget* tqparent)
/******************************************************************************
* Set up the command alarm dialog controls.
*/
-void EditAlarmDlg::initCommand(TQWidget* tqparent)
+void EditAlarmDlg::initCommand(TQWidget* parent)
{
- mCommandFrame = new TQFrame(tqparent);
+ mCommandFrame = new TQFrame(parent);
mCommandFrame->setFrameStyle(TQFrame::NoFrame);
TQBoxLayout* frameLayout = new TQVBoxLayout(mCommandFrame, 0, spacingHint());
@@ -556,9 +556,9 @@ void EditAlarmDlg::initCommand(TQWidget* tqparent)
/******************************************************************************
* Set up the email alarm dialog controls.
*/
-void EditAlarmDlg::initEmail(TQWidget* tqparent)
+void EditAlarmDlg::initEmail(TQWidget* parent)
{
- mEmailFrame = new TQFrame(tqparent);
+ mEmailFrame = new TQFrame(parent);
mEmailFrame->setFrameStyle(TQFrame::NoFrame);
TQBoxLayout* tqlayout = new TQVBoxLayout(mEmailFrame, 0, spacingHint());
TQGridLayout* grid = new TQGridLayout(tqlayout, 3, 3, spacingHint());
@@ -972,9 +972,9 @@ void EditAlarmDlg::setAction(KAEvent::Action action, const AlarmText& alarmText)
/******************************************************************************
* Create an "acknowledgement confirmation required" checkbox.
*/
-CheckBox* EditAlarmDlg::createConfirmAckCheckbox(TQWidget* tqparent, const char* name)
+CheckBox* EditAlarmDlg::createConfirmAckCheckbox(TQWidget* parent, const char* name)
{
- CheckBox* widget = new CheckBox(i18n_k_ConfirmAck(), tqparent, name);
+ CheckBox* widget = new CheckBox(i18n_k_ConfirmAck(), parent, name);
TQWhatsThis::add(widget,
i18n("Check to be prompted for confirmation when you acknowledge the alarm."));
return widget;
@@ -2027,8 +2027,8 @@ bool EditAlarmDlg::checkText(TQString& result, bool showErrorMessage) const
= A text edit field with a minimum height of 3 text lines.
= Provides KDE 2 compatibility.
=============================================================================*/
-TextEdit::TextEdit(TQWidget* tqparent, const char* name)
- : KTextEdit(tqparent, name)
+TextEdit::TextEdit(TQWidget* parent, const char* name)
+ : KTextEdit(parent, name)
{
TQSize tsize = tqsizeHint();
tsize.setHeight(fontMetrics().lineSpacing()*13/4 + 2*frameWidth());
diff --git a/kalarm/editdlg.h b/kalarm/editdlg.h
index 272deaa3a..626ea5d67 100644
--- a/kalarm/editdlg.h
+++ b/kalarm/editdlg.h
@@ -63,13 +63,13 @@ class EditAlarmDlg : public KDialogBase
enum MessageType { MESSAGE, FILE };
enum CmdLogType { DISCARD_OUTPUT, LOG_TO_FILE, EXEC_IN_TERMINAL };
- EditAlarmDlg(bool Template, const TQString& caption, TQWidget* tqparent = 0, const char* name = 0,
+ EditAlarmDlg(bool Template, const TQString& caption, TQWidget* parent = 0, const char* name = 0,
const KAEvent* = 0, bool readOnly = false);
virtual ~EditAlarmDlg();
bool getEvent(KAEvent&);
void setAction(KAEvent::Action, const AlarmText& = AlarmText());
- static CheckBox* createConfirmAckCheckbox(TQWidget* tqparent, const char* name = 0);
+ static CheckBox* createConfirmAckCheckbox(TQWidget* parent, const char* name = 0);
static TQString i18n_ConfirmAck(); // plain text of 'Confirm acknowledgement' checkbox
static TQString i18n_k_ConfirmAck(); // text of 'Confirm acknowledgement' checkbox, with 'k' shortcut
@@ -126,9 +126,9 @@ class EditAlarmDlg : public KDialogBase
bool checkCommandData();
bool checkEmailData();
- void initDisplayAlarms(TQWidget* tqparent);
- void initCommand(TQWidget* tqparent);
- void initEmail(TQWidget* tqparent);
+ void initDisplayAlarms(TQWidget* parent);
+ void initCommand(TQWidget* parent);
+ void initEmail(TQWidget* parent);
void saveState(const KAEvent*);
bool stateChanged() const;
diff --git a/kalarm/editdlgprivate.h b/kalarm/editdlgprivate.h
index 6dffba7eb..ec2bc73d1 100644
--- a/kalarm/editdlgprivate.h
+++ b/kalarm/editdlgprivate.h
@@ -29,7 +29,7 @@ class PageFrame : public TQFrame
Q_OBJECT
TQ_OBJECT
public:
- PageFrame(TQWidget* tqparent = 0, const char* name = 0) : TQFrame(tqparent, name) { }
+ PageFrame(TQWidget* parent = 0, const char* name = 0) : TQFrame(parent, name) { }
protected:
virtual void showEvent(TQShowEvent*) { emit shown(); }
signals:
@@ -41,7 +41,7 @@ class TextEdit : public KTextEdit
Q_OBJECT
TQ_OBJECT
public:
- TextEdit(TQWidget* tqparent, const char* name = 0);
+ TextEdit(TQWidget* parent, const char* name = 0);
protected:
virtual void dragEnterEvent(TQDragEnterEvent*);
};
diff --git a/kalarm/emailidcombo.cpp b/kalarm/emailidcombo.cpp
index 388fa4573..99f754c89 100644
--- a/kalarm/emailidcombo.cpp
+++ b/kalarm/emailidcombo.cpp
@@ -21,8 +21,8 @@
#include "emailidcombo.moc"
-EmailIdCombo::EmailIdCombo(KPIM::IdentityManager* manager, TQWidget* tqparent, const char* name)
- : KPIM::IdentityCombo(manager, tqparent, name),
+EmailIdCombo::EmailIdCombo(KPIM::IdentityManager* manager, TQWidget* parent, const char* name)
+ : KPIM::IdentityCombo(manager, parent, name),
mReadOnly(false)
{ }
diff --git a/kalarm/emailidcombo.h b/kalarm/emailidcombo.h
index 6e5294d8d..1d2c2785f 100644
--- a/kalarm/emailidcombo.h
+++ b/kalarm/emailidcombo.h
@@ -30,7 +30,7 @@ class EmailIdCombo : public KPIM::IdentityCombo
Q_OBJECT
TQ_OBJECT
public:
- explicit EmailIdCombo(KPIM::IdentityManager*, TQWidget* tqparent = 0, const char* name = 0);
+ explicit EmailIdCombo(KPIM::IdentityManager*, TQWidget* parent = 0, const char* name = 0);
void setReadOnly(bool ro) { mReadOnly = ro; }
protected:
virtual void mousePressEvent(TQMouseEvent*);
diff --git a/kalarm/eventlistviewbase.cpp b/kalarm/eventlistviewbase.cpp
index c463c8ad0..a8f5b4d18 100644
--- a/kalarm/eventlistviewbase.cpp
+++ b/kalarm/eventlistviewbase.cpp
@@ -45,8 +45,8 @@ class EventListWhatsThisBase : public TQWhatsThis
= Base class for displaying a list of events.
=============================================================================*/
-EventListViewBase::EventListViewBase(TQWidget* tqparent, const char* name)
- : KListView(tqparent, name),
+EventListViewBase::EventListViewBase(TQWidget* parent, const char* name)
+ : KListView(parent, name),
mFind(0),
mLastColumn(-1),
mLastColumnHeaderWidth(0)
@@ -392,8 +392,8 @@ TQPixmap* EventListViewItemBase::mEmailIcon;
int EventListViewItemBase::mIconWidth = 0;
-EventListViewItemBase::EventListViewItemBase(EventListViewBase* tqparent, const KAEvent& event)
- : TQListViewItem(tqparent),
+EventListViewItemBase::EventListViewItemBase(EventListViewBase* parent, const KAEvent& event)
+ : TQListViewItem(parent),
mEvent(event)
{
iconWidth(); // load the icons
@@ -404,9 +404,9 @@ EventListViewItemBase::EventListViewItemBase(EventListViewBase* tqparent, const
*/
void EventListViewItemBase::setLastColumnText()
{
- EventListViewBase* tqparent = (EventListViewBase*)listView();
- setText(tqparent->lastColumn(), lastColumnText());
- mLastColumnWidth = width(tqparent->fontMetrics(), tqparent, tqparent->lastColumn());
+ EventListViewBase* parent = (EventListViewBase*)listView();
+ setText(parent->lastColumn(), lastColumnText());
+ mLastColumnWidth = width(parent->fontMetrics(), parent, parent->lastColumn());
}
/******************************************************************************
diff --git a/kalarm/eventlistviewbase.h b/kalarm/eventlistviewbase.h
index 6fe74f4f7..86263a7a9 100644
--- a/kalarm/eventlistviewbase.h
+++ b/kalarm/eventlistviewbase.h
@@ -42,7 +42,7 @@ class EventListViewBase : public KListView
typedef TQValueListIterator InstanceListIterator;
typedef TQValueListConstIterator InstanceListConstIterator;
- EventListViewBase(TQWidget* tqparent = 0, const char* name = 0);
+ EventListViewBase(TQWidget* parent = 0, const char* name = 0);
virtual ~EventListViewBase() { }
EventListViewItemBase* getEntry(const TQString& eventID) const;
void addEvent(const KAEvent& e) { addEvent(e, instances(), this); }
@@ -107,7 +107,7 @@ class EventListViewBase : public KListView
class EventListViewItemBase : public TQListViewItem
{
public:
- EventListViewItemBase(EventListViewBase* tqparent, const KAEvent&);
+ EventListViewItemBase(EventListViewBase* parent, const KAEvent&);
const KAEvent& event() const { return mEvent; }
TQPixmap* eventIcon() const;
int lastColumnWidth() const { return mLastColumnWidth; }
diff --git a/kalarm/find.cpp b/kalarm/find.cpp
index e3732eaa0..ed302f63b 100644
--- a/kalarm/find.cpp
+++ b/kalarm/find.cpp
@@ -49,9 +49,9 @@ enum {
static long FIND_KALARM_OPTIONS = FIND_LIVE | FIND_EXPIRED | FIND_MESSAGE | FIND_FILE | FIND_COMMAND | FIND_EMAIL;
-Find::Find(EventListViewBase* tqparent)
- : TQObject(tqparent),
- mListView(tqparent),
+Find::Find(EventListViewBase* parent)
+ : TQObject(parent),
+ mListView(parent),
mDialog(0),
mFind(0),
mOptions(0)
diff --git a/kalarm/find.h b/kalarm/find.h
index f7170a291..c1eff2ad8 100644
--- a/kalarm/find.h
+++ b/kalarm/find.h
@@ -38,7 +38,7 @@ class Find : public TQObject
Q_OBJECT
TQ_OBJECT
public:
- explicit Find(EventListViewBase* tqparent);
+ explicit Find(EventListViewBase* parent);
~Find();
void display();
void findNext(bool forward) { findNext(forward, true); }
@@ -54,7 +54,7 @@ class Find : public TQObject
void findNext(bool forward, bool sort, bool checkEnd = false, bool fromCurrent = false);
EventListViewItemBase* nextItem(EventListViewItemBase*, bool forward) const;
- EventListViewBase* mListView; // tqparent list view
+ EventListViewBase* mListView; // parent list view
TQGuardedPtr mDialog;
TQCheckBox* mExpired;
TQCheckBox* mLive;
diff --git a/kalarm/fontcolour.cpp b/kalarm/fontcolour.cpp
index 3b45dbc49..94497b969 100644
--- a/kalarm/fontcolour.cpp
+++ b/kalarm/fontcolour.cpp
@@ -38,11 +38,11 @@
#include "fontcolour.moc"
-FontColourChooser::FontColourChooser(TQWidget *tqparent, const char *name,
+FontColourChooser::FontColourChooser(TQWidget *parent, const char *name,
bool onlyFixed, const TQStringList &fontList,
const TQString& frameLabel, bool editColours, bool fg, bool defaultFont,
int visibleListSize)
- : TQWidget(tqparent, name),
+ : TQWidget(parent, name),
mFgColourButton(0),
mRemoveColourButton(0),
mColourList(Preferences::messageColours()),
diff --git a/kalarm/fontcolour.h b/kalarm/fontcolour.h
index b7205602a..c4b3a5517 100644
--- a/kalarm/fontcolour.h
+++ b/kalarm/fontcolour.h
@@ -37,7 +37,7 @@ class FontColourChooser : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- explicit FontColourChooser(TQWidget* tqparent = 0, const char* name = 0,
+ explicit FontColourChooser(TQWidget* parent = 0, const char* name = 0,
bool onlyFixed = false,
const TQStringList& fontList = TQStringList(),
const TQString& frameLabel = i18n("Requested font"),
diff --git a/kalarm/fontcolourbutton.cpp b/kalarm/fontcolourbutton.cpp
index ca62d1011..e5dd90b92 100644
--- a/kalarm/fontcolourbutton.cpp
+++ b/kalarm/fontcolourbutton.cpp
@@ -38,8 +38,8 @@
= Font/colour selection button.
=============================================================================*/
-FontColourButton::FontColourButton(TQWidget* tqparent, const char* name)
- : TQFrame(tqparent, name),
+FontColourButton::FontColourButton(TQWidget* parent, const char* name)
+ : TQFrame(parent, name),
mReadOnly(false)
{
setFrameStyle(NoFrame);
@@ -119,8 +119,8 @@ void FontColourButton::slotButtonPressed()
=============================================================================*/
FontColourDlg::FontColourDlg(const TQColor& bgColour, const TQColor& fgColour, const TQFont& font,
- bool defaultFont, const TQString& caption, TQWidget* tqparent, const char* name)
- : KDialogBase(tqparent, name, true, caption, Ok|Cancel, Ok, false),
+ bool defaultFont, const TQString& caption, TQWidget* parent, const char* name)
+ : KDialogBase(parent, name, true, caption, Ok|Cancel, Ok, false),
mReadOnly(false)
{
TQWidget* page = new TQWidget(this);
diff --git a/kalarm/fontcolourbutton.h b/kalarm/fontcolourbutton.h
index 55713605d..be9fff6fe 100644
--- a/kalarm/fontcolourbutton.h
+++ b/kalarm/fontcolourbutton.h
@@ -36,7 +36,7 @@ class FontColourButton : public TQFrame
Q_OBJECT
TQ_OBJECT
public:
- FontColourButton(TQWidget* tqparent = 0, const char* name = 0);
+ FontColourButton(TQWidget* parent = 0, const char* name = 0);
void setDefaultFont();
void setFont(const TQFont&);
void setBgColour(const TQColor&);
@@ -71,7 +71,7 @@ class FontColourDlg : public KDialogBase
TQ_OBJECT
public:
FontColourDlg(const TQColor& bg, const TQColor& fg, const TQFont&, bool defaultFont,
- const TQString& caption, TQWidget* tqparent = 0, const char* name = 0);
+ const TQString& caption, TQWidget* parent = 0, const char* name = 0);
bool defaultFont() const { return mDefaultFont; }
TQFont font() const { return mFont; }
TQColor bgColour() const { return mBgColour; }
diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
index 2c44e161f..d7a6383f2 100644
--- a/kalarm/functions.cpp
+++ b/kalarm/functions.cpp
@@ -498,7 +498,7 @@ UpdatetqStatus enableEvent(KAEvent& event, AlarmListView* selectionView, bool en
/******************************************************************************
* Display an error message about an error saving an event.
*/
-void displayUpdateError(TQWidget* tqparent, UpdatetqStatus, UpdateError code, int nAlarms)
+void displayUpdateError(TQWidget* parent, UpdatetqStatus, UpdateError code, int nAlarms)
{
TQString errmsg;
switch (code)
@@ -519,13 +519,13 @@ void displayUpdateError(TQWidget* tqparent, UpdatetqStatus, UpdateError code, in
errmsg = i18n("Error saving alarm template");
break;
}
- KMessageBox::error(tqparent, errmsg);
+ KMessageBox::error(parent, errmsg);
}
/******************************************************************************
* Display an error message corresponding to a specified alarm update error code.
*/
-void displayKOrgUpdateError(TQWidget* tqparent, KOrgUpdateError code, int nAlarms)
+void displayKOrgUpdateError(TQWidget* parent, KOrgUpdateError code, int nAlarms)
{
TQString errmsg;
switch (code)
@@ -542,7 +542,7 @@ void displayKOrgUpdateError(TQWidget* tqparent, KOrgUpdateError code, int nAlarm
: i18n("Unable to delete alarm from KOrganizer");
break;
}
- KMessageBox::error(tqparent, errmsg);
+ KMessageBox::error(parent, errmsg);
}
/******************************************************************************
@@ -628,16 +628,16 @@ TQValueList templateList()
* Prompt the user to re-enable alarms if they are currently disabled, and if
* it's an email alarm, warn if no 'From' email address is configured.
*/
-void outputAlarmWarnings(TQWidget* tqparent, const KAEvent* event)
+void outputAlarmWarnings(TQWidget* parent, const KAEvent* event)
{
if (event && event->action() == KAEvent::EMAIL
&& Preferences::emailAddress().isEmpty())
- KMessageBox::information(tqparent, i18n("Please set the 'From' email address...",
+ KMessageBox::information(parent, i18n("Please set the 'From' email address...",
"%1\nPlease set it in the Preferences dialog.").tqarg(KAMail::i18n_NeedFromEmailAddress()));
if (!Daemon::monitoringAlarms())
{
- if (KMessageBox::warningYesNo(tqparent, i18n("Alarms are currently disabled.\nDo you want to enable alarms now?"),
+ if (KMessageBox::warningYesNo(parent, i18n("Alarms are currently disabled.\nDo you want to enable alarms now?"),
TQString(), i18n("Enable"), i18n("Keep Disabled"),
TQString::tqfromLatin1("EditEnableAlarms"))
== KMessageBox::Yes)
@@ -868,12 +868,12 @@ FileType fileType(const TQString& mimetype)
* Reply = URL selected. If none is selected, URL.isEmpty() is true.
*/
TQString browseFile(const TQString& caption, TQString& defaultDir, const TQString& initialFile,
- const TQString& filter, int mode, TQWidget* tqparent, const char* name)
+ const TQString& filter, int mode, TQWidget* parent, const char* name)
{
TQString initialDir = !initialFile.isEmpty() ? TQString(initialFile).remove(TQRegExp("/[^/]*$"))
: !defaultDir.isEmpty() ? defaultDir
: TQDir::homeDirPath();
- KFileDialog fileDlg(initialDir, filter, tqparent, name, true);
+ KFileDialog fileDlg(initialDir, filter, parent, name, true);
fileDlg.setOperationMode(mode & KFile::ExistingOnly ? KFileDialog::Opening : KFileDialog::Saving);
fileDlg.setMode(KFile::File | mode);
fileDlg.setCaption(caption);
diff --git a/kalarm/functions.h b/kalarm/functions.h
index 5a6798640..b8a1a51d3 100644
--- a/kalarm/functions.h
+++ b/kalarm/functions.h
@@ -77,7 +77,7 @@ int getVersionNumber(const TQString& version, TQString* subVersi
inline int currentCalendarVersion() { return KAEvent::calVersion(); }
inline TQString currentCalendarVersionString() { return KAEvent::calVersionString(); }
TQString browseFile(const TQString& caption, TQString& defaultDir, const TQString& initialFile = TQString(),
- const TQString& filter = TQString(), int mode = 0, TQWidget* tqparent = 0, const char* name = 0);
+ const TQString& filter = TQString(), int mode = 0, TQWidget* parent = 0, const char* name = 0);
bool edit(const TQString& eventID);
bool editNew(const TQString& templateName = TQString());
/** Create a "New Alarm" KAction */
@@ -88,7 +88,7 @@ TemplateMenuAction* createNewFromTemplateAction(const TQString& label, TQObject*
* If shell commands are disabled, command alarm templates are omitted.
*/
TQValueList templateList();
-void outputAlarmWarnings(TQWidget* tqparent, const KAEvent* = 0);
+void outputAlarmWarnings(TQWidget* parent, const KAEvent* = 0);
void resetDaemon();
void resetDaemonIfQueued(); // must only be called from KAlarmApp::processQueue()
TQString runKMail(bool minimise);
@@ -105,8 +105,8 @@ UpdatetqStatus deleteTemplate(const KAEvent&);
void deleteDisplayEvent(const TQString& eventID);
UpdatetqStatus reactivateEvent(KAEvent&, AlarmListView* selectionView, bool useEventID = false);
UpdatetqStatus enableEvent(KAEvent&, AlarmListView* selectionView, bool enable);
-void displayUpdateError(TQWidget* tqparent, UpdatetqStatus, UpdateError, int nAlarms);
-void displayKOrgUpdateError(TQWidget* tqparent, KOrgUpdateError, int nAlarms);
+void displayUpdateError(TQWidget* parent, UpdatetqStatus, UpdateError, int nAlarms);
+void displayKOrgUpdateError(TQWidget* parent, KOrgUpdateError, int nAlarms);
TQString stripAccel(const TQString&);
diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp
index 775821c5e..8a620afd5 100644
--- a/kalarm/kalarmapp.cpp
+++ b/kalarm/kalarmapp.cpp
@@ -788,7 +788,7 @@ void KAlarmApp::quitIf(int exitCode, bool force)
MainWindow* mw = mwcount ? MainWindow::firstWindow() : 0;
if (mwcount > 1 || mwcount && (!mw->isHidden() || !mw->isTrayParent()))
return;
- // There are no windows left except perhaps a main window which is a hidden tray icon tqparent
+ // There are no windows left except perhaps a main window which is a hidden tray icon parent
if (mTrayWindow)
{
// There is a system tray icon.
@@ -816,11 +816,11 @@ void KAlarmApp::quitIf(int exitCode, bool force)
* Closes the system tray window and all main windows, but does not exit the
* program if other windows are still open.
*/
-void KAlarmApp::doQuit(TQWidget* tqparent)
+void KAlarmApp::doQuit(TQWidget* parent)
{
kdDebug(5950) << "KAlarmApp::doQuit()\n";
if (mDisableAlarmsIfStopped
- && MessageBox::warningContinueCancel(tqparent, KMessageBox::Cancel,
+ && MessageBox::warningContinueCancel(parent, KMessageBox::Cancel,
i18n("Quitting will disable alarms\n(once any alarm message windows are closed)."),
TQString(), KStdGuiItem::quit(), Preferences::TQUIT_WARN
) != KMessageBox::Yes)
@@ -973,7 +973,7 @@ void KAlarmApp::removeWindow(TrayWindow*)
/******************************************************************************
* Display or close the system tray icon.
*/
-bool KAlarmApp::displayTrayIcon(bool show, MainWindow* tqparent)
+bool KAlarmApp::displayTrayIcon(bool show, MainWindow* parent)
{
static bool creating = false;
if (show)
@@ -985,10 +985,10 @@ bool KAlarmApp::displayTrayIcon(bool show, MainWindow* tqparent)
if (!MainWindow::count() && wantRunInSystemTray())
{
creating = true; // prevent main window constructor from creating an additional tray icon
- tqparent = MainWindow::create();
+ parent = MainWindow::create();
creating = false;
}
- mTrayWindow = new TrayWindow(tqparent ? tqparent : MainWindow::firstWindow());
+ mTrayWindow = new TrayWindow(parent ? parent : MainWindow::firstWindow());
connect(mTrayWindow, TQT_SIGNAL(deleted()), TQT_SIGNAL(trayIconToggled()));
mTrayWindow->show();
emit trayIconToggled();
@@ -1917,7 +1917,7 @@ void KAlarmApp::commandErrorMsg(const ShellProcess* proc, const KAEvent& event,
/******************************************************************************
* Notes that an informational KMessageBox is displayed for this process.
*/
-void KAlarmApp::commandMessage(ShellProcess* proc, TQWidget* tqparent)
+void KAlarmApp::commandMessage(ShellProcess* proc, TQWidget* parent)
{
// Find this command in the command list
for (TQValueList::Iterator it = mCommandProcesses.begin(); it != mCommandProcesses.end(); ++it)
@@ -1925,7 +1925,7 @@ void KAlarmApp::commandMessage(ShellProcess* proc, TQWidget* tqparent)
ProcData* pd = *it;
if (pd->process == proc)
{
- pd->messageBoxParent = tqparent;
+ pd->messageBoxParent = parent;
break;
}
}
diff --git a/kalarm/kalarmapp.h b/kalarm/kalarmapp.h
index 0aa81b1bf..6653e8101 100644
--- a/kalarm/kalarmapp.h
+++ b/kalarm/kalarmapp.h
@@ -62,7 +62,7 @@ class KAlarmApp : public KUniqueApplication
bool restoreSession();
bool sessionClosingDown() const { return mSessionClosingDown; }
void quitIf() { quitIf(0); }
- void doQuit(TQWidget* tqparent);
+ void doQuit(TQWidget* parent);
static void displayFatalError(const TQString& message);
void addWindow(TrayWindow* w) { mTrayWindow = w; }
void removeWindow(TrayWindow*);
@@ -77,7 +77,7 @@ class KAlarmApp : public KUniqueApplication
void alarmShowing(KAEvent&, KAAlarm::Type, const DateTime&);
void alarmCompleted(const KAEvent&);
bool deleteEvent(const TQString& eventID) { return handleEvent(eventID, EVENT_CANCEL); }
- void commandMessage(ShellProcess*, TQWidget* tqparent);
+ void commandMessage(ShellProcess*, TQWidget* parent);
// Methods called indirectly by the DCOP interface
bool scheduleEvent(KAEvent::Action, const TQString& text, const TQDateTime&,
int lateCancel, int flags, const TQColor& bg, const TQColor& fg,
@@ -160,9 +160,9 @@ class KAlarmApp : public KUniqueApplication
static int mFatalError; // a fatal error has occurred - just wait to exit
static TQString mFatalMessage; // fatal error message to output
bool mInitialised; // initialisation complete: ready to handle DCOP calls
- DcopHandler* mDcopHandler; // the tqparent of the main DCOP receiver object
+ DcopHandler* mDcopHandler; // the parent of the main DCOP receiver object
#ifdef OLD_DCOP
- DcopHandlerOld* mDcopHandlerOld; // the tqparent of the old main DCOP receiver object
+ DcopHandlerOld* mDcopHandlerOld; // the parent of the old main DCOP receiver object
#endif
TrayWindow* mTrayWindow; // active system tray icon
TQTime mStartOfDay; // start-of-day time currently in use
diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp
index a8460167f..3bc75205f 100644
--- a/kalarm/kalarmd/alarmdaemon.cpp
+++ b/kalarm/kalarmd/alarmdaemon.cpp
@@ -58,9 +58,9 @@ static const TQString START_OF_DAY(TQString::tqfromLatin1("StartOfDay"));
static const TQString AUTOSTART_TRAY(TQString::tqfromLatin1("AutostartTray"));
-AlarmDaemon::AlarmDaemon(bool autostart, TQObject *tqparent, const char *name)
+AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name)
: DCOPObject(name),
- TQObject(tqparent, name),
+ TQObject(parent, name),
mAlarmTimer(0)
{
kdDebug(5900) << "AlarmDaemon::AlarmDaemon()" << endl;
@@ -373,7 +373,7 @@ void AlarmDaemon::checkAlarms(ADCalendar* cal)
TQValueList eventsDone;
for (TQValueList::ConstIterator it = alarms.begin(); it != alarms.end(); ++it)
{
- KCal::Event* event = dynamic_cast((*it)->tqparent());
+ KCal::Event* event = dynamic_cast((*it)->parent());
if (!event || eventsDone.find(event) != eventsDone.end())
continue; // either not an event, or the event has already been processed
eventsDone += event;
diff --git a/kalarm/kalarmd/alarmdaemon.h b/kalarm/kalarmd/alarmdaemon.h
index c05a4725c..c2c34e10f 100644
--- a/kalarm/kalarmd/alarmdaemon.h
+++ b/kalarm/kalarmd/alarmdaemon.h
@@ -34,7 +34,7 @@ class AlarmDaemon : public TQObject, virtual public AlarmDaemonIface
Q_OBJECT
TQ_OBJECT
public:
- AlarmDaemon(bool autostart, TQObject* tqparent = 0, const char* name = 0);
+ AlarmDaemon(bool autostart, TQObject* parent = 0, const char* name = 0);
private slots:
//#ifdef AUTOSTART_KALARM
diff --git a/kalarm/latecancel.cpp b/kalarm/latecancel.cpp
index 51c127d60..4f69be211 100644
--- a/kalarm/latecancel.cpp
+++ b/kalarm/latecancel.cpp
@@ -39,8 +39,8 @@ TQString LateCancelSelector::i18n_AutoCloseWinLC() { return i18n("Auto-close
TQString LateCancelSelector::i18n_i_AutoCloseWinLC() { return i18n("Auto-close w&indow after late-cancelation time"); }
-LateCancelSelector::LateCancelSelector(bool allowHourMinute, TQWidget* tqparent, const char* name)
- : TQFrame(tqparent, name),
+LateCancelSelector::LateCancelSelector(bool allowHourMinute, TQWidget* parent, const char* name)
+ : TQFrame(parent, name),
mDateOnly(false),
mReadOnly(false),
mAutoCloseShown(false)
diff --git a/kalarm/latecancel.h b/kalarm/latecancel.h
index 1d5b53630..ba03d07d7 100644
--- a/kalarm/latecancel.h
+++ b/kalarm/latecancel.h
@@ -35,7 +35,7 @@ class LateCancelSelector : public TQFrame
Q_OBJECT
TQ_OBJECT
public:
- LateCancelSelector(bool allowHourMinute, TQWidget* tqparent, const char* name = 0);
+ LateCancelSelector(bool allowHourMinute, TQWidget* parent, const char* name = 0);
int minutes() const;
void setMinutes(int Minutes, bool dateOnly, TimePeriod::Units defaultUnits);
void setDateOnly(bool dateOnly);
diff --git a/kalarm/lib/buttongroup.cpp b/kalarm/lib/buttongroup.cpp
index b8528316c..018640123 100644
--- a/kalarm/lib/buttongroup.cpp
+++ b/kalarm/lib/buttongroup.cpp
@@ -26,26 +26,26 @@
#include "buttongroup.moc"
-ButtonGroup::ButtonGroup(TQWidget* tqparent, const char* name)
- : TQButtonGroup(tqparent, name)
+ButtonGroup::ButtonGroup(TQWidget* parent, const char* name)
+ : TQButtonGroup(parent, name)
{
connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int)));
}
-ButtonGroup::ButtonGroup(const TQString& title, TQWidget* tqparent, const char* name)
- : TQButtonGroup(title, tqparent, name)
+ButtonGroup::ButtonGroup(const TQString& title, TQWidget* parent, const char* name)
+ : TQButtonGroup(title, parent, name)
{
connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int)));
}
-ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, TQWidget* tqparent, const char* name)
- : TQButtonGroup(strips, orient, tqparent, name)
+ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, TQWidget* parent, const char* name)
+ : TQButtonGroup(strips, orient, parent, name)
{
connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int)));
}
-ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, const TQString& title, TQWidget* tqparent, const char* name)
- : TQButtonGroup(strips, orient, title, tqparent, name)
+ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, const TQString& title, TQWidget* parent, const char* name)
+ : TQButtonGroup(strips, orient, title, parent, name)
{
connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int)));
}
diff --git a/kalarm/lib/buttongroup.h b/kalarm/lib/buttongroup.h
index 9d4a8886a..f4d812653 100644
--- a/kalarm/lib/buttongroup.h
+++ b/kalarm/lib/buttongroup.h
@@ -41,31 +41,31 @@ class ButtonGroup : public TQButtonGroup
TQ_OBJECT
public:
/** Constructor.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit ButtonGroup(TQWidget* tqparent, const char* name = 0);
+ explicit ButtonGroup(TQWidget* parent, const char* name = 0);
/** Constructor.
* @param title The title displayed for this button group.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- ButtonGroup(const TQString& title, TQWidget* tqparent, const char* name = 0);
+ ButtonGroup(const TQString& title, TQWidget* parent, const char* name = 0);
/** Constructor.
* @param strips The number of rows or columns of buttons.
* @param orient The orientation (TQt::Horizontal or TQt::Vertical) of the button group.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- ButtonGroup(int strips, Qt::Orientation orient, TQWidget* tqparent, const char* name = 0);
+ ButtonGroup(int strips, Qt::Orientation orient, TQWidget* parent, const char* name = 0);
/** Constructor.
* @param strips The number of rows or columns of buttons.
* @param orient The orientation (TQt::Horizontal or TQt::Vertical) of the button group.
* @param title The title displayed for this button group.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- ButtonGroup(int strips, Qt::Orientation orient, const TQString& title, TQWidget* tqparent, const char* name = 0);
+ ButtonGroup(int strips, Qt::Orientation orient, const TQString& title, TQWidget* parent, const char* name = 0);
/** Inserts a button in the group.
* This overrides the insert() method of TQButtonGroup, which should really be a virtual method...
* @param button The button to insert.
diff --git a/kalarm/lib/checkbox.cpp b/kalarm/lib/checkbox.cpp
index b5bfde0ee..d6b02373c 100644
--- a/kalarm/lib/checkbox.cpp
+++ b/kalarm/lib/checkbox.cpp
@@ -21,15 +21,15 @@
#include "checkbox.moc"
-CheckBox::CheckBox(TQWidget* tqparent, const char* name)
- : TQCheckBox(tqparent, name),
+CheckBox::CheckBox(TQWidget* parent, const char* name)
+ : TQCheckBox(parent, name),
mFocusPolicy(focusPolicy()),
mFocusWidget(0),
mReadOnly(false)
{ }
-CheckBox::CheckBox(const TQString& text, TQWidget* tqparent, const char* name)
- : TQCheckBox(text, tqparent, name),
+CheckBox::CheckBox(const TQString& text, TQWidget* parent, const char* name)
+ : TQCheckBox(text, parent, name),
mFocusPolicy(focusPolicy()),
mFocusWidget(0),
mReadOnly(false)
diff --git a/kalarm/lib/checkbox.h b/kalarm/lib/checkbox.h
index 61d6a1276..f81490ea9 100644
--- a/kalarm/lib/checkbox.h
+++ b/kalarm/lib/checkbox.h
@@ -45,16 +45,16 @@ class CheckBox : public TQCheckBox
TQ_OBJECT
public:
/** Constructor.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit CheckBox(TQWidget* tqparent, const char* name = 0);
+ explicit CheckBox(TQWidget* parent, const char* name = 0);
/** Constructor.
* @param text Text to display.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- CheckBox(const TQString& text, TQWidget* tqparent, const char* name = 0);
+ CheckBox(const TQString& text, TQWidget* parent, const char* name = 0);
/** Returns true if the widget is read only. */
bool isReadOnly() const { return mReadOnly; }
/** Sets whether the check box is read-only for the user. If read-only,
diff --git a/kalarm/lib/colourcombo.cpp b/kalarm/lib/colourcombo.cpp
index cd078a34f..4d10f6e63 100644
--- a/kalarm/lib/colourcombo.cpp
+++ b/kalarm/lib/colourcombo.cpp
@@ -30,8 +30,8 @@
#include "colourcombo.moc"
-ColourCombo::ColourCombo(TQWidget* tqparent, const char* name, const TQColor& defaultColour)
- : TQComboBox(tqparent, name),
+ColourCombo::ColourCombo(TQWidget* parent, const char* name, const TQColor& defaultColour)
+ : TQComboBox(parent, name),
mColourList(Preferences::messageColours()),
mSelectedColour(defaultColour),
mCustomColour(255, 255, 255),
diff --git a/kalarm/lib/colourcombo.h b/kalarm/lib/colourcombo.h
index 31fcdbdcc..2a075d235 100644
--- a/kalarm/lib/colourcombo.h
+++ b/kalarm/lib/colourcombo.h
@@ -47,11 +47,11 @@ class ColourCombo : public TQComboBox
TQ_PROPERTY(TQColor color READ color WRITE setColor)
public:
/** Constructor.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
* @param defaultColour The colour which is selected by default.
*/
- explicit ColourCombo(TQWidget* tqparent = 0, const char* name = 0, const TQColor& defaultColour = 0xFFFFFF);
+ explicit ColourCombo(TQWidget* parent = 0, const char* name = 0, const TQColor& defaultColour = 0xFFFFFF);
/** Returns the selected colour. */
TQColor color() const { return mSelectedColour; }
/** Returns the selected colour. */
diff --git a/kalarm/lib/combobox.cpp b/kalarm/lib/combobox.cpp
index 2acb5a442..99577506d 100644
--- a/kalarm/lib/combobox.cpp
+++ b/kalarm/lib/combobox.cpp
@@ -22,13 +22,13 @@
#include "combobox.moc"
-ComboBox::ComboBox(TQWidget* tqparent, const char* name)
- : TQComboBox(tqparent, name),
+ComboBox::ComboBox(TQWidget* parent, const char* name)
+ : TQComboBox(parent, name),
mReadOnly(false)
{ }
-ComboBox::ComboBox(bool rw, TQWidget* tqparent, const char* name)
- : TQComboBox(rw, tqparent, name),
+ComboBox::ComboBox(bool rw, TQWidget* parent, const char* name)
+ : TQComboBox(rw, parent, name),
mReadOnly(false)
{ }
diff --git a/kalarm/lib/combobox.h b/kalarm/lib/combobox.h
index 5f8f4cc3c..3d5ff13e6 100644
--- a/kalarm/lib/combobox.h
+++ b/kalarm/lib/combobox.h
@@ -40,16 +40,16 @@ class ComboBox : public TQComboBox
TQ_OBJECT
public:
/** Constructor.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit ComboBox(TQWidget* tqparent = 0, const char* name = 0);
+ explicit ComboBox(TQWidget* parent = 0, const char* name = 0);
/** Constructor.
* @param rw True for a read-write combo box, false for a read-only combo box.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit ComboBox(bool rw, TQWidget* tqparent = 0, const char* name = 0);
+ explicit ComboBox(bool rw, TQWidget* parent = 0, const char* name = 0);
/** Returns true if the widget is read only. */
bool isReadOnly() const { return mReadOnly; }
/** Sets whether the combo box is read-only for the user. If read-only,
diff --git a/kalarm/lib/dateedit.cpp b/kalarm/lib/dateedit.cpp
index 0a916d9f6..b9699988d 100644
--- a/kalarm/lib/dateedit.cpp
+++ b/kalarm/lib/dateedit.cpp
@@ -25,8 +25,8 @@
#include "dateedit.moc"
-DateEdit::DateEdit(TQWidget* tqparent, const char* name)
- : KDateEdit(tqparent, name)
+DateEdit::DateEdit(TQWidget* parent, const char* name)
+ : KDateEdit(parent, name)
{
connect(this, TQT_SIGNAL(dateEntered(const TQDate&)), TQT_SLOT(newDateEntered(const TQDate&)));
}
diff --git a/kalarm/lib/dateedit.h b/kalarm/lib/dateedit.h
index 7ad0a7a05..b221871a9 100644
--- a/kalarm/lib/dateedit.h
+++ b/kalarm/lib/dateedit.h
@@ -40,10 +40,10 @@ class DateEdit : public KDateEdit
TQ_OBJECT
public:
/** Constructor.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit DateEdit(TQWidget* tqparent = 0, const char* name = 0);
+ explicit DateEdit(TQWidget* parent = 0, const char* name = 0);
/** Returns true if the widget contains a valid date. */
bool isValid() const { return date().isValid(); }
/** Returns the earliest date which can be entered.
diff --git a/kalarm/lib/label.cpp b/kalarm/lib/label.cpp
index ee1750e8b..7767a7659 100644
--- a/kalarm/lib/label.cpp
+++ b/kalarm/lib/label.cpp
@@ -23,20 +23,20 @@
#include "label.moc"
-Label::Label(TQWidget* tqparent, const char* name, WFlags f)
- : TQLabel(tqparent, name, f),
+Label::Label(TQWidget* parent, const char* name, WFlags f)
+ : TQLabel(parent, name, f),
mRadioButton(0),
mFocusWidget(0)
{ }
-Label::Label(const TQString& text, TQWidget* tqparent, const char* name, WFlags f)
- : TQLabel(text, tqparent, name, f),
+Label::Label(const TQString& text, TQWidget* parent, const char* name, WFlags f)
+ : TQLabel(text, parent, name, f),
mRadioButton(0),
mFocusWidget(0)
{ }
-Label::Label(TQWidget* buddy, const TQString& text, TQWidget* tqparent, const char* name, WFlags f)
- : TQLabel(buddy, text, tqparent, name, f),
+Label::Label(TQWidget* buddy, const TQString& text, TQWidget* parent, const char* name, WFlags f)
+ : TQLabel(buddy, text, parent, name, f),
mRadioButton(0),
mFocusWidget(0)
{ }
@@ -103,8 +103,8 @@ void Label::activated()
* Class: LabelFocusWidget
=============================================================================*/
-LabelFocusWidget::LabelFocusWidget(TQWidget* tqparent, const char* name)
- : TQWidget(tqparent, name)
+LabelFocusWidget::LabelFocusWidget(TQWidget* parent, const char* name)
+ : TQWidget(parent, name)
{
setFocusPolicy(TQ_ClickFocus);
setFixedSize(TQSize(1,1));
@@ -112,7 +112,7 @@ LabelFocusWidget::LabelFocusWidget(TQWidget* tqparent, const char* name)
void LabelFocusWidget::focusInEvent(TQFocusEvent*)
{
- Label* tqparent = (Label*)parentWidget();
- tqparent->activated();
+ Label* parent = (Label*)parentWidget();
+ parent->activated();
}
diff --git a/kalarm/lib/label.h b/kalarm/lib/label.h
index bd0e39035..ba418aee8 100644
--- a/kalarm/lib/label.h
+++ b/kalarm/lib/label.h
@@ -45,29 +45,29 @@ class Label : public TQLabel
friend class LabelFocusWidget;
public:
/** Constructs an empty label.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
* @param f Flags. See TQWidget constructor for details.
*/
- explicit Label(TQWidget* tqparent, const char* name = 0, WFlags f = 0);
+ explicit Label(TQWidget* parent, const char* name = 0, WFlags f = 0);
/** Constructs a label that displays @p text.
* @param text Text string to display.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
* @param f Flags. See TQWidget constructor for details.
*/
- Label(const TQString& text, TQWidget* tqparent, const char* name = 0, WFlags f = 0);
+ Label(const TQString& text, TQWidget* parent, const char* name = 0, WFlags f = 0);
/** Constructs a label, with a buddy widget, that displays @p text.
* @param buddy Buddy widget which receives the keyboard focus when the
* label's accelerator key is pressed. If @p buddy is a radio
* button, @p buddy is in addition selected when the
* accelerator key is pressed.
* @param text Text string to display.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
* @param f Flags. See TQWidget constructor for details.
*/
- Label(TQWidget* buddy, const TQString& text, TQWidget* tqparent, const char* name = 0, WFlags f = 0);
+ Label(TQWidget* buddy, const TQString& text, TQWidget* parent, const char* name = 0, WFlags f = 0);
/** Sets the label's buddy widget which receives the keyboard focus when the
* label's accelerator key is pressed. If @p buddy is a radio button,
* @p buddy is in addition selected when the accelerator key is pressed.
@@ -90,7 +90,7 @@ class LabelFocusWidget : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- LabelFocusWidget(TQWidget* tqparent, const char* name = 0);
+ LabelFocusWidget(TQWidget* parent, const char* name = 0);
protected:
virtual void focusInEvent(TQFocusEvent*);
};
diff --git a/kalarm/lib/lineedit.cpp b/kalarm/lib/lineedit.cpp
index 28d94fb26..0328e4db9 100644
--- a/kalarm/lib/lineedit.cpp
+++ b/kalarm/lib/lineedit.cpp
@@ -39,8 +39,8 @@
* It has an option to prevent its contents being selected when it receives
= focus.
=============================================================================*/
-LineEdit::LineEdit(Type type, TQWidget* tqparent, const char* name)
- : KLineEdit(tqparent, name),
+LineEdit::LineEdit(Type type, TQWidget* parent, const char* name)
+ : KLineEdit(parent, name),
mType(type),
mNoSelect(false),
mSetCursorAtEnd(false)
@@ -48,8 +48,8 @@ LineEdit::LineEdit(Type type, TQWidget* tqparent, const char* name)
init();
}
-LineEdit::LineEdit(TQWidget* tqparent, const char* name)
- : KLineEdit(tqparent, name),
+LineEdit::LineEdit(TQWidget* parent, const char* name)
+ : KLineEdit(parent, name),
mType(Text),
mNoSelect(false),
mSetCursorAtEnd(false)
diff --git a/kalarm/lib/lineedit.h b/kalarm/lib/lineedit.h
index 0da536835..660d45377 100644
--- a/kalarm/lib/lineedit.h
+++ b/kalarm/lib/lineedit.h
@@ -62,15 +62,15 @@ class LineEdit : public KLineEdit
enum Type { Text, Url, Emails };
/** Constructor.
* @param type The content type for the line edit.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit LineEdit(Type type, TQWidget* tqparent = 0, const char* name = 0);
+ explicit LineEdit(Type type, TQWidget* parent = 0, const char* name = 0);
/** Constructs a line edit whose content type is Text.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit LineEdit(TQWidget* tqparent = 0, const char* name = 0);
+ explicit LineEdit(TQWidget* parent = 0, const char* name = 0);
/** Prevents the line edit's contents being selected when the widget receives focus. */
void setNoSelect() { mNoSelect = true; }
/** Sets whether the cursor should be set at the beginning or end of the text when
diff --git a/kalarm/lib/messagebox.cpp b/kalarm/lib/messagebox.cpp
index 2f7480dfd..3345c9c4b 100644
--- a/kalarm/lib/messagebox.cpp
+++ b/kalarm/lib/messagebox.cpp
@@ -60,11 +60,11 @@ KMessageBox::ButtonCode MessageBox::getContinueDefault(const TQString& dontAskAg
* warningContinueCancel() for that 'dontAskAgainName' value. If neither method
* has set a default button, Continue is the default.
*/
-int MessageBox::warningContinueCancel(TQWidget* tqparent, const TQString& text, const TQString& caption,
+int MessageBox::warningContinueCancel(TQWidget* parent, const TQString& text, const TQString& caption,
const KGuiItem& buttonContinue, const TQString& dontAskAgainName)
{
ButtonCode defaultButton = getContinueDefault(dontAskAgainName);
- return warningContinueCancel(tqparent, defaultButton, text, caption, buttonContinue, dontAskAgainName);
+ return warningContinueCancel(parent, defaultButton, text, caption, buttonContinue, dontAskAgainName);
}
/******************************************************************************
@@ -72,13 +72,13 @@ int MessageBox::warningContinueCancel(TQWidget* tqparent, const TQString& text,
* If 'dontAskAgainName' is specified, the message box will only be suppressed
* if the user chose Continue last time.
*/
-int MessageBox::warningContinueCancel(TQWidget* tqparent, ButtonCode defaultButton, const TQString& text,
+int MessageBox::warningContinueCancel(TQWidget* parent, ButtonCode defaultButton, const TQString& text,
const TQString& caption, const KGuiItem& buttonContinue,
const TQString& dontAskAgainName)
{
setContinueDefault(dontAskAgainName, defaultButton);
if (defaultButton != Cancel)
- return KMessageBox::warningContinueCancel(tqparent, text, caption, buttonContinue, dontAskAgainName);
+ return KMessageBox::warningContinueCancel(parent, text, caption, buttonContinue, dontAskAgainName);
// Cancel is the default button, so we have to use KMessageBox::warningYesNo()
if (!dontAskAgainName.isEmpty())
@@ -92,7 +92,7 @@ int MessageBox::warningContinueCancel(TQWidget* tqparent, ButtonCode defaultButt
saveDontShowAgain(dontAskAgainName, true, false);
}
}
- return warningYesNo(tqparent, text, caption, buttonContinue, KStdGuiItem::cancel(), dontAskAgainName);
+ return warningYesNo(parent, text, caption, buttonContinue, KStdGuiItem::cancel(), dontAskAgainName);
}
/******************************************************************************
diff --git a/kalarm/lib/messagebox.h b/kalarm/lib/messagebox.h
index 21d321b13..7a84cf202 100644
--- a/kalarm/lib/messagebox.h
+++ b/kalarm/lib/messagebox.h
@@ -58,7 +58,7 @@ class MessageBox : public KMessageBox
*/
static void setContinueDefault(const TQString& dontAskAgainName, ButtonCode defaultButton);
/** Displays a Continue/Cancel message box with the option as to which button is the default.
- * @param tqparent Parent widget
+ * @param parent Parent widget
* @param defaultButton The default button for the message box. Valid values are Continue or Cancel.
* @param text Message string
* @param caption Caption (window title) of the message box
@@ -66,12 +66,12 @@ class MessageBox : public KMessageBox
* @param dontAskAgainName If specified, the message box will only be suppressed
* if the user chose Continue last time.
*/
- static int warningContinueCancel(TQWidget* tqparent, ButtonCode defaultButton, const TQString& text,
+ static int warningContinueCancel(TQWidget* parent, ButtonCode defaultButton, const TQString& text,
const TQString& caption = TQString(),
const KGuiItem& buttonContinue = KStdGuiItem::cont(),
const TQString& dontAskAgainName = TQString());
/** Displays a Continue/Cancel message box.
- * @param tqparent Parent widget
+ * @param parent Parent widget
* @param text Message string
* @param caption Caption (window title) of the message box
* @param buttonContinue The text for the first button (default = i18n("Continue"))
@@ -81,7 +81,7 @@ class MessageBox : public KMessageBox
* @p dontAskAgainName value. If neither method has been used to set a default button,
* Continue is the default.
*/
- static int warningContinueCancel(TQWidget* tqparent, const TQString& text, const TQString& caption = TQString(),
+ static int warningContinueCancel(TQWidget* parent, const TQString& text, const TQString& caption = TQString(),
const KGuiItem& buttonContinue = KStdGuiItem::cont(),
const TQString& dontAskAgainName = TQString());
/** If there is no current setting for whether a non-Yes/No message box should be
diff --git a/kalarm/lib/pushbutton.cpp b/kalarm/lib/pushbutton.cpp
index 883ad1812..f1f824d24 100644
--- a/kalarm/lib/pushbutton.cpp
+++ b/kalarm/lib/pushbutton.cpp
@@ -21,20 +21,20 @@
#include "pushbutton.moc"
-PushButton::PushButton(TQWidget* tqparent, const char* name)
- : TQPushButton(tqparent, name),
+PushButton::PushButton(TQWidget* parent, const char* name)
+ : TQPushButton(parent, name),
mFocusPolicy(focusPolicy()),
mReadOnly(false)
{ }
-PushButton::PushButton(const TQString& text, TQWidget* tqparent, const char* name)
- : TQPushButton(text, tqparent, name),
+PushButton::PushButton(const TQString& text, TQWidget* parent, const char* name)
+ : TQPushButton(text, parent, name),
mFocusPolicy(focusPolicy()),
mReadOnly(false)
{ }
-PushButton::PushButton(const TQIconSet& icon, const TQString& text, TQWidget* tqparent, const char* name)
- : TQPushButton(icon, text, tqparent, name),
+PushButton::PushButton(const TQIconSet& icon, const TQString& text, TQWidget* parent, const char* name)
+ : TQPushButton(icon, text, parent, name),
mFocusPolicy(focusPolicy()),
mReadOnly(false)
{ }
diff --git a/kalarm/lib/pushbutton.h b/kalarm/lib/pushbutton.h
index 52c761bce..d3aee32cd 100644
--- a/kalarm/lib/pushbutton.h
+++ b/kalarm/lib/pushbutton.h
@@ -41,23 +41,23 @@ class PushButton : public TQPushButton
TQ_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
public:
/** Constructor.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit PushButton(TQWidget* tqparent, const char* name = 0);
+ explicit PushButton(TQWidget* parent, const char* name = 0);
/** Constructor for a push button which displays a text.
* @param text The text to show on the button.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- PushButton(const TQString& text, TQWidget* tqparent, const char* name = 0);
+ PushButton(const TQString& text, TQWidget* parent, const char* name = 0);
/** Constructor for a push button which displays an icon and a text.
* @param icon The icon to show on the button.
* @param text The text to show on the button.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- PushButton(const TQIconSet& icon, const TQString& text, TQWidget* tqparent, const char* name = 0);
+ PushButton(const TQIconSet& icon, const TQString& text, TQWidget* parent, const char* name = 0);
/** Sets whether the push button is read-only for the user.
* @param readOnly True to set the widget read-only, false to enable its action.
*/
diff --git a/kalarm/lib/radiobutton.cpp b/kalarm/lib/radiobutton.cpp
index 6331c06f5..18571ad7f 100644
--- a/kalarm/lib/radiobutton.cpp
+++ b/kalarm/lib/radiobutton.cpp
@@ -21,15 +21,15 @@
#include "radiobutton.moc"
-RadioButton::RadioButton(TQWidget* tqparent, const char* name)
- : TQRadioButton(tqparent, name),
+RadioButton::RadioButton(TQWidget* parent, const char* name)
+ : TQRadioButton(parent, name),
mFocusPolicy(focusPolicy()),
mFocusWidget(0),
mReadOnly(false)
{ }
-RadioButton::RadioButton(const TQString& text, TQWidget* tqparent, const char* name)
- : TQRadioButton(text, tqparent, name),
+RadioButton::RadioButton(const TQString& text, TQWidget* parent, const char* name)
+ : TQRadioButton(text, parent, name),
mFocusPolicy(focusPolicy()),
mFocusWidget(0),
mReadOnly(false)
diff --git a/kalarm/lib/radiobutton.h b/kalarm/lib/radiobutton.h
index 2f924b24d..107957ca7 100644
--- a/kalarm/lib/radiobutton.h
+++ b/kalarm/lib/radiobutton.h
@@ -45,16 +45,16 @@ class RadioButton : public TQRadioButton
TQ_OBJECT
public:
/** Constructor.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit RadioButton(TQWidget* tqparent, const char* name = 0);
+ explicit RadioButton(TQWidget* parent, const char* name = 0);
/** Constructor.
* @param text Text to display.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- RadioButton(const TQString& text, TQWidget* tqparent, const char* name = 0);
+ RadioButton(const TQString& text, TQWidget* parent, const char* name = 0);
/** Returns true if the widget is read only. */
bool isReadOnly() const { return mReadOnly; }
/** Sets whether the radio button is read-only for the user. If read-only,
diff --git a/kalarm/lib/slider.cpp b/kalarm/lib/slider.cpp
index f901f6db1..189c8941a 100644
--- a/kalarm/lib/slider.cpp
+++ b/kalarm/lib/slider.cpp
@@ -21,18 +21,18 @@
#include "slider.moc"
-Slider::Slider(TQWidget* tqparent, const char* name)
- : TQSlider(tqparent, name),
+Slider::Slider(TQWidget* parent, const char* name)
+ : TQSlider(parent, name),
mReadOnly(false)
{ }
-Slider::Slider(Qt::Orientation o, TQWidget* tqparent, const char* name)
- : TQSlider(o, tqparent, name),
+Slider::Slider(Qt::Orientation o, TQWidget* parent, const char* name)
+ : TQSlider(o, parent, name),
mReadOnly(false)
{ }
-Slider::Slider(int minval, int maxval, int pageStep, int value, Qt::Orientation o, TQWidget* tqparent, const char* name)
- : TQSlider(minval, maxval, pageStep, value, o, tqparent, name),
+Slider::Slider(int minval, int maxval, int pageStep, int value, Qt::Orientation o, TQWidget* parent, const char* name)
+ : TQSlider(minval, maxval, pageStep, value, o, parent, name),
mReadOnly(false)
{ }
diff --git a/kalarm/lib/slider.h b/kalarm/lib/slider.h
index f79ac0158..6b72c5ba6 100644
--- a/kalarm/lib/slider.h
+++ b/kalarm/lib/slider.h
@@ -41,27 +41,27 @@ class Slider : public TQSlider
TQ_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
public:
/** Constructor.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit Slider(TQWidget* tqparent = 0, const char* name = 0);
+ explicit Slider(TQWidget* parent = 0, const char* name = 0);
/** Constructor.
* @param orient The orientation of the slider, either TQt::Horizonal or TQt::Vertical.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit Slider(Qt::Orientation orient, TQWidget* tqparent = 0, const char* name = 0);
+ explicit Slider(Qt::Orientation orient, TQWidget* parent = 0, const char* name = 0);
/** Constructor.
* @param minValue The minimum value which the slider can have.
* @param maxValue The maximum value which the slider can have.
* @param pageStep The page step increment.
* @param value The initial value for the slider.
* @param orient The orientation of the slider, either TQt::Horizonal or TQt::Vertical.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
Slider(int minValue, int maxValue, int pageStep, int value, Qt::Orientation orient,
- TQWidget* tqparent = 0, const char* name = 0);
+ TQWidget* parent = 0, const char* name = 0);
/** Returns true if the slider is read only. */
bool isReadOnly() const { return mReadOnly; }
/** Sets whether the slider is read-only for the user.
diff --git a/kalarm/lib/spinbox.cpp b/kalarm/lib/spinbox.cpp
index 10f3f5917..625186ca9 100644
--- a/kalarm/lib/spinbox.cpp
+++ b/kalarm/lib/spinbox.cpp
@@ -24,16 +24,16 @@
#include "spinbox.moc"
-SpinBox::SpinBox(TQWidget* tqparent, const char* name)
- : TQSpinBox(0, 99999, 1, tqparent, name),
+SpinBox::SpinBox(TQWidget* parent, const char* name)
+ : TQSpinBox(0, 99999, 1, parent, name),
mMinValue(TQSpinBox::minValue()),
mMaxValue(TQSpinBox::maxValue())
{
init();
}
-SpinBox::SpinBox(int minValue, int maxValue, int step, TQWidget* tqparent, const char* name)
- : TQSpinBox(minValue, maxValue, step, tqparent, name),
+SpinBox::SpinBox(int minValue, int maxValue, int step, TQWidget* parent, const char* name)
+ : TQSpinBox(minValue, maxValue, step, parent, name),
mMinValue(minValue),
mMaxValue(maxValue)
{
diff --git a/kalarm/lib/spinbox.h b/kalarm/lib/spinbox.h
index 4b269d6a5..081087db0 100644
--- a/kalarm/lib/spinbox.h
+++ b/kalarm/lib/spinbox.h
@@ -45,18 +45,18 @@ class SpinBox : public TQSpinBox
TQ_OBJECT
public:
/** Constructor.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit SpinBox(TQWidget* tqparent = 0, const char* name = 0);
+ explicit SpinBox(TQWidget* parent = 0, const char* name = 0);
/** Constructor.
* @param minValue The minimum value which the spin box can have.
* @param maxValue The maximum value which the spin box can have.
* @param step The (unshifted) step interval.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- SpinBox(int minValue, int maxValue, int step = 1, TQWidget* tqparent = 0, const char* name = 0);
+ SpinBox(int minValue, int maxValue, int step = 1, TQWidget* parent = 0, const char* name = 0);
/** Returns true if the widget is read only. */
bool isReadOnly() const { return mReadOnly; }
/** Sets whether the spin box can be changed by the user.
diff --git a/kalarm/lib/spinbox2.cpp b/kalarm/lib/spinbox2.cpp
index bdd887912..3ec3b68c0 100644
--- a/kalarm/lib/spinbox2.cpp
+++ b/kalarm/lib/spinbox2.cpp
@@ -48,8 +48,8 @@ static bool mirrorStyle(const TQStyle&);
int SpinBox2::mReverseLayout = -1;
-SpinBox2::SpinBox2(TQWidget* tqparent, const char* name)
- : TQFrame(tqparent, name),
+SpinBox2::SpinBox2(TQWidget* parent, const char* name)
+ : TQFrame(parent, name),
mReverseWithLayout(true)
{
mUpdown2Frame = new TQFrame(this);
@@ -60,8 +60,8 @@ SpinBox2::SpinBox2(TQWidget* tqparent, const char* name)
init();
}
-SpinBox2::SpinBox2(int minValue, int maxValue, int step, int step2, TQWidget* tqparent, const char* name)
- : TQFrame(tqparent, name),
+SpinBox2::SpinBox2(int minValue, int maxValue, int step, int step2, TQWidget* parent, const char* name)
+ : TQFrame(parent, name),
mReverseWithLayout(true)
{
mUpdown2Frame = new TQFrame(this);
@@ -371,7 +371,7 @@ int SpinBox2::MainSpinBox::shiftStepAdjustment(int oldValue, int shiftStep)
/******************************************************************************
* Repaint the widget.
-* If it's the first time since a style change, tell the tqparent SpinBox2 to
+* If it's the first time since a style change, tell the parent SpinBox2 to
* update the SpinMirror with the new unpressed button image. We make the
* presumably reasonable assumption that when a style change occurs, the spin
* buttons are unpressed.
@@ -391,8 +391,8 @@ void ExtraSpinBox::paintEvent(TQPaintEvent* e)
= Class SpinMirror
=============================================================================*/
-SpinMirror::SpinMirror(SpinBox* spinbox, TQFrame* spinFrame, TQWidget* tqparent, const char* name)
- : TQCanvasView(new TQCanvas, tqparent, name),
+SpinMirror::SpinMirror(SpinBox* spinbox, TQFrame* spinFrame, TQWidget* parent, const char* name)
+ : TQCanvasView(new TQCanvas, parent, name),
mSpinbox(spinbox),
mSpinFrame(spinFrame),
mReadOnly(false)
diff --git a/kalarm/lib/spinbox2.h b/kalarm/lib/spinbox2.h
index f83db252a..4391fbb9c 100644
--- a/kalarm/lib/spinbox2.h
+++ b/kalarm/lib/spinbox2.h
@@ -59,20 +59,20 @@ class SpinBox2 : public TQFrame
TQ_OBJECT
public:
/** Constructor.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit SpinBox2(TQWidget* tqparent = 0, const char* name = 0);
+ explicit SpinBox2(TQWidget* parent = 0, const char* name = 0);
/** Constructor.
* @param minValue The minimum value which the spin box can have.
* @param maxValue The maximum value which the spin box can have.
* @param step The (unshifted) step interval for the right-hand spin buttons.
* @param step2 The (unshifted) step interval for the left-hand spin buttons.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
SpinBox2(int minValue, int maxValue, int step = 1, int step2 = 1,
- TQWidget* tqparent = 0, const char* name = 0);
+ TQWidget* parent = 0, const char* name = 0);
/** Sets whether the spin box can be changed by the user.
* @param readOnly True to set the widget read-only, false to set it read-write.
*/
@@ -282,10 +282,10 @@ class SpinBox2 : public TQFrame
class MainSpinBox : public SpinBox
{
public:
- MainSpinBox(SpinBox2* sb2, TQWidget* tqparent, const char* name = 0)
- : SpinBox(tqparent, name), owner(sb2) { }
- MainSpinBox(int minValue, int maxValue, int step, SpinBox2* sb2, TQWidget* tqparent, const char* name = 0)
- : SpinBox(minValue, maxValue, step, tqparent, name), owner(sb2) { }
+ MainSpinBox(SpinBox2* sb2, TQWidget* parent, const char* name = 0)
+ : SpinBox(parent, name), owner(sb2) { }
+ MainSpinBox(int minValue, int maxValue, int step, SpinBox2* sb2, TQWidget* parent, const char* name = 0)
+ : SpinBox(minValue, maxValue, step, parent, name), owner(sb2) { }
void tqsetAlignment(int a) { editor()->tqsetAlignment(a); }
virtual TQString mapValueToText(int v) { return owner->mapValueToText(v); }
virtual int mapTextToValue(bool* ok) { return owner->mapTextToValue(ok); }
diff --git a/kalarm/lib/spinbox2private.h b/kalarm/lib/spinbox2private.h
index 1c5a71ee6..c1c116b04 100644
--- a/kalarm/lib/spinbox2private.h
+++ b/kalarm/lib/spinbox2private.h
@@ -36,10 +36,10 @@ class ExtraSpinBox : public SpinBox
Q_OBJECT
TQ_OBJECT
public:
- explicit ExtraSpinBox(TQWidget* tqparent, const char* name = 0)
- : SpinBox(tqparent, name), mNewStylePending(false) { }
- ExtraSpinBox(int minValue, int maxValue, int step, TQWidget* tqparent, const char* name = 0)
- : SpinBox(minValue, maxValue, step, tqparent, name), mNewStylePending(false) { }
+ explicit ExtraSpinBox(TQWidget* parent, const char* name = 0)
+ : SpinBox(parent, name), mNewStylePending(false) { }
+ ExtraSpinBox(int minValue, int maxValue, int step, TQWidget* parent, const char* name = 0)
+ : SpinBox(minValue, maxValue, step, parent, name), mNewStylePending(false) { }
signals:
void styleUpdated();
protected:
@@ -63,7 +63,7 @@ class SpinMirror : public TQCanvasView
Q_OBJECT
TQ_OBJECT
public:
- explicit SpinMirror(SpinBox*, TQFrame* spinFrame, TQWidget* tqparent = 0, const char* name = 0);
+ explicit SpinMirror(SpinBox*, TQFrame* spinFrame, TQWidget* parent = 0, const char* name = 0);
void setReadOnly(bool ro) { mReadOnly = ro; }
bool isReadOnly() const { return mReadOnly; }
void setNormalButtons(const TQPixmap&);
diff --git a/kalarm/lib/timeedit.cpp b/kalarm/lib/timeedit.cpp
index 923bef8b3..170914922 100644
--- a/kalarm/lib/timeedit.cpp
+++ b/kalarm/lib/timeedit.cpp
@@ -28,8 +28,8 @@
#include "timeedit.moc"
-TimeEdit::TimeEdit(TQWidget* tqparent, const char* name)
- : TQHBox(tqparent, name),
+TimeEdit::TimeEdit(TQWidget* parent, const char* name)
+ : TQHBox(parent, name),
mAmPm(0),
mAmIndex(-1),
mPmIndex(-1),
diff --git a/kalarm/lib/timeedit.h b/kalarm/lib/timeedit.h
index 7be73c1f9..658fe7805 100644
--- a/kalarm/lib/timeedit.h
+++ b/kalarm/lib/timeedit.h
@@ -53,10 +53,10 @@ class TimeEdit : public TQHBox
TQ_OBJECT
public:
/** Constructor.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit TimeEdit(TQWidget* tqparent = 0, const char* name = 0);
+ explicit TimeEdit(TQWidget* parent = 0, const char* name = 0);
/** Returns true if the widget is read only. */
bool isReadOnly() const { return mReadOnly; }
/** Sets whether the widget is read-only for the user. If read-only,
diff --git a/kalarm/lib/timeperiod.cpp b/kalarm/lib/timeperiod.cpp
index 9b41e40d4..291ba0872 100644
--- a/kalarm/lib/timeperiod.cpp
+++ b/kalarm/lib/timeperiod.cpp
@@ -50,8 +50,8 @@ static const int maxMinutes = 1000*60-1; // absolute maximum value for hours:m
= Contains a time unit combo box, plus a time spinbox, to select a time period.
=============================================================================*/
-TimePeriod::TimePeriod(bool allowHourMinute, TQWidget* tqparent, const char* name)
- : TQHBox(tqparent, name),
+TimePeriod::TimePeriod(bool allowHourMinute, TQWidget* parent, const char* name)
+ : TQHBox(parent, name),
mMaxDays(9999),
mNoHourMinute(!allowHourMinute),
mReadOnly(false)
diff --git a/kalarm/lib/timeperiod.h b/kalarm/lib/timeperiod.h
index 86b663798..9c4152b76 100644
--- a/kalarm/lib/timeperiod.h
+++ b/kalarm/lib/timeperiod.h
@@ -65,10 +65,10 @@ class TimePeriod : public TQHBox
* being allowed as units; only days and weeks can ever be used,
* regardless of other method calls. Set true to allow minutes,
* hours/minutes, days or weeks as units.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- TimePeriod(bool allowMinute, TQWidget* tqparent, const char* name = 0);
+ TimePeriod(bool allowMinute, TQWidget* parent, const char* name = 0);
/** Returns true if the widget is read only. */
bool isReadOnly() const { return mReadOnly; }
/** Sets whether the widget is read-only for the user. If read-only,
diff --git a/kalarm/lib/timespinbox.cpp b/kalarm/lib/timespinbox.cpp
index ccf0c4492..f756112e8 100644
--- a/kalarm/lib/timespinbox.cpp
+++ b/kalarm/lib/timespinbox.cpp
@@ -30,8 +30,8 @@
class TimeSpinBox::TimeValidator : public TQValidator
{
public:
- TimeValidator(int minMin, int maxMin, TQWidget* tqparent, const char* name = 0)
- : TQValidator(TQT_TQOBJECT(tqparent), name),
+ TimeValidator(int minMin, int maxMin, TQWidget* parent, const char* name = 0)
+ : TQValidator(TQT_TQOBJECT(parent), name),
minMinute(minMin), maxMinute(maxMin), m12Hour(false), mPm(false) { }
virtual State validate(TQString&, int&) const;
int minMinute, maxMinute;
@@ -54,8 +54,8 @@ class TimeSpinBox::TimeValidator : public TQValidator
/******************************************************************************
* Construct a wrapping 00:00 - 23:59, or 12:00 - 11:59 time spin box.
*/
-TimeSpinBox::TimeSpinBox(bool use24hour, TQWidget* tqparent, const char* name)
- : SpinBox2(0, 1439, 1, 60, tqparent, name),
+TimeSpinBox::TimeSpinBox(bool use24hour, TQWidget* parent, const char* name)
+ : SpinBox2(0, 1439, 1, 60, parent, name),
mMinimumValue(0),
m12Hour(!use24hour),
mPm(false),
@@ -76,8 +76,8 @@ TimeSpinBox::TimeSpinBox(bool use24hour, TQWidget* tqparent, const char* name)
/******************************************************************************
* Construct a non-wrapping time spin box.
*/
-TimeSpinBox::TimeSpinBox(int minMinute, int maxMinute, TQWidget* tqparent, const char* name)
- : SpinBox2(minMinute, maxMinute, 1, 60, tqparent, name),
+TimeSpinBox::TimeSpinBox(int minMinute, int maxMinute, TQWidget* parent, const char* name)
+ : SpinBox2(minMinute, maxMinute, 1, 60, parent, name),
mMinimumValue(minMinute),
m12Hour(false),
mInvalid(false),
diff --git a/kalarm/lib/timespinbox.h b/kalarm/lib/timespinbox.h
index 4bacd4947..0be232453 100644
--- a/kalarm/lib/timespinbox.h
+++ b/kalarm/lib/timespinbox.h
@@ -50,17 +50,17 @@ class TimeSpinBox : public SpinBox2
/** Constructor for a wrapping time spin box which can be used to enter a time of day.
* @param use24hour True for entry of 24-hour clock times (range 00:00 to 23:59).
* False for entry of 12-hour clock times (range 12:00 to 11:59).
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit TimeSpinBox(bool use24hour, TQWidget* tqparent = 0, const char* name = 0);
+ explicit TimeSpinBox(bool use24hour, TQWidget* parent = 0, const char* name = 0);
/** Constructor for a non-wrapping time spin box which can be used to enter a length of time.
* @param minMinute The minimum value which the spin box can hold, in minutes.
* @param maxMinute The maximum value which the spin box can hold, in minutes.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- TimeSpinBox(int minMinute, int maxMinute, TQWidget* tqparent = 0, const char* name = 0);
+ TimeSpinBox(int minMinute, int maxMinute, TQWidget* parent = 0, const char* name = 0);
/** Returns true if the spin box holds a valid value.
* An invalid value is displayed as asterisks.
*/
diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp
index aa334c670..3bef1a6f7 100644
--- a/kalarm/mainwindow.cpp
+++ b/kalarm/mainwindow.cpp
@@ -221,7 +221,7 @@ void MainWindow::readProperties(KConfig* config)
}
/******************************************************************************
-* Get the main main window, i.e. the tqparent of the system tray icon, or if
+* Get the main main window, i.e. the parent of the system tray icon, or if
* none, the first main window to be created. Visible windows take precedence
* over hidden ones.
*/
@@ -241,7 +241,7 @@ MainWindow* MainWindow::mainMainWindow()
}
/******************************************************************************
-* Check whether this main window is the tqparent of the system tray icon.
+* Check whether this main window is the parent of the system tray icon.
*/
bool MainWindow::isTrayParent() const
{
@@ -1118,7 +1118,7 @@ void MainWindow::closeEvent(TQCloseEvent* ce)
if (!theApp()->sessionClosingDown() && isTrayParent())
{
// The user (not the session manager) wants to close the window.
- // It's the tqparent window of the system tray icon, so just hide
+ // It's the parent window of the system tray icon, so just hide
// it to prevent the system tray icon closing.
hide();
theApp()->quitIf();
diff --git a/kalarm/mainwindowbase.h b/kalarm/mainwindowbase.h
index 45bb7fb66..a6ba5ed33 100644
--- a/kalarm/mainwindowbase.h
+++ b/kalarm/mainwindowbase.h
@@ -37,8 +37,8 @@ class MainWindowBase : public KMainWindow
TQ_OBJECT
public:
- explicit MainWindowBase(TQWidget* tqparent = 0, const char* name = 0, WFlags f = WType_TopLevel | WDestructiveClose)
- : KMainWindow(tqparent, name, f), disableQuit(false) { }
+ explicit MainWindowBase(TQWidget* parent = 0, const char* name = 0, WFlags f = WType_TopLevel | WDestructiveClose)
+ : KMainWindow(parent, name, f), disableQuit(false) { }
protected:
virtual void closeEvent(TQCloseEvent*);
diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp
index 6f0878c00..755a1e223 100644
--- a/kalarm/messagewin.cpp
+++ b/kalarm/messagewin.cpp
@@ -93,8 +93,8 @@ static bool wantModal();
class MessageText : public TQTextEdit
{
public:
- MessageText(const TQString& text, const TQString& context = TQString(), TQWidget* tqparent = 0, const char* name = 0)
- : TQTextEdit(text, context, tqparent, name)
+ MessageText(const TQString& text, const TQString& context = TQString(), TQWidget* parent = 0, const char* name = 0)
+ : TQTextEdit(text, context, parent, name)
{
setReadOnly(true);
setWordWrap(TQTextEdit::NoWrap);
diff --git a/kalarm/pickfileradio.cpp b/kalarm/pickfileradio.cpp
index dfe0f41a9..15b56d942 100644
--- a/kalarm/pickfileradio.cpp
+++ b/kalarm/pickfileradio.cpp
@@ -30,15 +30,15 @@
#include "pickfileradio.moc"
-PickFileRadio::PickFileRadio(TQPushButton* button, LineEdit* edit, const TQString& text, TQButtonGroup* tqparent, const char* name)
- : RadioButton(text, tqparent, name),
- mGroup(tqparent),
+PickFileRadio::PickFileRadio(TQPushButton* button, LineEdit* edit, const TQString& text, TQButtonGroup* parent, const char* name)
+ : RadioButton(text, parent, name),
+ mGroup(parent),
mEdit(edit),
mButton(button),
mLastId(-1), // set to an invalid value
mRevertId(false)
{
- Q_ASSERT(tqparent);
+ Q_ASSERT(parent);
Q_ASSERT(button);
mButton->setEnabled(false);
connect(mButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotPickFile()));
@@ -47,15 +47,15 @@ PickFileRadio::PickFileRadio(TQPushButton* button, LineEdit* edit, const TQStrin
connect(mGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotSelectionChanged(int)));
}
-PickFileRadio::PickFileRadio(const TQString& text, TQButtonGroup* tqparent, const char* name)
- : RadioButton(text, tqparent, name),
- mGroup(tqparent),
+PickFileRadio::PickFileRadio(const TQString& text, TQButtonGroup* parent, const char* name)
+ : RadioButton(text, parent, name),
+ mGroup(parent),
mEdit(0),
mButton(0),
mLastId(-1), // set to an invalid value
mRevertId(false)
{
- Q_ASSERT(tqparent);
+ Q_ASSERT(parent);
}
void PickFileRadio::init(TQPushButton* button, LineEdit* edit)
diff --git a/kalarm/pickfileradio.h b/kalarm/pickfileradio.h
index a8d12383e..72b431102 100644
--- a/kalarm/pickfileradio.h
+++ b/kalarm/pickfileradio.h
@@ -38,7 +38,7 @@ class LineEdit;
* To achieve this, whenever the button is newly selected and the
* file name is currently blank, the file picker dialogue is displayed to choose a
* file. If the dialogue exits without a file being chosen, the radio button selection
- * is reverted to the previously selected button in the tqparent button group.
+ * is reverted to the previously selected button in the parent button group.
*
* The class handles the activation of the file picker dialogue (via a virtual method
* which must be supplied by deriving a class from this one). It also handles all
@@ -56,17 +56,17 @@ class PickFileRadio : public RadioButton
* @param button Push button to invoke the file picker dialogue.
* @param edit File name edit widget, or null if there is none.
* @param text Radio button's text.
- * @param tqparent Button group which is to be the tqparent object for the radio button.
+ * @param parent Button group which is to be the parent object for the radio button.
* @param name The name of this widget.
*/
- PickFileRadio(TQPushButton* button, LineEdit* edit, const TQString& text, TQButtonGroup* tqparent, const char* name = 0);
+ PickFileRadio(TQPushButton* button, LineEdit* edit, const TQString& text, TQButtonGroup* parent, const char* name = 0);
/** Constructor.
* The init() method must be called before the widget can be used.
* @param text Radio button's text.
- * @param tqparent Button group which is to be the tqparent object for the radio button.
+ * @param parent Button group which is to be the parent object for the radio button.
* @param name The name of this widget.
*/
- PickFileRadio(const TQString& text, TQButtonGroup* tqparent, const char* name = 0);
+ PickFileRadio(const TQString& text, TQButtonGroup* parent, const char* name = 0);
/** Initialises the widget.
* @param button Push button to invoke the file picker dialogue.
* @param edit File name edit widget, or null if there is none.
diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp
index 264824b3c..2a10c1a33 100644
--- a/kalarm/recurrenceedit.cpp
+++ b/kalarm/recurrenceedit.cpp
@@ -82,8 +82,8 @@ TQString RecurrenceEdit::i18n_Yearly() { return i18n("Yearly"); }
TQString RecurrenceEdit::i18n_y_Yearly() { return i18n("&Yearly"); }
-RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* tqparent, const char* name)
- : TQFrame(tqparent, name),
+RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name)
+ : TQFrame(parent, name),
mRule(0),
mRuleButtonType(INVALID_RECUR),
mDailyShown(false),
@@ -1019,8 +1019,8 @@ bool RecurrenceEdit::stateChanged() const
= Base class for rule widgets, including recurrence frequency.
=============================================================================*/
-Rule::Rule(const TQString& freqText, const TQString& freqWhatsThis, bool time, bool readOnly, TQWidget* tqparent, const char* name)
- : NoRule(tqparent, name)
+Rule::Rule(const TQString& freqText, const TQString& freqWhatsThis, bool time, bool readOnly, TQWidget* parent, const char* name)
+ : NoRule(parent, name)
{
mLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
TQHBox* freqBox = new TQHBox(this);
@@ -1095,10 +1095,10 @@ bool Rule::stateChanged() const
= Sub-daily rule widget.
=============================================================================*/
-SubDailyRule::SubDailyRule(bool readOnly, TQWidget* tqparent, const char* name)
+SubDailyRule::SubDailyRule(bool readOnly, TQWidget* parent, const char* name)
: Rule(i18n("hours:minutes"),
i18n("Enter the number of hours and minutes between repetitions of the alarm"),
- true, readOnly, tqparent, name)
+ true, readOnly, parent, name)
{ }
@@ -1108,8 +1108,8 @@ SubDailyRule::SubDailyRule(bool readOnly, TQWidget* tqparent, const char* name)
=============================================================================*/
DayWeekRule::DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis, const TQString& daysWhatsThis,
- bool readOnly, TQWidget* tqparent, const char* name)
- : Rule(freqText, freqWhatsThis, false, readOnly, tqparent, name),
+ bool readOnly, TQWidget* parent, const char* name)
+ : Rule(freqText, freqWhatsThis, false, readOnly, parent, name),
mSavedDays(7)
{
TQGridLayout* grid = new TQGridLayout(tqlayout(), 1, 4, KDialog::spacingHint());
@@ -1221,11 +1221,11 @@ bool DayWeekRule::stateChanged() const
= Daily rule widget.
=============================================================================*/
-DailyRule::DailyRule(bool readOnly, TQWidget* tqparent, const char* name)
+DailyRule::DailyRule(bool readOnly, TQWidget* parent, const char* name)
: DayWeekRule(i18n("day(s)"),
i18n("Enter the number of days between repetitions of the alarm"),
i18n("Select the days of the week on which the alarm is allowed to occur"),
- readOnly, tqparent, name)
+ readOnly, parent, name)
{ }
@@ -1234,11 +1234,11 @@ DailyRule::DailyRule(bool readOnly, TQWidget* tqparent, const char* name)
= Weekly rule widget.
=============================================================================*/
-WeeklyRule::WeeklyRule(bool readOnly, TQWidget* tqparent, const char* name)
+WeeklyRule::WeeklyRule(bool readOnly, TQWidget* parent, const char* name)
: DayWeekRule(i18n("week(s)"),
i18n("Enter the number of weeks between repetitions of the alarm"),
i18n("Select the days of the week on which to repeat the alarm"),
- readOnly, tqparent, name)
+ readOnly, parent, name)
{ }
@@ -1248,8 +1248,8 @@ WeeklyRule::WeeklyRule(bool readOnly, TQWidget* tqparent, const char* name)
=============================================================================*/
MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhatsThis, bool allowEveryWeek,
- bool readOnly, TQWidget* tqparent, const char* name)
- : Rule(freqText, freqWhatsThis, false, readOnly, tqparent, name),
+ bool readOnly, TQWidget* parent, const char* name)
+ : Rule(freqText, freqWhatsThis, false, readOnly, parent, name),
mEveryWeek(allowEveryWeek)
{
mButtonGroup = new ButtonGroup(this);
@@ -1438,10 +1438,10 @@ bool MonthYearRule::stateChanged() const
= Monthly rule widget.
=============================================================================*/
-MonthlyRule::MonthlyRule(bool readOnly, TQWidget* tqparent, const char* name)
+MonthlyRule::MonthlyRule(bool readOnly, TQWidget* parent, const char* name)
: MonthYearRule(i18n("month(s)"),
i18n("Enter the number of months between repetitions of the alarm"),
- false, readOnly, tqparent, name)
+ false, readOnly, parent, name)
{ }
@@ -1450,10 +1450,10 @@ MonthlyRule::MonthlyRule(bool readOnly, TQWidget* tqparent, const char* name)
= Yearly rule widget.
=============================================================================*/
-YearlyRule::YearlyRule(bool readOnly, TQWidget* tqparent, const char* name)
+YearlyRule::YearlyRule(bool readOnly, TQWidget* parent, const char* name)
: MonthYearRule(i18n("year(s)"),
i18n("Enter the number of years between repetitions of the alarm"),
- true, readOnly, tqparent, name)
+ true, readOnly, parent, name)
{
// Set up the month selection widgets
TQBoxLayout* htqlayout = new TQHBoxLayout(tqlayout(), KDialog::spacingHint());
diff --git a/kalarm/recurrenceedit.h b/kalarm/recurrenceedit.h
index 893b4456d..5b3aae479 100644
--- a/kalarm/recurrenceedit.h
+++ b/kalarm/recurrenceedit.h
@@ -61,7 +61,7 @@ class RecurrenceEdit : public TQFrame
// Don't alter the order of these recurrence types
enum RepeatType { INVALID_RECUR = -1, NO_RECUR, AT_LOGIN, SUBDAILY, DAILY, WEEKLY, MONTHLY, ANNUAL };
- RecurrenceEdit(bool readOnly, TQWidget* tqparent, const char* name = 0);
+ RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name = 0);
virtual ~RecurrenceEdit() { }
/** Set widgets to default values */
diff --git a/kalarm/recurrenceeditprivate.h b/kalarm/recurrenceeditprivate.h
index 659921d5b..68dd429b9 100644
--- a/kalarm/recurrenceeditprivate.h
+++ b/kalarm/recurrenceeditprivate.h
@@ -39,7 +39,7 @@ class TQString;
class NoRule : public TQFrame
{
public:
- NoRule(TQWidget* tqparent, const char* name = 0) : TQFrame(tqparent, name)
+ NoRule(TQWidget* parent, const char* name = 0) : TQFrame(parent, name)
{ setFrameStyle(TQFrame::NoFrame); }
virtual int frequency() const { return 0; }
};
@@ -50,7 +50,7 @@ class Rule : public NoRule
TQ_OBJECT
public:
Rule(const TQString& freqText, const TQString& freqWhatsThis, bool time, bool readOnly,
- TQWidget* tqparent, const char* name = 0);
+ TQWidget* parent, const char* name = 0);
int frequency() const;
void setFrequency(int);
virtual void setFrequencyFocus() { mSpinBox->setFocus(); }
@@ -75,7 +75,7 @@ class SubDailyRule : public Rule
Q_OBJECT
TQ_OBJECT
public:
- SubDailyRule(bool readOnly, TQWidget* tqparent, const char* name = 0);
+ SubDailyRule(bool readOnly, TQWidget* parent, const char* name = 0);
};
// Daily/weekly rule choices base class
@@ -85,7 +85,7 @@ class DayWeekRule : public Rule
TQ_OBJECT
public:
DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis, const TQString& daysWhatsThis,
- bool readOnly, TQWidget* tqparent, const char* name = 0);
+ bool readOnly, TQWidget* parent, const char* name = 0);
TQBitArray days() const;
void setDays(bool);
void setDays(const TQBitArray& days);
@@ -103,14 +103,14 @@ class DayWeekRule : public Rule
class DailyRule : public DayWeekRule
{
public:
- DailyRule(bool readOnly, TQWidget* tqparent, const char* name = 0);
+ DailyRule(bool readOnly, TQWidget* parent, const char* name = 0);
};
// Weekly rule choices
class WeeklyRule : public DayWeekRule
{
public:
- WeeklyRule(bool readOnly, TQWidget* tqparent, const char* name = 0);
+ WeeklyRule(bool readOnly, TQWidget* parent, const char* name = 0);
};
// Monthly/yearly rule choices base class
@@ -122,7 +122,7 @@ class MonthYearRule : public Rule
enum DayPosType { DATE, POS };
MonthYearRule(const TQString& freqText, const TQString& freqWhatsThis, bool allowEveryWeek,
- bool readOnly, TQWidget* tqparent, const char* name = 0);
+ bool readOnly, TQWidget* parent, const char* name = 0);
DayPosType type() const;
int date() const; // if date in month is selected
int week() const; // if position is selected
@@ -165,7 +165,7 @@ class MonthYearRule : public Rule
class MonthlyRule : public MonthYearRule
{
public:
- MonthlyRule(bool readOnly, TQWidget* tqparent, const char* name = 0);
+ MonthlyRule(bool readOnly, TQWidget* parent, const char* name = 0);
};
// Yearly rule choices
@@ -174,7 +174,7 @@ class YearlyRule : public MonthYearRule
Q_OBJECT
TQ_OBJECT
public:
- YearlyRule(bool readOnly, TQWidget* tqparent, const char* name = 0);
+ YearlyRule(bool readOnly, TQWidget* parent, const char* name = 0);
TQValueList months() const;
void setMonths(const TQValueList& months);
void setDefaultValues(int dayOfMonth, int dayOfWeek, int month);
diff --git a/kalarm/reminder.cpp b/kalarm/reminder.cpp
index ee197e73a..e10e04e22 100644
--- a/kalarm/reminder.cpp
+++ b/kalarm/reminder.cpp
@@ -41,8 +41,8 @@ TQString Reminder::i18n_u_first_recurrence_only() { return i18n("Reminder for fi
Reminder::Reminder(const TQString& caption, const TQString& reminderWhatsThis, const TQString& valueWhatsThis,
- bool allowHourMinute, bool showOnceOnly, TQWidget* tqparent, const char* name)
- : TQFrame(tqparent, name),
+ bool allowHourMinute, bool showOnceOnly, TQWidget* parent, const char* name)
+ : TQFrame(parent, name),
mReadOnly(false),
mOnceOnlyEnabled(showOnceOnly)
{
diff --git a/kalarm/reminder.h b/kalarm/reminder.h
index f9e2b57fc..7e58e8b71 100644
--- a/kalarm/reminder.h
+++ b/kalarm/reminder.h
@@ -33,7 +33,7 @@ class Reminder : public TQFrame
TQ_OBJECT
public:
Reminder(const TQString& caption, const TQString& reminderWhatsThis, const TQString& valueWhatsThis,
- bool allowHourMinute, bool showOnceOnly, TQWidget* tqparent, const char* name = 0);
+ bool allowHourMinute, bool showOnceOnly, TQWidget* parent, const char* name = 0);
bool isReminder() const;
bool isOnceOnly() const;
int minutes() const;
diff --git a/kalarm/repetition.cpp b/kalarm/repetition.cpp
index 5dac94dcf..403250ba5 100644
--- a/kalarm/repetition.cpp
+++ b/kalarm/repetition.cpp
@@ -40,8 +40,8 @@
= Button to display the Alarm Sub-Repetition dialogue.
=============================================================================*/
-RepetitionButton::RepetitionButton(const TQString& caption, bool waitForInitialisation, TQWidget* tqparent, const char* name)
- : TQPushButton(caption, tqparent, name),
+RepetitionButton::RepetitionButton(const TQString& caption, bool waitForInitialisation, TQWidget* parent, const char* name)
+ : TQPushButton(caption, parent, name),
mDialog(0),
mInterval(0),
mCount(0),
@@ -149,8 +149,8 @@ void RepetitionButton::displayDialog()
static const int MAX_COUNT = 9999; // maximum range for count spinbox
-RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* tqparent, const char* name)
- : KDialogBase(tqparent, name, true, caption, Ok|Cancel),
+RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* parent, const char* name)
+ : KDialogBase(parent, name, true, caption, Ok|Cancel),
mMaxDuration(-1),
mDateOnly(false),
mReadOnly(readOnly)
diff --git a/kalarm/repetition.h b/kalarm/repetition.h
index c2b0ebd6c..a98493c55 100644
--- a/kalarm/repetition.h
+++ b/kalarm/repetition.h
@@ -37,7 +37,7 @@ class RepetitionButton : public TQPushButton
Q_OBJECT
TQ_OBJECT
public:
- RepetitionButton(const TQString& caption, bool waitForInitialisation, TQWidget* tqparent, const char* name = 0);
+ RepetitionButton(const TQString& caption, bool waitForInitialisation, TQWidget* parent, const char* name = 0);
void set(int interval, int count);
void set(int interval, int count, bool dateOnly, int maxDuration = -1);
void initialise(int interval, int count, bool dateOnly, int maxDuration = -1); // use only after needsInitialisation() signal
@@ -73,7 +73,7 @@ class RepetitionDlg : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* tqparent = 0, const char* name = 0);
+ RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* parent = 0, const char* name = 0);
void setReadOnly(bool);
void set(int interval, int count, bool dateOnly = false, int maxDuration = -1);
int interval() const; // get the interval between repetitions, in minutes
diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp
index feb53bd68..c7a6adcfb 100644
--- a/kalarm/sounddlg.cpp
+++ b/kalarm/sounddlg.cpp
@@ -69,8 +69,8 @@ static const char SOUND_DIALOG_NAME[] = "SoundDialog";
SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fadeSeconds, bool repeat,
- const TQString& caption, TQWidget* tqparent, const char* name)
- : KDialogBase(tqparent, name, true, caption, Ok|Cancel, Ok, false),
+ const TQString& caption, TQWidget* parent, const char* name)
+ : KDialogBase(parent, name, true, caption, Ok|Cancel, Ok, false),
mReadOnly(false),
mArtsDispatcher(0),
mPlayObject(0),
diff --git a/kalarm/sounddlg.h b/kalarm/sounddlg.h
index bcc8dd92d..53dd2f96b 100644
--- a/kalarm/sounddlg.h
+++ b/kalarm/sounddlg.h
@@ -42,7 +42,7 @@ class SoundDlg : public KDialogBase
TQ_OBJECT
public:
SoundDlg(const TQString& file, float volume, float fadeVolume, int fadeSeconds, bool repeat,
- const TQString& caption, TQWidget* tqparent, const char* name = 0);
+ const TQString& caption, TQWidget* parent, const char* name = 0);
~SoundDlg();
void setReadOnly(bool);
bool isReadOnly() const { return mReadOnly; }
diff --git a/kalarm/soundpicker.cpp b/kalarm/soundpicker.cpp
index c6915601b..ed55b8112 100644
--- a/kalarm/soundpicker.cpp
+++ b/kalarm/soundpicker.cpp
@@ -55,8 +55,8 @@ TQString SoundPicker::i18n_Speak() { return i18n("Speak"); }
TQString SoundPicker::i18n_File() { return i18n("Sound file"); }
-SoundPicker::SoundPicker(TQWidget* tqparent, const char* name)
- : TQFrame(tqparent, name)
+SoundPicker::SoundPicker(TQWidget* parent, const char* name)
+ : TQFrame(parent, name)
{
setFrameStyle(TQFrame::NoFrame);
TQHBoxLayout* soundLayout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
diff --git a/kalarm/soundpicker.h b/kalarm/soundpicker.h
index eaf0ec16b..5f89d5354 100644
--- a/kalarm/soundpicker.h
+++ b/kalarm/soundpicker.h
@@ -43,10 +43,10 @@ class SoundPicker : public TQFrame
*/
enum Type { NONE = 0, BEEP, PLAY_FILE, SPEAK };
/** Constructor.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit SoundPicker(TQWidget* tqparent, const char* name = 0);
+ explicit SoundPicker(TQWidget* parent, const char* name = 0);
/** Initialises the widget's state.
* @param type The option to select.
* @param filename The full path or URL of the sound file to select. If the 'file' option is
diff --git a/kalarm/specialactions.cpp b/kalarm/specialactions.cpp
index 919524aff..02a0543f0 100644
--- a/kalarm/specialactions.cpp
+++ b/kalarm/specialactions.cpp
@@ -40,8 +40,8 @@
= Button to display the Special Alarm Actions dialogue.
=============================================================================*/
-SpecialActionsButton::SpecialActionsButton(const TQString& caption, TQWidget* tqparent, const char* name)
- : TQPushButton(caption, tqparent, name),
+SpecialActionsButton::SpecialActionsButton(const TQString& caption, TQWidget* parent, const char* name)
+ : TQPushButton(caption, parent, name),
mReadOnly(false)
{
setToggleButton(true);
@@ -90,8 +90,8 @@ static const char SPEC_ACT_DIALOG_NAME[] = "SpecialActionsDialog";
SpecialActionsDlg::SpecialActionsDlg(const TQString& preAction, const TQString& postAction,
- const TQString& caption, TQWidget* tqparent, const char* name)
- : KDialogBase(tqparent, name, true, caption, Ok|Cancel, Ok, false)
+ const TQString& caption, TQWidget* parent, const char* name)
+ : KDialogBase(parent, name, true, caption, Ok|Cancel, Ok, false)
{
TQWidget* page = new TQWidget(this);
setMainWidget(page);
@@ -134,8 +134,8 @@ void SpecialActionsDlg::resizeEvent(TQResizeEvent* re)
= Pre- and post-alarm actions widget.
=============================================================================*/
-SpecialActions::SpecialActions(TQWidget* tqparent, const char* name)
- : TQWidget(tqparent, name),
+SpecialActions::SpecialActions(TQWidget* parent, const char* name)
+ : TQWidget(parent, name),
mReadOnly(false)
{
TQBoxLayout* topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
diff --git a/kalarm/specialactions.h b/kalarm/specialactions.h
index 58f5c7d62..43d8cdf9d 100644
--- a/kalarm/specialactions.h
+++ b/kalarm/specialactions.h
@@ -33,7 +33,7 @@ class SpecialActionsButton : public TQPushButton
Q_OBJECT
TQ_OBJECT
public:
- SpecialActionsButton(const TQString& caption, TQWidget* tqparent = 0, const char* name = 0);
+ SpecialActionsButton(const TQString& caption, TQWidget* parent = 0, const char* name = 0);
void setActions(const TQString& pre, const TQString& post);
const TQString& preAction() const { return mPreAction; }
const TQString& postAction() const { return mPostAction; }
@@ -59,7 +59,7 @@ class SpecialActions : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- SpecialActions(TQWidget* tqparent = 0, const char* name = 0);
+ SpecialActions(TQWidget* parent = 0, const char* name = 0);
void setActions(const TQString& pre, const TQString& post);
TQString preAction() const;
TQString postAction() const;
@@ -80,7 +80,7 @@ class SpecialActionsDlg : public KDialogBase
TQ_OBJECT
public:
SpecialActionsDlg(const TQString& preAction, const TQString& postAction,
- const TQString& caption, TQWidget* tqparent = 0, const char* name = 0);
+ const TQString& caption, TQWidget* parent = 0, const char* name = 0);
TQString preAction() const { return mActions->preAction(); }
TQString postAction() const { return mActions->postAction(); }
void setReadOnly(bool ro) { mActions->setReadOnly(ro); }
diff --git a/kalarm/templatedlg.cpp b/kalarm/templatedlg.cpp
index 64a247c7d..fa176f8b9 100644
--- a/kalarm/templatedlg.cpp
+++ b/kalarm/templatedlg.cpp
@@ -43,8 +43,8 @@ static const char TMPL_DIALOG_NAME[] = "TemplateDialog";
TemplateDlg* TemplateDlg::mInstance = 0;
-TemplateDlg::TemplateDlg(TQWidget* tqparent, const char* name)
- : KDialogBase(KDialogBase::Plain, i18n("Alarm Templates"), Close, Ok, tqparent, name, false, true)
+TemplateDlg::TemplateDlg(TQWidget* parent, const char* name)
+ : KDialogBase(KDialogBase::Plain, i18n("Alarm Templates"), Close, Ok, parent, name, false, true)
{
TQWidget* topWidget = plainPage();
TQBoxLayout* topLayout = new TQHBoxLayout(topWidget);
@@ -103,11 +103,11 @@ TemplateDlg::~TemplateDlg()
/******************************************************************************
* Create an instance, if none already exists.
*/
-TemplateDlg* TemplateDlg::create(TQWidget* tqparent, const char* name)
+TemplateDlg* TemplateDlg::create(TQWidget* parent, const char* name)
{
if (mInstance)
return 0;
- mInstance = new TemplateDlg(tqparent, name);
+ mInstance = new TemplateDlg(parent, name);
return mInstance;
}
@@ -138,9 +138,9 @@ void TemplateDlg::slotCopy()
* Create a new template.
* If 'event' is non-zero, base the new template on an existing event or template.
*/
-void TemplateDlg::createTemplate(const KAEvent* event, TQWidget* tqparent, TemplateListView* view)
+void TemplateDlg::createTemplate(const KAEvent* event, TQWidget* parent, TemplateListView* view)
{
- EditAlarmDlg editDlg(true, i18n("New Alarm Template"), tqparent, 0, event);
+ EditAlarmDlg editDlg(true, i18n("New Alarm Template"), parent, 0, event);
if (editDlg.exec() == TQDialog::Accepted)
{
KAEvent event;
diff --git a/kalarm/templatedlg.h b/kalarm/templatedlg.h
index 18ff7224c..7ea6fbef9 100644
--- a/kalarm/templatedlg.h
+++ b/kalarm/templatedlg.h
@@ -32,9 +32,9 @@ class TemplateDlg : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- static TemplateDlg* create(TQWidget* tqparent = 0, const char* name = 0);
+ static TemplateDlg* create(TQWidget* parent = 0, const char* name = 0);
~TemplateDlg();
- static void createTemplate(const KAEvent* = 0, TQWidget* tqparent = 0, TemplateListView* = 0);
+ static void createTemplate(const KAEvent* = 0, TQWidget* parent = 0, TemplateListView* = 0);
signals:
void emptyToggled(bool notEmpty);
@@ -50,7 +50,7 @@ class TemplateDlg : public KDialogBase
void slotSelectionChanged();
private:
- TemplateDlg(TQWidget* tqparent, const char* name);
+ TemplateDlg(TQWidget* parent, const char* name);
static TemplateDlg* mInstance; // the current instance, to prevent multiple dialogues
diff --git a/kalarm/templatelistview.cpp b/kalarm/templatelistview.cpp
index 435789ce4..ac2852a7f 100644
--- a/kalarm/templatelistview.cpp
+++ b/kalarm/templatelistview.cpp
@@ -35,8 +35,8 @@
TQValueList TemplateListView::mInstanceList;
-TemplateListView::TemplateListView(bool includeCmdAlarms, const TQString& whatsThisText, TQWidget* tqparent, const char* name)
- : EventListViewBase(tqparent, name),
+TemplateListView::TemplateListView(bool includeCmdAlarms, const TQString& whatsThisText, TQWidget* parent, const char* name)
+ : EventListViewBase(parent, name),
mWhatsThisText(whatsThisText),
mIconColumn(0),
mNameColumn(1),
@@ -92,8 +92,8 @@ TQString TemplateListView::whatsThisText(int column) const
= Contains the details of one alarm for display in the TemplateListView.
=============================================================================*/
-TemplateListViewItem::TemplateListViewItem(TemplateListView* tqparent, const KAEvent& event)
- : EventListViewItemBase(tqparent, event)
+TemplateListViewItem::TemplateListViewItem(TemplateListView* parent, const KAEvent& event)
+ : EventListViewItemBase(parent, event)
{
setLastColumnText(); // set the template name column text
diff --git a/kalarm/templatelistview.h b/kalarm/templatelistview.h
index 512b1ad91..0ac98dea8 100644
--- a/kalarm/templatelistview.h
+++ b/kalarm/templatelistview.h
@@ -34,7 +34,7 @@ class TemplateListView;
class TemplateListViewItem : public EventListViewItemBase
{
public:
- TemplateListViewItem(TemplateListView* tqparent, const KAEvent&);
+ TemplateListViewItem(TemplateListView* parent, const KAEvent&);
TemplateListView* templateListView() const { return (TemplateListView*)listView(); }
// Overridden base class methods
TemplateListViewItem* nextSibling() const { return (TemplateListViewItem*)TQListViewItem::nextSibling(); }
@@ -51,7 +51,7 @@ class TemplateListView : public EventListViewBase
Q_OBJECT
TQ_OBJECT
public:
- explicit TemplateListView(bool includeCmdAlarms, const TQString& whatsThisText, TQWidget* tqparent = 0, const char* name = 0);
+ explicit TemplateListView(bool includeCmdAlarms, const TQString& whatsThisText, TQWidget* parent = 0, const char* name = 0);
~TemplateListView();
int iconColumn() const { return mIconColumn; }
int nameColumn() const { return mNameColumn; }
diff --git a/kalarm/templatemenuaction.h b/kalarm/templatemenuaction.h
index e32293690..3859a29a5 100644
--- a/kalarm/templatemenuaction.h
+++ b/kalarm/templatemenuaction.h
@@ -31,7 +31,7 @@ class TemplateMenuAction : public KActionMenu
TQ_OBJECT
public:
TemplateMenuAction(const TQString& label, const TQString& icon, TQObject* receiver,
- const char* slot, KActionCollection* tqparent, const char* name = 0);
+ const char* slot, KActionCollection* parent, const char* name = 0);
signals:
void selected(const KAEvent&);
diff --git a/kalarm/templatepickdlg.cpp b/kalarm/templatepickdlg.cpp
index fd0a5ebf8..3df2d8dd7 100644
--- a/kalarm/templatepickdlg.cpp
+++ b/kalarm/templatepickdlg.cpp
@@ -34,8 +34,8 @@
static const char TMPL_PICK_DIALOG_NAME[] = "TemplatePickDialog";
-TemplatePickDlg::TemplatePickDlg(TQWidget* tqparent, const char* name)
- : KDialogBase(KDialogBase::Plain, i18n("Choose Alarm Template"), Ok|Cancel, Ok, tqparent, name)
+TemplatePickDlg::TemplatePickDlg(TQWidget* parent, const char* name)
+ : KDialogBase(KDialogBase::Plain, i18n("Choose Alarm Template"), Ok|Cancel, Ok, parent, name)
{
TQWidget* topWidget = plainPage();
TQBoxLayout* topLayout = new TQVBoxLayout(topWidget);
diff --git a/kalarm/templatepickdlg.h b/kalarm/templatepickdlg.h
index 7c99f6f35..4cbfc3d1a 100644
--- a/kalarm/templatepickdlg.h
+++ b/kalarm/templatepickdlg.h
@@ -31,7 +31,7 @@ class TemplatePickDlg : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- TemplatePickDlg(TQWidget* tqparent = 0, const char* name = 0);
+ TemplatePickDlg(TQWidget* parent = 0, const char* name = 0);
const KAEvent* selectedTemplate() const;
protected:
virtual void resizeEvent(TQResizeEvent*);
diff --git a/kalarm/timeselector.cpp b/kalarm/timeselector.cpp
index 0c88d93c5..31e69d749 100644
--- a/kalarm/timeselector.cpp
+++ b/kalarm/timeselector.cpp
@@ -34,8 +34,8 @@
TimeSelector::TimeSelector(const TQString& selectText, const TQString& postfix, const TQString& selectWhatsThis,
- const TQString& valueWhatsThis, bool allowHourMinute, TQWidget* tqparent, const char* name)
- : TQFrame(tqparent, name),
+ const TQString& valueWhatsThis, bool allowHourMinute, TQWidget* parent, const char* name)
+ : TQFrame(parent, name),
mLabel(0),
mReadOnly(false)
{
diff --git a/kalarm/timeselector.h b/kalarm/timeselector.h
index 1508194c7..1e8304f95 100644
--- a/kalarm/timeselector.h
+++ b/kalarm/timeselector.h
@@ -34,7 +34,7 @@ class TimeSelector : public TQFrame
TQ_OBJECT
public:
TimeSelector(const TQString& selectText, const TQString& postfix, const TQString& selectWhatsThis,
- const TQString& valueWhatsThis, bool allowHourMinute, TQWidget* tqparent, const char* name = 0);
+ const TQString& valueWhatsThis, bool allowHourMinute, TQWidget* parent, const char* name = 0);
bool isChecked() const;
void setChecked(bool on);
int minutes() const;
diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp
index 21efed812..906ff2cc5 100644
--- a/kalarm/traywindow.cpp
+++ b/kalarm/traywindow.cpp
@@ -53,7 +53,7 @@
class TrayTooltip : public TQToolTip
{
public:
- TrayTooltip(TQWidget* tqparent) : TQToolTip(tqparent) { }
+ TrayTooltip(TQWidget* parent) : TQToolTip(parent) { }
virtual ~TrayTooltip() {}
protected:
virtual void maybeTip(const TQPoint&);
@@ -71,9 +71,9 @@ struct TipItem
= The KDE system tray window.
=============================================================================*/
-TrayWindow::TrayWindow(MainWindow* tqparent, const char* name)
- : KSystemTray((theApp()->wantRunInSystemTray() ? tqparent : 0), name),
- mAssocMainWindow(tqparent)
+TrayWindow::TrayWindow(MainWindow* parent, const char* name)
+ : KSystemTray((theApp()->wantRunInSystemTray() ? parent : 0), name),
+ mAssocMainWindow(parent)
{
kdDebug(5950) << "TrayWindow::TrayWindow()\n";
// Set up GUI icons
@@ -316,7 +316,7 @@ void TrayWindow::removeWindow(MainWindow* win)
/******************************************************************************
* Check whether the widget is in the system tray.
* Note that it is only sometime AFTER the show event that the system tray
-* becomes the widget's tqparent. So for a definitive status, call this method
+* becomes the widget's parent. So for a definitive status, call this method
* only after waiting a bit...
* Reply = true if the widget is in the system tray, or its status can't be determined.
* = false if it is not currently in the system tray.
@@ -324,18 +324,18 @@ void TrayWindow::removeWindow(MainWindow* win)
bool TrayWindow::inSystemTray() const
{
#ifdef HAVE_X11_HEADERS
- Window xParent; // receives tqparent window
+ Window xParent; // receives parent window
Window root;
Window* tqchildren = 0;
unsigned int ntqchildren;
- // Find the X tqparent window of the widget. This is not the same as the TQt tqparent widget.
+ // Find the X parent window of the widget. This is not the same as the TQt parent widget.
if (!XQueryTree(qt_xdisplay(), winId(), &root, &xParent, &tqchildren, &ntqchildren))
- return true; // error determining its tqparent X window
+ return true; // error determining its parent X window
if (tqchildren)
XFree(tqchildren);
- // If it is in the system tray, the system tray window will be its X tqparent.
- // Otherwise, the root window will be its X tqparent.
+ // If it is in the system tray, the system tray window will be its X parent.
+ // Otherwise, the root window will be its X parent.
return xParent != root;
#else
return true;
@@ -348,7 +348,7 @@ bool TrayWindow::inSystemTray() const
*/
void TrayTooltip::maybeTip(const TQPoint&)
{
- TrayWindow* tqparent = (TrayWindow*)parentWidget();
+ TrayWindow* parent = (TrayWindow*)parentWidget();
TQString text;
if (Daemon::monitoringAlarms())
text = kapp->aboutData()->programName();
@@ -356,6 +356,6 @@ void TrayTooltip::maybeTip(const TQPoint&)
text = i18n("%1 - disabled").tqarg(kapp->aboutData()->programName());
kdDebug(5950) << "TrayTooltip::maybeTip(): " << text << endl;
if (Preferences::tooltipAlarmCount())
- tqparent->tooltipAlarmText(text);
- tip(tqparent->rect(), text);
+ parent->tooltipAlarmText(text);
+ tip(parent->rect(), text);
}
diff --git a/kalarm/traywindow.h b/kalarm/traywindow.h
index 371082cc4..e1d9ff078 100644
--- a/kalarm/traywindow.h
+++ b/kalarm/traywindow.h
@@ -34,7 +34,7 @@ class TrayWindow : public KSystemTray
Q_OBJECT
TQ_OBJECT
public:
- TrayWindow(MainWindow* tqparent, const char* name = 0);
+ TrayWindow(MainWindow* parent, const char* name = 0);
~TrayWindow();
void removeWindow(MainWindow*);
MainWindow* assocMainWindow() const { return mAssocMainWindow; }
diff --git a/kalarm/undo.cpp b/kalarm/undo.cpp
index 4d951c17f..63168f45e 100644
--- a/kalarm/undo.cpp
+++ b/kalarm/undo.cpp
@@ -320,7 +320,7 @@ void Undo::removeRedos(const TQString& eventID)
* Undo or redo a specified item.
* Reply = true if success, or if the item no longer exists.
*/
-bool Undo::undo(Undo::Iterator it, Undo::Type type, TQWidget* tqparent, const TQString& action)
+bool Undo::undo(Undo::Iterator it, Undo::Type type, TQWidget* parent, const TQString& action)
{
UndoItem::mRestoreError = UndoItem::ERR_NONE;
UndoItem::mRestoreWarning = UndoItem::WARN_NONE;
@@ -347,7 +347,7 @@ bool Undo::undo(Undo::Iterator it, Undo::Type type, TQWidget* tqparent, const TQ
default:
return true;
}
- KAlarm::displayKOrgUpdateError(tqparent, errcode, UndoItem::mRestoreWarningCount);
+ KAlarm::displayKOrgUpdateError(parent, errcode, UndoItem::mRestoreWarningCount);
return true;
}
case UndoItem::ERR_NOT_FOUND: err = i18n("Alarm not found"); break;
@@ -357,7 +357,7 @@ bool Undo::undo(Undo::Iterator it, Undo::Type type, TQWidget* tqparent, const TQ
case UndoItem::ERR_PROG: err = i18n("Program error"); break;
default: err = i18n("Unknown error"); break;
}
- KMessageBox::sorry(tqparent, i18n("Undo-action: message", "%1: %2").tqarg(action).tqarg(err));
+ KMessageBox::sorry(parent, i18n("Undo-action: message", "%1: %2").tqarg(action).tqarg(err));
return false;
}
diff --git a/kalarm/undo.h b/kalarm/undo.h
index 2bc2ca1e5..6ad5dd513 100644
--- a/kalarm/undo.h
+++ b/kalarm/undo.h
@@ -44,14 +44,14 @@ class Undo : public TQObject
static void saveDeletes(const TQValueList&);
static void saveReactivate(const KAEvent&);
static void saveReactivates(const TQValueList&);
- static bool undo(TQWidget* tqparent, const TQString& action)
- { return undo(mUndoList.begin(), UNDO, tqparent, action); }
- static bool undo(int id, TQWidget* tqparent, const TQString& action)
- { return undo(findItem(id, UNDO), UNDO, tqparent, action); }
- static bool redo(TQWidget* tqparent, const TQString& action)
- { return undo(mRedoList.begin(), REDO, tqparent, action); }
- static bool redo(int id, TQWidget* tqparent, const TQString& action)
- { return undo(findItem(id, REDO), REDO, tqparent, action); }
+ static bool undo(TQWidget* parent, const TQString& action)
+ { return undo(mUndoList.begin(), UNDO, parent, action); }
+ static bool undo(int id, TQWidget* parent, const TQString& action)
+ { return undo(findItem(id, UNDO), UNDO, parent, action); }
+ static bool redo(TQWidget* parent, const TQString& action)
+ { return undo(mRedoList.begin(), REDO, parent, action); }
+ static bool redo(int id, TQWidget* parent, const TQString& action)
+ { return undo(findItem(id, REDO), REDO, parent, action); }
static void clear();
static bool haveUndo() { return !mUndoList.isEmpty(); }
static bool haveRedo() { return !mRedoList.isEmpty(); }
@@ -76,9 +76,9 @@ class Undo : public TQObject
private:
typedef TQValueList::Iterator Iterator;
- Undo(TQObject* tqparent) : TQObject(tqparent) { }
+ Undo(TQObject* parent) : TQObject(parent) { }
static void removeRedos(const TQString& eventID);
- static bool undo(Iterator, Type, TQWidget* tqparent, const TQString& action);
+ static bool undo(Iterator, Type, TQWidget* parent, const TQString& action);
static UndoItem* getItem(int id, Type);
static Iterator findItem(int id, Type);
void emitChanged(const TQString& undo, const TQString& redo)
diff --git a/kandy/src/cmdpropertiesdialog.cpp b/kandy/src/cmdpropertiesdialog.cpp
index b71a62f2f..3e72754f4 100644
--- a/kandy/src/cmdpropertiesdialog.cpp
+++ b/kandy/src/cmdpropertiesdialog.cpp
@@ -36,8 +36,8 @@
class ParameterItem : public TQCheckListItem {
public:
- ParameterItem(ATParameter *p,TQListView *tqparent) :
- TQCheckListItem(tqparent,p->name(),CheckBox),mParameter(p)
+ ParameterItem(ATParameter *p,TQListView *parent) :
+ TQCheckListItem(parent,p->name(),CheckBox),mParameter(p)
{
setText(1,p->value());
setOn(p->userInput());
@@ -56,16 +56,16 @@ class ParameterItem : public TQCheckListItem {
/*
- * Constructs a CmdPropertiesDialog which is a child of 'tqparent', with the
+ * Constructs a CmdPropertiesDialog which is a child of 'parent', with the
* name 'name' and widget flags set to 'f'
*
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
*/
-CmdPropertiesDialog::CmdPropertiesDialog(ATCommand *cmd, TQWidget* tqparent,
+CmdPropertiesDialog::CmdPropertiesDialog(ATCommand *cmd, TQWidget* parent,
const char* name, bool modal,
WFlags fl )
- : CmdPropertiesDialog_base( tqparent, name, modal, fl )
+ : CmdPropertiesDialog_base( parent, name, modal, fl )
{
mCmd = cmd;
diff --git a/kandy/src/cmdpropertiesdialog.h b/kandy/src/cmdpropertiesdialog.h
index 052425153..9edf76c92 100644
--- a/kandy/src/cmdpropertiesdialog.h
+++ b/kandy/src/cmdpropertiesdialog.h
@@ -33,7 +33,7 @@ class CmdPropertiesDialog : public CmdPropertiesDialog_base
Q_OBJECT
TQ_OBJECT
public:
- CmdPropertiesDialog(ATCommand *cmd,TQWidget* tqparent=0,const char* name=0,
+ CmdPropertiesDialog(ATCommand *cmd,TQWidget* parent=0,const char* name=0,
bool modal=false,WFlags fl=0);
~CmdPropertiesDialog();
diff --git a/kandy/src/commanditem.cpp b/kandy/src/commanditem.cpp
index f8eceb2c9..9586abbd2 100644
--- a/kandy/src/commanditem.cpp
+++ b/kandy/src/commanditem.cpp
@@ -70,13 +70,13 @@ void CommandItem::load(TQDomElement *c)
setItemText();
}
-void CommandItem::save(TQDomDocument *doc,TQDomElement *tqparent)
+void CommandItem::save(TQDomDocument *doc,TQDomElement *parent)
{
TQDomElement c = doc->createElement("command");
c.setAttribute("name",mCommand->cmdName());
c.setAttribute("string",mCommand->cmdString());
c.setAttribute("hexoutput",mCommand->hexOutput() ? "y" : "n");
- tqparent->appendChild(c);
+ parent->appendChild(c);
TQPtrList paras = mCommand->parameters();
for(uint i=0;icreateElement("parameter");
e.setAttribute("name",p->name());
e.setAttribute("value",p->value());
e.setAttribute("userinput",p->userInput() ? "y" : "n");
- tqparent->appendChild(e);
+ parent->appendChild(e);
}
void CommandItem::setItemText()
diff --git a/kandy/src/commanditem.h b/kandy/src/commanditem.h
index d92c9e744..46a648dd1 100644
--- a/kandy/src/commanditem.h
+++ b/kandy/src/commanditem.h
@@ -43,12 +43,12 @@ class CommandItem : public TQListViewItem {
ATCommand *command();
void load(TQDomElement *c);
- void save(TQDomDocument *doc,TQDomElement *tqparent);
+ void save(TQDomDocument *doc,TQDomElement *parent);
void setItemText();
protected:
- void saveParameter(ATParameter *p, TQDomDocument *doc,TQDomElement *tqparent);
+ void saveParameter(ATParameter *p, TQDomDocument *doc,TQDomElement *parent);
private:
ATCommand *mCommand;
diff --git a/kandy/src/commandscheduler.cpp b/kandy/src/commandscheduler.cpp
index 3a1001ed3..076582140 100644
--- a/kandy/src/commandscheduler.cpp
+++ b/kandy/src/commandscheduler.cpp
@@ -30,9 +30,9 @@
#include "commandscheduler.h"
#include "commandscheduler.moc"
-CommandScheduler::CommandScheduler(Modem *modem,TQObject *tqparent,
+CommandScheduler::CommandScheduler(Modem *modem,TQObject *parent,
const char *name) :
- TQObject(tqparent,name),
+ TQObject(parent,name),
mModem(modem)
{
connect(mModem,TQT_SIGNAL(gotLine(const char *)),
diff --git a/kandy/src/commandscheduler.h b/kandy/src/commandscheduler.h
index d18f82dc9..c99476bdc 100644
--- a/kandy/src/commandscheduler.h
+++ b/kandy/src/commandscheduler.h
@@ -36,7 +36,7 @@ class CommandScheduler : public TQObject {
Q_OBJECT
TQ_OBJECT
public:
- CommandScheduler (Modem *modem,TQObject *tqparent = 0, const char *name = 0);
+ CommandScheduler (Modem *modem,TQObject *parent = 0, const char *name = 0);
void execute(const TQString &command);
void execute(ATCommand *command);
diff --git a/kandy/src/commandset.cpp b/kandy/src/commandset.cpp
index d1bcc6316..e6e5d70f8 100644
--- a/kandy/src/commandset.cpp
+++ b/kandy/src/commandset.cpp
@@ -129,13 +129,13 @@ void CommandSet::loadCommand(ATCommand *command,TQDomElement *c)
}
void CommandSet::saveCommand(ATCommand *command,TQDomDocument *doc,
- TQDomElement *tqparent)
+ TQDomElement *parent)
{
TQDomElement c = doc->createElement("command");
c.setAttribute("name",command->cmdName());
c.setAttribute("string",command->cmdString());
c.setAttribute("hexoutput",command->hexOutput() ? "y" : "n");
- tqparent->appendChild(c);
+ parent->appendChild(c);
TQPtrList paras = command->parameters();
for(uint i=0;icreateElement("parameter");
e.setAttribute("name",p->name());
e.setAttribute("value",p->value());
e.setAttribute("userinput",p->userInput() ? "y" : "n");
- tqparent->appendChild(e);
+ parent->appendChild(e);
}
diff --git a/kandy/src/commandset.h b/kandy/src/commandset.h
index d297fe630..586542330 100644
--- a/kandy/src/commandset.h
+++ b/kandy/src/commandset.h
@@ -51,8 +51,8 @@ class CommandSet {
protected:
void loadCommand(ATCommand *,TQDomElement *c);
- void saveCommand(ATCommand *,TQDomDocument *doc,TQDomElement *tqparent);
- void saveParameter(ATParameter *p, TQDomDocument *doc,TQDomElement *tqparent);
+ void saveCommand(ATCommand *,TQDomDocument *doc,TQDomElement *parent);
+ void saveParameter(ATParameter *p, TQDomDocument *doc,TQDomElement *parent);
private:
TQPtrList mList;
diff --git a/kandy/src/kandyprefsdialog.cpp b/kandy/src/kandyprefsdialog.cpp
index 1e233aaa8..1bb03eb1a 100644
--- a/kandy/src/kandyprefsdialog.cpp
+++ b/kandy/src/kandyprefsdialog.cpp
@@ -54,8 +54,8 @@
#include "kandyprefsdialog.moc"
-KandyPrefsDialog::KandyPrefsDialog(TQWidget *tqparent, char *name, bool modal) :
- KPrefsDialog(KandyPrefs::self(),tqparent,name,modal)
+KandyPrefsDialog::KandyPrefsDialog(TQWidget *parent, char *name, bool modal) :
+ KPrefsDialog(KandyPrefs::self(),parent,name,modal)
{
setupSerialTab();
setupAddressbookTab();
diff --git a/kandy/src/kandyprefsdialog.h b/kandy/src/kandyprefsdialog.h
index 886e35048..4e367fafa 100644
--- a/kandy/src/kandyprefsdialog.h
+++ b/kandy/src/kandyprefsdialog.h
@@ -45,7 +45,7 @@ class KandyPrefsDialog : public KPrefsDialog
TQ_OBJECT
public:
/** Initialize dialog and pages */
- KandyPrefsDialog(TQWidget *tqparent=0,char *name=0,bool modal=false);
+ KandyPrefsDialog(TQWidget *parent=0,char *name=0,bool modal=false);
~KandyPrefsDialog();
protected:
diff --git a/kandy/src/kandyview.cpp b/kandy/src/kandyview.cpp
index 6e76235be..d47f5bcb7 100644
--- a/kandy/src/kandyview.cpp
+++ b/kandy/src/kandyview.cpp
@@ -57,8 +57,8 @@
#include "kandyview.h"
#include "kandyview.moc"
-KandyView::KandyView(CommandScheduler *scheduler,TQWidget *tqparent)
- : TQWidget(tqparent)
+KandyView::KandyView(CommandScheduler *scheduler,TQWidget *parent)
+ : TQWidget(parent)
{
mModified = false;
mScheduler = scheduler;
diff --git a/kandy/src/kandyview.h b/kandy/src/kandyview.h
index 41153a54f..8547dbf4c 100644
--- a/kandy/src/kandyview.h
+++ b/kandy/src/kandyview.h
@@ -56,7 +56,7 @@ class KandyView : public TQWidget
/**
* Default constructor
*/
- KandyView(CommandScheduler *,TQWidget *tqparent);
+ KandyView(CommandScheduler *,TQWidget *parent);
/**
* Destructor
diff --git a/kandy/src/mobilegui.cpp b/kandy/src/mobilegui.cpp
index 08cf54cc7..70d0656f3 100644
--- a/kandy/src/mobilegui.cpp
+++ b/kandy/src/mobilegui.cpp
@@ -176,21 +176,21 @@ class PhoneBookItem : public TQCheckListItem
/*
- * Constructs a MobileGui which is a child of 'tqparent', with the
+ * Constructs a MobileGui which is a child of 'parent', with the
* name 'name' and widget flags set to 'f'
*
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
*/
MobileGui::MobileGui( CommandScheduler *scheduler, KandyPrefs *kprefs,
- TQWidget* tqparent, const char* name, WFlags fl ) :
- DCOPObject( "KandyIface" ), MobileGui_base( tqparent, name, fl )
+ TQWidget* parent, const char* name, WFlags fl ) :
+ DCOPObject( "KandyIface" ), MobileGui_base( parent, name, fl )
{
// Setup links to related classes
mScheduler = scheduler;
mSyncer = new AddressSyncer;
mPrefs = kprefs;
- mtqparent = tqparent;
+ mparent = parent;
// Setup mobile phone specific data
mMobManufacturer = "";
@@ -1463,7 +1463,7 @@ void MobileGui::toggleConnection()
setKabState( UNLOADED );
setMobState( UNLOADED );
- ((MobileMain *) mtqparent)->statusBar()->changeItem( i18n(" Connected "), 1 );
+ ((MobileMain *) mparent)->statusBar()->changeItem( i18n(" Connected "), 1 );
} else {
warnKabState( UNLOADED );
@@ -1510,7 +1510,7 @@ void MobileGui::disconnectGUI()
mPBIndexOccupied.resize( 0, false );
- ((MobileMain *) mtqparent)->statusBar()->changeItem( i18n(" Disconnected "),
+ ((MobileMain *) mparent)->statusBar()->changeItem( i18n(" Disconnected "),
1 );
}
diff --git a/kandy/src/mobilegui.h b/kandy/src/mobilegui.h
index cb28f1885..b8bfeba26 100644
--- a/kandy/src/mobilegui.h
+++ b/kandy/src/mobilegui.h
@@ -42,7 +42,7 @@ class MobileGui : public MobileGui_base, virtual public KandyIface
TQ_OBJECT
public:
- MobileGui( CommandScheduler *, KandyPrefs *kprefs, TQWidget* tqparent=0,
+ MobileGui( CommandScheduler *, KandyPrefs *kprefs, TQWidget* parent=0,
const char* name=0, WFlags fl=0 );
~MobileGui();
@@ -80,7 +80,7 @@ class MobileGui : public MobileGui_base, virtual public KandyIface
CommandScheduler *mScheduler;
AddressSyncer *mSyncer;
KandyPrefs *mPrefs;
- TQWidget *mtqparent;
+ TQWidget *mparent;
/* String Formatting Routines */
TQString quote( const TQString & );
diff --git a/kandy/src/modem.cpp b/kandy/src/modem.cpp
index 113f2e4bc..3956376a8 100644
--- a/kandy/src/modem.cpp
+++ b/kandy/src/modem.cpp
@@ -74,8 +74,8 @@
-Modem::Modem( KandyPrefs *kprefs, TQObject *tqparent, const char *name ) :
- TQObject(tqparent, name)
+Modem::Modem( KandyPrefs *kprefs, TQObject *parent, const char *name ) :
+ TQObject(parent, name)
{
mOpen = false;
diff --git a/kandy/src/modem.h b/kandy/src/modem.h
index 0b30a05bf..5c8521c13 100644
--- a/kandy/src/modem.h
+++ b/kandy/src/modem.h
@@ -48,7 +48,7 @@ class Modem : public TQObject
Q_OBJECT
TQ_OBJECT
public:
- Modem(KandyPrefs *kprefs, TQObject *tqparent = 0, const char *name = 0);
+ Modem(KandyPrefs *kprefs, TQObject *parent = 0, const char *name = 0);
virtual ~Modem();
void setSpeed(int speed);
diff --git a/karm/csvexportdialog.cpp b/karm/csvexportdialog.cpp
index 7cb7774ff..f1e0fce66 100644
--- a/karm/csvexportdialog.cpp
+++ b/karm/csvexportdialog.cpp
@@ -33,10 +33,10 @@
#include "reportcriteria.h"
CSVExportDialog::CSVExportDialog( ReportCriteria::REPORTTYPE rt,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name
)
- : CSVExportDialogBase( tqparent, name )
+ : CSVExportDialogBase( parent, name )
{
switch ( rt ) {
case ReportCriteria::CSVTotalsExport:
diff --git a/karm/csvexportdialog.h b/karm/csvexportdialog.h
index 51aaf3bd6..8e4966b5a 100644
--- a/karm/csvexportdialog.h
+++ b/karm/csvexportdialog.h
@@ -31,7 +31,7 @@ class CSVExportDialog : public CSVExportDialogBase
public:
CSVExportDialog( ReportCriteria::REPORTTYPE rt,
- TQWidget *tqparent = 0,
+ TQWidget *parent = 0,
const char *name = 0
);
diff --git a/karm/doc/design b/karm/doc/design
index fe37a3002..b647f2822 100644
--- a/karm/doc/design
+++ b/karm/doc/design
@@ -35,24 +35,24 @@ On Thursday 24 October 2002 06:37 pm, tomas pospisek wrote:
> > Id Description
> > ---------------------------------------------------------------------
> > 1 Karm shall provide a hierarchical structure of tasks. If a task
-> > has at least one subtask it will be referred to as a tqparent task.
+> > has at least one subtask it will be referred to as a parent task.
> > If a task has no tqchildren it will be referred to as a leaf task.
-> > If a task has no tqparent tasks it will be referred to as a root
+> > If a task has no parent tasks it will be referred to as a root
> > task.
> > 2 A new task can be created as a child of any existing task.
-> > 2.1 If the tqparent had a timer active, it will continue to be active
+> > 2.1 If the parent had a timer active, it will continue to be active
>
> It depends on how you start it. If you double click it. Any other timer
> will be stopped and the new task started. If you start it through the
> start button, both tasks will be active. This a bug IMO. See at the bottom
> for my proposal.
>
-> > 2.2 The session time for the tqparent will not be changed by adding
+> > 2.2 The session time for the parent will not be changed by adding
> > the new child task.
-> > 2.3 The total time for the tqparent will not be changed by adding a
+> > 2.3 The total time for the parent will not be changed by adding a
> > the new child task.
-> > 3 Any task (tqparent, leaf, or root) may have an independent timer.
-> > 4 The time (both session and total) for a tqparent will be the sum
+> > 3 Any task (parent, leaf, or root) may have an independent timer.
+> > 4 The time (both session and total) for a parent will be the sum
> > of its independent timer and the sum of all of its child timers.
> >
> > Unstable Development
@@ -62,21 +62,21 @@ On Thursday 24 October 2002 06:37 pm, tomas pospisek wrote:
> > Id Description
> > ---------------------------------------------------------------------
> > 1 Karm shall provide a hierarchical structure of tasks. If a task
-> > has at least one subtask it will be referred to as a tqparent task.
+> > has at least one subtask it will be referred to as a parent task.
> > If a task has no tqchildren it will be referred to as a leaf task.
-> > If a task has no tqparent tasks it will be referred to as a root
+> > If a task has no parent tasks it will be referred to as a root
> > task.
> > 2 A new task can be created as a child of any existing task.
-> > 2.1 If the tqparent had a timer active, it will be deactivated
-> > 2.2 The session time for the tqparent will set to zero
+> > 2.1 If the parent had a timer active, it will be deactivated
+> > 2.2 The session time for the parent will set to zero
> > 2.2.1 The session time for the child will be initialized to the last
-> > session time of the tqparent.
-> > 2.3 The total time for the tqparent will be set to zero.
-> > 2.3.1 The total time for the tqparent will be initialized to the last
-> > total time of the tqparent.
-> > 3 Only a leaf task may have a timer. A tqparent may not have its own
+> > session time of the parent.
+> > 2.3 The total time for the parent will be set to zero.
+> > 2.3.1 The total time for the parent will be initialized to the last
+> > total time of the parent.
+> > 3 Only a leaf task may have a timer. A parent may not have its own
> > timer.
-> > 4 The time (both session and total) for a tqparent will be the sum
+> > 4 The time (both session and total) for a parent will be the sum
> > only of its child timers.
>
> I see where you want to go, but I think it's not the right direction for
@@ -134,7 +134,7 @@ idea but can't quite see how the interface should work.
Ok. So, I'll undo the changes related to:
* summing only leaf tasks
-* disallowing edits on tqparent tasks
+* disallowing edits on parent tasks
_______________________________________________
kde-pim mailing list
kde-pim@mail.kde.org
diff --git a/karm/doc/updating_parents.html b/karm/doc/updating_parents.html
index 63587952f..3b55ce30f 100644
--- a/karm/doc/updating_parents.html
+++ b/karm/doc/updating_parents.html
@@ -34,6 +34,6 @@ You should get something like this.
Session: 3
Total: 18
-
Since a tqparent task can have a timer active on it, it needs to be included in the summary
+
Since a parent task can have a timer active on it, it needs to be included in the summary
Session and Total times. So, in this example, the Session time will jump three minutes for every
minute the timer is active.
diff --git a/karm/edittaskdialog.cpp b/karm/edittaskdialog.cpp
index 8c1651546..c91f13eaf 100644
--- a/karm/edittaskdialog.cpp
+++ b/karm/edittaskdialog.cpp
@@ -201,7 +201,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
}
enableDesktops = true;
}
- // if some desktops were specified, then enable the tqparent box
+ // if some desktops were specified, then enable the parent box
_desktopCB->setChecked(enableDesktops);
for (int i=0; isetEnabled(false);
- // in any event, we want our tqparent to do it's thing
+ // in any event, we want our parent to do it's thing
ReadWritePart::setModified(modified);
}
@@ -388,11 +388,11 @@ karmPartFactory::~karmPartFactory()
}
KParts::Part* karmPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
- TQObject *tqparent, const char *name,
+ TQObject *parent, const char *name,
const char *classname, const TQStringList &args )
{
// Create an instance of our Part
- karmPart* obj = new karmPart( parentWidget, widgetName, tqparent, name );
+ karmPart* obj = new karmPart( parentWidget, widgetName, parent, name );
// See if we are to be read-write or not
if (TQCString(classname) == "KParts::ReadOnlyPart")
diff --git a/karm/karm_part.h b/karm/karm_part.h
index 8550cc9b3..7c679ee68 100644
--- a/karm/karm_part.h
+++ b/karm/karm_part.h
@@ -60,7 +60,7 @@ class karmPart : public KParts::ReadWritePart, virtual public KarmDCOPIface
public:
karmPart(TQWidget *parentWidget, const char *widgetName,
- TQObject *tqparent, const char *name);
+ TQObject *parent, const char *name);
// DCOP
void quit();
virtual bool save();
@@ -127,7 +127,7 @@ public:
karmPartFactory();
virtual ~karmPartFactory();
virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
- TQObject *tqparent, const char *name,
+ TQObject *parent, const char *name,
const char *classname, const TQStringList &args );
static KInstance* instance();
diff --git a/karm/karmdcopiface.h b/karm/karmdcopiface.h
index 67e599383..7233ff25f 100644
--- a/karm/karmdcopiface.h
+++ b/karm/karmdcopiface.h
@@ -38,7 +38,7 @@ class KarmDCOPIface : virtual public DCOPObject
/**
* Add a new top-level task.
*
- * A top-level task is one that has no tqparent tasks.
+ * A top-level task is one that has no parent tasks.
*
* @param taskName Name of new task.
*
diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp
index 1231113b6..1e4f92a1f 100644
--- a/karm/karmstorage.cpp
+++ b/karm/karmstorage.cpp
@@ -156,7 +156,7 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt
TQDict< Task > map;
// Build dictionary to look up Task object from Todo uid. Each task is a
- // TQListViewItem, and is initially added with the view as the tqparent.
+ // TQListViewItem, and is initially added with the view as the parent.
todoList = _calendar->rawTodos();
kdDebug(5970) << "KarmStorage::load "
<< "rawTodo count (includes completed todos) ="
@@ -186,7 +186,7 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt
task->setPixmapProgress();
}
- // Load each task under it's tqparent task.
+ // Load each task under it's parent task.
for( todo = todoList.begin(); todo != todoList.end(); ++todo )
{
Task* task = map.find( (*todo)->uid() );
@@ -198,7 +198,7 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt
// Complete the loading but return a message
if ( !newParent )
- err = i18n("Error loading \"%1\": could not find tqparent (uid=%2)")
+ err = i18n("Error loading \"%1\": could not find parent (uid=%2)")
.tqarg(task->name())
.tqarg((*todo)->relatedToUid());
@@ -245,7 +245,7 @@ TQString KarmStorage::buildTaskView(KCal::ResourceCalendar *rc, TaskView *view)
// 1. insert tasks form rc into taskview
// 1.1. Build dictionary to look up Task object from Todo uid. Each task is a
- // TQListViewItem, and is initially added with the view as the tqparent.
+ // TQListViewItem, and is initially added with the view as the parent.
todoList = rc->rawTodos();
for( todo = todoList.begin(); todo != todoList.end(); ++todo )
{
@@ -255,7 +255,7 @@ TQString KarmStorage::buildTaskView(KCal::ResourceCalendar *rc, TaskView *view)
task->setPixmapProgress();
}
- // 1.1. Load each task under it's tqparent task.
+ // 1.1. Load each task under it's parent task.
for( todo = todoList.begin(); todo != todoList.end(); ++todo )
{
Task* task = map.find( (*todo)->uid() );
@@ -267,7 +267,7 @@ TQString KarmStorage::buildTaskView(KCal::ResourceCalendar *rc, TaskView *view)
// Complete the loading but return a message
if ( !newParent )
- err = i18n("Error loading \"%1\": could not find tqparent (uid=%2)")
+ err = i18n("Error loading \"%1\": could not find parent (uid=%2)")
.tqarg(task->name())
.tqarg((*todo)->relatedToUid());
@@ -439,17 +439,17 @@ TQString KarmStorage::loadFromFlatFile(TaskView* taskview,
task->setUid(addTask(task, 0));
}
else {
- Task *tqparent = stack.top();
+ Task *parent = stack.top();
kdDebug(5970) << "KarmStorage::loadFromFlatFile - task: " << name
- << " min: " << minutes << " tqparent" << tqparent->name() << "\n";
- task = new Task(name, minutes, 0, desktopList, tqparent);
+ << " min: " << minutes << " parent" << parent->name() << "\n";
+ task = new Task(name, minutes, 0, desktopList, parent);
- task->setUid(addTask(task, tqparent));
+ task->setUid(addTask(task, parent));
// Legacy File Format (!):
- tqparent->changeTimes(0, -minutes);
+ parent->changeTimes(0, -minutes);
taskview->setRootIsDecorated(true);
- tqparent->setOpen(true);
+ parent->setOpen(true);
}
if (!task->uid().isNull())
stack.push(task);
@@ -556,12 +556,12 @@ bool KarmStorage::parseLine(TQString line, long *time, TQString *name,
void KarmStorage::adjustFromLegacyFileFormat(Task* task)
{
- // unless the tqparent is the listView
- if ( task->tqparent() )
- task->tqparent()->changeTimes(-task->sessionTime(), -task->time());
+ // unless the parent is the listView
+ if ( task->parent() )
+ task->parent()->changeTimes(-task->sessionTime(), -task->time());
// traverse depth first -
- // as soon as we're in a leaf, we'll substract it's time from the tqparent
+ // as soon as we're in a leaf, we'll substract it's time from the parent
// then, while descending back we'll do the same for each node untill
// we reach the root
for ( Task* subtask = task->firstChild(); subtask;
@@ -701,7 +701,7 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview,
// public routines:
//
-TQString KarmStorage::addTask(const Task* task, const Task* tqparent)
+TQString KarmStorage::addTask(const Task* task, const Task* parent)
{
KCal::Todo* todo;
TQString uid;
@@ -710,8 +710,8 @@ TQString KarmStorage::addTask(const Task* task, const Task* tqparent)
if ( _calendar->addTodo( todo ) )
{
task->asTodo( todo );
- if (tqparent)
- todo->setRelatedTo(_calendar->todo(tqparent->uid()));
+ if (parent)
+ todo->setRelatedTo(_calendar->todo(parent->uid()));
uid = todo->uid();
}
else
diff --git a/karm/karmstorage.h b/karm/karmstorage.h
index 40c574d7f..65caafd7c 100644
--- a/karm/karmstorage.h
+++ b/karm/karmstorage.h
@@ -132,7 +132,7 @@ class KarmStorage
* Read tasks and their total times from a text file (legacy storage).
*
* This reads from one of the two legacy file formats. In this version,
- * the tqparent task times do not include the sum of all their tqchildren's
+ * the parent task times do not include the sum of all their tqchildren's
* times.
*
* The format of the file is zero or more lines of:
@@ -266,15 +266,15 @@ class KarmStorage
* Add this task from iCalendar file.
*
* Create a new KCal::Todo object and load with task information. If
- * tqparent is not zero, then set the RELATED-TO attribute for this Todo.
+ * parent is not zero, then set the RELATED-TO attribute for this Todo.
*
* @param task The task to be removed.
- * @param tqparent The tqparent of this task. Must have a uid() that is in
+ * @param parent The parent of this task. Must have a uid() that is in
* the existing calendar. If zero, this task is considered a root task.
* @return The unique ID for the new VTODO. Return an null TQString if
* there was an error creating the new calendar object.
*/
- TQString addTask(const Task* task, const Task* tqparent);
+ TQString addTask(const Task* task, const Task* parent);
/**
* Check if the iCalendar file currently loaded has any Todos in it.
diff --git a/karm/ktimewidget.cpp b/karm/ktimewidget.cpp
index e480dea40..2eaf32b20 100644
--- a/karm/ktimewidget.cpp
+++ b/karm/ktimewidget.cpp
@@ -16,8 +16,8 @@ enum ValidatorType { HOUR, MINUTE };
class TimeValidator : public TQValidator
{
public:
- TimeValidator( ValidatorType tp, TQWidget *tqparent=0, const char *name=0)
- : TQValidator(TQT_TQOBJECT(tqparent), name)
+ TimeValidator( ValidatorType tp, TQWidget *parent=0, const char *name=0)
+ : TQValidator(TQT_TQOBJECT(parent), name)
{
_tp = tp;
}
@@ -46,8 +46,8 @@ class KarmLineEdit : public TQLineEdit
{
public:
- KarmLineEdit( TQWidget* tqparent, const char* name = 0 )
- : TQLineEdit( tqparent, name ) {}
+ KarmLineEdit( TQWidget* parent, const char* name = 0 )
+ : TQLineEdit( parent, name ) {}
protected:
@@ -60,8 +60,8 @@ protected:
};
-KArmTimeWidget::KArmTimeWidget( TQWidget* tqparent, const char* name )
- : TQWidget(tqparent, name)
+KArmTimeWidget::KArmTimeWidget( TQWidget* parent, const char* name )
+ : TQWidget(parent, name)
{
TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
diff --git a/karm/ktimewidget.h b/karm/ktimewidget.h
index 62f81f77c..88f298b22 100644
--- a/karm/ktimewidget.h
+++ b/karm/ktimewidget.h
@@ -13,7 +13,7 @@ class KarmLineEdit;
class KArmTimeWidget : public TQWidget
{
public:
- KArmTimeWidget( TQWidget* tqparent = 0, const char* name = 0 );
+ KArmTimeWidget( TQWidget* parent = 0, const char* name = 0 );
void setTime( long minutes );
long time() const;
diff --git a/karm/plannerparser.cpp b/karm/plannerparser.cpp
index b205fd7af..7ac13a5e3 100644
--- a/karm/plannerparser.cpp
+++ b/karm/plannerparser.cpp
@@ -35,9 +35,9 @@ test cases:
kdDebug() << "entering constructor to import planner tasks" << endl;
_taskView=tv;
level=0;
- if (_taskView->current_item()) if (_taskView->current_item()->tqparent())
+ if (_taskView->current_item()) if (_taskView->current_item()->parent())
{
- task = _taskView->current_item()->tqparent();
+ task = _taskView->current_item()->parent();
level=1;
}
}
@@ -92,7 +92,7 @@ test cases:
// only s within increased level, so only decrease for s within
if (withInTasks)
{
- if (qName=="task") if (level-->=0) task=task->tqparent();
+ if (qName=="task") if (level-->=0) task=task->parent();
if (qName=="tasks") withInTasks=false;
}
return true;
diff --git a/karm/task.cpp b/karm/task.cpp
index cf37ee43a..03eb1d3b2 100644
--- a/karm/task.cpp
+++ b/karm/task.cpp
@@ -22,21 +22,21 @@ const int gSecondsPerMinute = 60;
TQPtrVector *Task::icons = 0;
Task::Task( const TQString& taskName, long minutes, long sessionTime,
- DesktopList desktops, TaskView *tqparent)
- : TQObject(), TQListViewItem(tqparent)
+ DesktopList desktops, TaskView *parent)
+ : TQObject(), TQListViewItem(parent)
{
init(taskName, minutes, sessionTime, desktops, 0);
}
Task::Task( const TQString& taskName, long minutes, long sessionTime,
- DesktopList desktops, Task *tqparent)
- : TQObject(), TQListViewItem(tqparent)
+ DesktopList desktops, Task *parent)
+ : TQObject(), TQListViewItem(parent)
{
init(taskName, minutes, sessionTime, desktops, 0);
}
-Task::Task( KCal::Todo* todo, TaskView* tqparent )
- : TQObject(), TQListViewItem( tqparent )
+Task::Task( KCal::Todo* todo, TaskView* parent )
+ : TQObject(), TQListViewItem( parent )
{
long minutes = 0;
TQString name;
@@ -51,9 +51,9 @@ Task::Task( KCal::Todo* todo, TaskView* tqparent )
void Task::init( const TQString& taskName, long minutes, long sessionTime,
DesktopList desktops, int percent_complete)
{
- // If our tqparent is the taskview then connect our totalTimesChanged
+ // If our parent is the taskview then connect our totalTimesChanged
// signal to its receiver
- if ( ! tqparent() )
+ if ( ! parent() )
connect( this, TQT_SIGNAL( totalTimesChanged ( long, long ) ),
listView(), TQT_SLOT( taskTotalTimesChanged( long, long) ));
@@ -164,13 +164,13 @@ void Task::setPercentComplete(const int percent, KarmStorage *storage)
setPixmapProgress();
- // When tqparent marked as complete, mark all tqchildren as complete as well.
- // Complete tasks are not displayed in the task view, so if a tqparent is
+ // When parent marked as complete, mark all tqchildren as complete as well.
+ // Complete tasks are not displayed in the task view, so if a parent is
// marked as complete and some of the tqchildren are not, then we get an error
// message. KArm actually keep chugging along in this case and displays the
// child tasks just fine, so an alternative solution is to remove that error
// message (from KarmStorage::load). But I think it makes more sense that
- // if you mark a tqparent task as complete, then all tqchildren should be
+ // if you mark a parent task as complete, then all tqchildren should be
// complete as well.
//
// This behavior is consistent with KOrganizer (as of 2003-09-24).
@@ -252,7 +252,7 @@ void Task::changeParentTotalTimes( long minutesSession, long minutes )
if ( isRoot() )
emit totalTimesChanged( minutesSession, minutes );
else
- tqparent()->changeTotalTimes( minutesSession, minutes );
+ parent()->changeTotalTimes( minutesSession, minutes );
}
bool Task::remove( TQPtrList& activeTasks, KarmStorage* storage)
@@ -290,7 +290,7 @@ TQString Task::fullName() const
if (isRoot())
return name();
else
- return tqparent()->fullName() + TQString::tqfromLatin1("/") + name();
+ return parent()->fullName() + TQString::tqfromLatin1("/") + name();
}
KCal::Todo* Task::asTodo(KCal::Todo* todo) const
@@ -390,10 +390,10 @@ void Task::cut()
{
//kdDebug(5970) << "Task::cut - " << name() << endl;
changeParentTotalTimes( -_totalSessionTime, -_totalTime);
- if ( ! tqparent())
+ if ( ! parent())
listView()->takeItem(this);
else
- tqparent()->takeItem(this);
+ parent()->takeItem(this);
}
void Task::move(Task* destination)
diff --git a/karm/task.h b/karm/task.h
index acf2cd998..53c7abcc9 100644
--- a/karm/task.h
+++ b/karm/task.h
@@ -46,20 +46,20 @@ class Task : public TQObject, public TQListViewItem
public:
//@{ constructors
Task( const TQString& taskame, long minutes, long sessionTime,
- DesktopList desktops, TaskView* tqparent = 0);
+ DesktopList desktops, TaskView* parent = 0);
Task( const TQString& taskame, long minutes, long sessionTime,
- DesktopList desktops, Task* tqparent = 0);
- Task( KCal::Todo* incident, TaskView* tqparent );
+ DesktopList desktops, Task* parent = 0);
+ Task( KCal::Todo* incident, TaskView* parent );
//@}
/* destructor */
~Task();
- /** return tqparent Task or null in case of TaskView.
- * same as TQListViewItem::tqparent()
+ /** return parent Task or null in case of TaskView.
+ * same as TQListViewItem::parent()
*/
Task* firstChild() const { return (Task*)TQListViewItem::firstChild(); }
Task* nextSibling() const { return (Task*)TQListViewItem::nextSibling(); }
- Task* tqparent() const { return (Task*)TQListViewItem::tqparent(); }
+ Task* parent() const { return (Task*)TQListViewItem::parent(); }
/** Return task view for this task */
TaskView* taskView() const {
@@ -78,9 +78,9 @@ class Task : public TQObject, public TQListViewItem
*/
void setUid(const TQString uid);
- /** cut Task out of tqparent Task or the TaskView */
+ /** cut Task out of parent Task or the TaskView */
void cut();
- /** cut Task out of tqparent Task or the TaskView and into the
+ /** cut Task out of parent Task or the TaskView and into the
* destination Task */
void move(Task* destination);
/** insert Task into the destination Task */
@@ -162,7 +162,7 @@ class Task : public TQObject, public TQListViewItem
TQString name() const { return _name; };
/**
- * Returns that task name, prefixed by tqparent tree up to root.
+ * Returns that task name, prefixed by parent tree up to root.
*
* Task names are seperated by a forward slash: /
*/
@@ -206,7 +206,7 @@ class Task : public TQObject, public TQListViewItem
TQString comment() const;
/** tells you whether this task is the root of the task tree */
- bool isRoot() const { return tqparent() == 0; }
+ bool isRoot() const { return parent() == 0; }
/** remove Task with all it's tqchildren
* @param activeTasks - list of aktive tasks
diff --git a/karm/taskview.cpp b/karm/taskview.cpp
index 95dfc8569..b4f655ff9 100644
--- a/karm/taskview.cpp
+++ b/karm/taskview.cpp
@@ -37,7 +37,7 @@
class DesktopTracker;
-TaskView::TaskView(TQWidget *tqparent, const char *name, const TQString &icsfile ):KListView(tqparent,name)
+TaskView::TaskView(TQWidget *parent, const char *name, const TQString &icsfile ):KListView(parent,name)
{
_preferences = Preferences::instance( icsfile );
_storage = KarmStorage::instance();
@@ -495,7 +495,7 @@ void TaskView::newTask()
newTask(i18n("New Task"), 0);
}
-void TaskView::newTask(TQString caption, Task *tqparent)
+void TaskView::newTask(TQString caption, Task *parent)
{
EditTaskDialog *dialog = new EditTaskDialog(caption, false);
long total, totalDiff, session, sessionDiff;
@@ -514,7 +514,7 @@ void TaskView::newTask(TQString caption, Task *tqparent)
if ( desktopList.size() == ( unsigned int ) _desktopTracker->desktopCount() )
desktopList.clear();
- TQString uid = addTask( taskName, total, session, desktopList, tqparent );
+ TQString uid = addTask( taskName, total, session, desktopList, parent );
if ( uid.isNull() )
{
KMessageBox::error( 0, i18n(
@@ -527,15 +527,15 @@ void TaskView::newTask(TQString caption, Task *tqparent)
TQString TaskView::addTask
( const TQString& taskname, long total, long session,
- const DesktopList& desktops, Task* tqparent )
+ const DesktopList& desktops, Task* parent )
{
Task *task;
kdDebug(5970) << "TaskView::addTask: taskname = " << taskname << endl;
- if ( tqparent ) task = new Task( taskname, total, session, desktops, tqparent );
+ if ( parent ) task = new Task( taskname, total, session, desktops, parent );
else task = new Task( taskname, total, session, desktops, this );
- task->setUid( _storage->addTask( task, tqparent ) );
+ task->setUid( _storage->addTask( task, parent ) );
TQString taskuid=task->uid();
if ( ! taskuid.isNull() )
{
diff --git a/karm/taskview.h b/karm/taskview.h
index 7b9bc4414..f1b22048f 100644
--- a/karm/taskview.h
+++ b/karm/taskview.h
@@ -45,7 +45,7 @@ class TaskView : public KListView
TQ_OBJECT
public:
- TaskView( TQWidget *tqparent = 0, const char *name = 0, const TQString &icsfile = "" );
+ TaskView( TQWidget *parent = 0, const char *name = 0, const TQString &icsfile = "" );
virtual ~TaskView();
/** Return the first item in the view, cast to a Task pointer. */
@@ -83,7 +83,7 @@ class TaskView : public KListView
/** Add a task to view and storage. */
TQString addTask( const TQString& taskame, long total, long session, const DesktopList& desktops,
- Task* tqparent = 0 );
+ Task* parent = 0 );
public slots:
/** Save to persistent storage. */
@@ -105,7 +105,7 @@ class TaskView : public KListView
void newTask();
/** Display edit task dialog and create a new task with results. */
- void newTask( TQString caption, Task* tqparent );
+ void newTask( TQString caption, Task* parent );
/** Used to refresh (e.g. after import) */
void refresh();
diff --git a/karm/tray.cpp b/karm/tray.cpp
index 20486b4b7..20c2f51e6 100644
--- a/karm/tray.cpp
+++ b/karm/tray.cpp
@@ -30,8 +30,8 @@
TQPtrVector *KarmTray::icons = 0;
-KarmTray::KarmTray(MainWindow* tqparent)
- : KSystemTray(tqparent, "Karm Tray")
+KarmTray::KarmTray(MainWindow* parent)
+ : KSystemTray(parent, "Karm Tray")
{
// the timer that updates the "running" icon in the tray
_taskActiveTimer = new TQTimer(this);
@@ -49,8 +49,8 @@ KarmTray::KarmTray(MainWindow* tqparent)
}
}
- tqparent->actionPreferences->plug( contextMenu() );
- tqparent->actionStopAll->plug( contextMenu() );
+ parent->actionPreferences->plug( contextMenu() );
+ parent->actionStopAll->plug( contextMenu() );
resetClock();
initToolTip();
@@ -71,7 +71,7 @@ KarmTray::KarmTray(MainWindow* tqparent)
*/
}
-KarmTray::KarmTray(karmPart * tqparent)
+KarmTray::KarmTray(karmPart * parent)
: KSystemTray( 0 , "Karm Tray")
{
// it is not convenient if every kpart gets an icon in the systray.
diff --git a/karm/tray.h b/karm/tray.h
index b299a6edb..d0fbd8ca2 100644
--- a/karm/tray.h
+++ b/karm/tray.h
@@ -27,8 +27,8 @@ class KarmTray : public KSystemTray
TQ_OBJECT
public:
- KarmTray(MainWindow * tqparent);
- KarmTray(karmPart * tqparent);
+ KarmTray(MainWindow * parent);
+ KarmTray(karmPart * parent);
~KarmTray();
private:
diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp
index b863e4e6e..f11832f37 100644
--- a/kdgantt/KDGanttMinimizeSplitter.cpp
+++ b/kdgantt/KDGanttMinimizeSplitter.cpp
@@ -56,10 +56,10 @@ static int opaqueOldPos = -1; //### there's only one mouse, but this is a bit ri
KDGanttSplitterHandle::KDGanttSplitterHandle( Qt::Orientation o,
- KDGanttMinimizeSplitter *tqparent, const char * name )
- : TQWidget( tqparent, name ), _activeButton( 0 ), _collapsed( false )
+ KDGanttMinimizeSplitter *parent, const char * name )
+ : TQWidget( parent, name ), _activeButton( 0 ), _collapsed( false )
{
- s = tqparent;
+ s = parent;
setOrientation(o);
setMouseTracking( true );
}
@@ -325,7 +325,7 @@ void kdganttGeomCalc( TQMemArray &chain, int start, int count, i
To show a TQListBox, a TQListView and a TQTextEdit side by side:
\code
- KDGanttMinimizeSplitter *split = new KDGanttMinimizeSplitter( tqparent );
+ KDGanttMinimizeSplitter *split = new KDGanttMinimizeSplitter( parent );
TQListBox *lb = new TQListBox( split );
TQListView *lv = new TQListView( split );
TQTextEdit *ed = new TQTextEdit( split );
@@ -378,22 +378,22 @@ static TQSize minSizeHint( const TQWidget* w )
/*!
- Constructs a horizontal splitter with the \a tqparent and \a
+ Constructs a horizontal splitter with the \a parent and \a
name arguments being passed on to the TQFrame constructor.
*/
-KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( TQWidget *tqparent, const char *name )
- :TQFrame(tqparent,name,WPaintUnclipped)
+KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( TQWidget *parent, const char *name )
+ :TQFrame(parent,name,WPaintUnclipped)
{
orient = Qt::Horizontal;
init();
}
/*!
- Constructs a splitter with orientation \a o with the \a tqparent
+ Constructs a splitter with orientation \a o with the \a parent
and \a name arguments being passed on to the TQFrame constructor.
*/
-KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( Qt::Orientation o, TQWidget *tqparent, const char *name )
- :TQFrame(tqparent,name,WPaintUnclipped)
+KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( Qt::Orientation o, TQWidget *parent, const char *name )
+ :TQFrame(parent,name,WPaintUnclipped)
{
orient = o;
init();
diff --git a/kdgantt/KDGanttMinimizeSplitter.h b/kdgantt/KDGanttMinimizeSplitter.h
index 9137da064..0d3499ac1 100644
--- a/kdgantt/KDGanttMinimizeSplitter.h
+++ b/kdgantt/KDGanttMinimizeSplitter.h
@@ -52,8 +52,8 @@ public:
enum ResizeMode { Stretch, KeepSize, FollowSizeHint };
enum Direction { Left, Right, Up, Down };
- KDGanttMinimizeSplitter( TQWidget* tqparent=0, const char* name=0 );
- KDGanttMinimizeSplitter( Qt::Orientation, TQWidget* tqparent=0, const char* name=0 );
+ KDGanttMinimizeSplitter( TQWidget* parent=0, const char* name=0 );
+ KDGanttMinimizeSplitter( Qt::Orientation, TQWidget* parent=0, const char* name=0 );
~KDGanttMinimizeSplitter();
virtual void setOrientation( Qt::Orientation );
@@ -141,7 +141,7 @@ class KDGanttSplitterHandle : public TQWidget
TQ_OBJECT
public:
KDGanttSplitterHandle( Qt::Orientation o,
- KDGanttMinimizeSplitter *tqparent, const char* name=0 );
+ KDGanttMinimizeSplitter *parent, const char* name=0 );
void setOrientation( Qt::Orientation o );
Qt::Orientation orientation() const { return orient; }
diff --git a/kdgantt/KDGanttSemiSizingControl.cpp b/kdgantt/KDGanttSemiSizingControl.cpp
index 08c1a004c..bfaa161d0 100644
--- a/kdgantt/KDGanttSemiSizingControl.cpp
+++ b/kdgantt/KDGanttSemiSizingControl.cpp
@@ -57,15 +57,15 @@
orientation and the control arrow button on top of the controlled
widget.
- \param tqparent the tqparent widget. This parameter is passed to the
+ \param parent the parent widget. This parameter is passed to the
base class.
\param name the internal widget name. This parameter is passed to
the base class.
*/
-KDGanttSemiSizingControl::KDGanttSemiSizingControl( TQWidget* tqparent,
+KDGanttSemiSizingControl::KDGanttSemiSizingControl( TQWidget* parent,
const char* name ) :
- KDGanttSizingControl( tqparent, name ), _orient( Qt::Horizontal ),
+ KDGanttSizingControl( parent, name ), _orient( Qt::Horizontal ),
_arrowPos( Before ), _minimizedWidget(0), _maximizedWidget(0)
{
init();
@@ -78,16 +78,16 @@ KDGanttSemiSizingControl::KDGanttSemiSizingControl( TQWidget* tqparent,
the controlled widget (depending on the orientation).
\param orientation the orientation of the splitter
- \param tqparent the tqparent widget. This parameter is passed to the
+ \param parent the parent widget. This parameter is passed to the
base class.
\param name the internal widget name. This parameter is passed to
the base class.
*/
KDGanttSemiSizingControl::KDGanttSemiSizingControl( Qt::Orientation orientation,
- TQWidget* tqparent,
+ TQWidget* parent,
const char* name ) :
- KDGanttSizingControl( tqparent, name ), _orient( orientation ),
+ KDGanttSizingControl( parent, name ), _orient( orientation ),
_arrowPos( Before ), _minimizedWidget(0), _maximizedWidget(0)
{
init();
@@ -101,7 +101,7 @@ KDGanttSemiSizingControl::KDGanttSemiSizingControl( Qt::Orientation orientation,
\param arrowPosition specifies whether the control arrow button
should appear before or after the controlled widget
\param orientation the orientation of the splitter
- \param tqparent the tqparent widget. This parameter is passed to the
+ \param parent the parent widget. This parameter is passed to the
base class.
\param name the internal widget name. This parameter is passed to
the base class.
@@ -109,9 +109,9 @@ KDGanttSemiSizingControl::KDGanttSemiSizingControl( Qt::Orientation orientation,
KDGanttSemiSizingControl::KDGanttSemiSizingControl( ArrowPosition arrowPosition,
Qt::Orientation orientation,
- TQWidget* tqparent,
+ TQWidget* parent,
const char* name ) :
- KDGanttSizingControl( tqparent, name ), _orient( orientation ),
+ KDGanttSizingControl( parent, name ), _orient( orientation ),
_arrowPos( arrowPosition ), _minimizedWidget(0), _maximizedWidget(0)
{
init();
@@ -313,7 +313,7 @@ void KDGanttSemiSizingControl::setup()
************************************************** */
// hack for the usage in KDGantt as pop-up legend widget
// for this purpose,
- // the _maximizedWidget must be a child of the tqparent of this widget
+ // the _maximizedWidget must be a child of the parent of this widget
if ( isMinimized() ) {
widget = _minimizedWidget;
diff --git a/kdgantt/KDGanttSemiSizingControl.h b/kdgantt/KDGanttSemiSizingControl.h
index 5857786e0..c1cc0b597 100644
--- a/kdgantt/KDGanttSemiSizingControl.h
+++ b/kdgantt/KDGanttSemiSizingControl.h
@@ -50,11 +50,11 @@ class KDGanttSemiSizingControl : public KDGanttSizingControl
public:
enum ArrowPosition { Before, After };
- KDGanttSemiSizingControl( TQWidget* tqparent = 0, const char* name = 0 );
- KDGanttSemiSizingControl( Qt::Orientation orientation, TQWidget* tqparent = 0,
+ KDGanttSemiSizingControl( TQWidget* parent = 0, const char* name = 0 );
+ KDGanttSemiSizingControl( Qt::Orientation orientation, TQWidget* parent = 0,
const char* name = 0 );
KDGanttSemiSizingControl( ArrowPosition arrowPosition,
- Qt::Orientation orientation, TQWidget* tqparent = 0,
+ Qt::Orientation orientation, TQWidget* parent = 0,
const char* name = 0 );
void setMinimizedWidget( TQWidget* widget );
diff --git a/kdgantt/KDGanttSizingControl.cpp b/kdgantt/KDGanttSizingControl.cpp
index a51f9f4fe..3d174ad57 100644
--- a/kdgantt/KDGanttSizingControl.cpp
+++ b/kdgantt/KDGanttSizingControl.cpp
@@ -48,7 +48,7 @@
/*!
Constructs an empty KDGanttSizing Control.
- \param tqparent the tqparent widget. This parameter is passed to the
+ \param parent the parent widget. This parameter is passed to the
base class.
\param name the internal widget name. This parameter is passed to
the base class.
@@ -56,8 +56,8 @@
*/
-KDGanttSizingControl::KDGanttSizingControl( TQWidget* tqparent, const char* name, WFlags f )
- :TQWidget( tqparent, name, f ), _isMinimized( false )
+KDGanttSizingControl::KDGanttSizingControl( TQWidget* parent, const char* name, WFlags f )
+ :TQWidget( parent, name, f ), _isMinimized( false )
{
}
diff --git a/kdgantt/KDGanttSizingControl.h b/kdgantt/KDGanttSizingControl.h
index cbea0c58b..ffdb0fa7d 100644
--- a/kdgantt/KDGanttSizingControl.h
+++ b/kdgantt/KDGanttSizingControl.h
@@ -44,7 +44,7 @@ public:
bool isMinimized() const;
protected:
- KDGanttSizingControl( TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0 );
+ KDGanttSizingControl( TQWidget* parent = 0, const char* name = 0, WFlags f = 0 );
public slots:
virtual void minimize( bool minimize );
diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp
index 749e53064..303ca8651 100644
--- a/kdgantt/KDGanttView.cpp
+++ b/kdgantt/KDGanttView.cpp
@@ -76,12 +76,12 @@
/*!
Constructs an empty KDGanttView.
- \param tqparent the widget tqparent
+ \param parent the widget parent
\param name the internal debugging name
*/
-KDGanttView::KDGanttView( TQWidget* tqparent, const char* name )
- : KDGanttMinimizeSplitter( Qt::Vertical, tqparent, name ),
+KDGanttView::KDGanttView( TQWidget* parent, const char* name )
+ : KDGanttMinimizeSplitter( Qt::Vertical, parent, name ),
myCanvasView(0),
myTimeHeaderScroll(0),
mFixedHorizon( false )
@@ -2346,7 +2346,7 @@ KDGanttViewItem* KDGanttView::firstChild() const
GanttView as a calendar view, you have to call
setDisplaySubitemsAsGroup( true ); to use the root items as calendar
items. To create new calendar entries for these root items, create
- a new KDGanttViewTaskItem with this root item as a tqparent. If you
+ a new KDGanttViewTaskItem with this root item as a parent. If you
want an item with subitems to behave like a calendar (which is
possibly empty at startup), please call setIsCalendar( true ); for
this item.
@@ -4542,7 +4542,7 @@ void KDGanttView::lvStartDrag (KDGanttViewItem* item)
// In order to avoid starting drags for particular items, subclass KDGanttView
// an reimplement this method.
// insert here some code like
- // if ( item->tqparent() )
+ // if ( item->parent() )
// return;
// This particular code will make it impossible to drag other items but root items.
if ( d->drag() ) {
diff --git a/kdgantt/KDGanttView.h b/kdgantt/KDGanttView.h
index 781cc7586..264b609c1 100644
--- a/kdgantt/KDGanttView.h
+++ b/kdgantt/KDGanttView.h
@@ -119,7 +119,7 @@ public:
enum HourFormat { Hour_24, Hour_12, Hour_24_FourDigit };
enum RepaintMode { No, Medium, Always };
- KDGanttView( TQWidget* tqparent = 0, const char* name = 0 );
+ KDGanttView( TQWidget* parent = 0, const char* name = 0 );
~KDGanttView();
virtual void show();
diff --git a/kdgantt/KDGanttViewEventItem.cpp b/kdgantt/KDGanttViewEventItem.cpp
index 137c8ea3c..2d43a8e07 100644
--- a/kdgantt/KDGanttViewEventItem.cpp
+++ b/kdgantt/KDGanttViewEventItem.cpp
@@ -64,15 +64,15 @@ KDGanttViewEventItem::KDGanttViewEventItem( KDGanttView* view,
/*!
Constructs an empty Gantt item of type event.
- \param tqparent a tqparent item under which this one goes
+ \param parent a parent item under which this one goes
\param lvtext the text to show in the list view
\param name the name by which the item can be identified. If no name
is specified, a unique name will be generated
*/
-KDGanttViewEventItem::KDGanttViewEventItem( KDGanttViewItem* tqparent,
+KDGanttViewEventItem::KDGanttViewEventItem( KDGanttViewItem* parent,
const TQString& lvtext,
const TQString& name ) :
- KDGanttViewItem( Event, tqparent, lvtext, name )
+ KDGanttViewItem( Event, parent, lvtext, name )
{
initItem();
@@ -102,17 +102,17 @@ KDGanttViewEventItem::KDGanttViewEventItem( KDGanttView* view,
/*!
Constructs an empty Gantt item of type event.
- \param tqparent a tqparent item under which this one goes
+ \param parent a parent item under which this one goes
\param after another item at the same level behind which this one should go
\param lvtext the text to show in the list view
\param name the name by which the item can be identified. If no name
is specified, a unique name will be generated
*/
-KDGanttViewEventItem::KDGanttViewEventItem( KDGanttViewItem* tqparent,
+KDGanttViewEventItem::KDGanttViewEventItem( KDGanttViewItem* parent,
KDGanttViewItem* after,
const TQString& lvtext,
const TQString& name ) :
- KDGanttViewItem( Event, tqparent, after, lvtext, name )
+ KDGanttViewItem( Event, parent, after, lvtext, name )
{
initItem();
diff --git a/kdgantt/KDGanttViewEventItem.h b/kdgantt/KDGanttViewEventItem.h
index 033a248df..6bddf5a4d 100644
--- a/kdgantt/KDGanttViewEventItem.h
+++ b/kdgantt/KDGanttViewEventItem.h
@@ -43,13 +43,13 @@ public:
KDGanttViewEventItem( KDGanttView* view,
const TQString& lvtext = TQString(),
const TQString& name = TQString() );
- KDGanttViewEventItem( KDGanttViewItem* tqparent,
+ KDGanttViewEventItem( KDGanttViewItem* parent,
const TQString& lvtext = TQString(),
const TQString& name = TQString() );
KDGanttViewEventItem( KDGanttView* view, KDGanttViewItem* after,
const TQString& lvtext = TQString(),
const TQString& name = TQString() );
- KDGanttViewEventItem( KDGanttViewItem* tqparent, KDGanttViewItem* after,
+ KDGanttViewEventItem( KDGanttViewItem* parent, KDGanttViewItem* after,
const TQString& lvtext = TQString(),
const TQString& name = TQString() );
virtual ~KDGanttViewEventItem();
diff --git a/kdgantt/KDGanttViewItem.cpp b/kdgantt/KDGanttViewItem.cpp
index 687618139..de80477a5 100644
--- a/kdgantt/KDGanttViewItem.cpp
+++ b/kdgantt/KDGanttViewItem.cpp
@@ -148,10 +148,10 @@
\a KDGanttView::setDisplaySubitemsAsGroup( true );
Insert root items in the Gantt view.
Insert items as tqchildren of these root item in the Gantt view.
- You may use any item type as tqparent and child; there are no limitations.
+ You may use any item type as parent and child; there are no limitations.
It is, however, recommended to use KDGanttViewTaskItems
Actually, you may add child items to the tqchildren themselves.
- Such a child behaves then like a tqparent.
+ Such a child behaves then like a parent.
Now set the start/end time of the tqchildren to specify a time
interval for these items.
*/
@@ -182,7 +182,7 @@ KDGanttViewItem::KDGanttViewItem( Type type, KDGanttView* view,
Constructs an empty Gantt item.
\param type the type of the item to insert
- \param parentItem a tqparent item under which this one goes
+ \param parentItem a parent item under which this one goes
\param lvtext the text to show in the list view
\param name the name by which the item can be identified. If no name
is specified, a unique name will be generated
@@ -224,7 +224,7 @@ KDGanttViewItem::KDGanttViewItem( Type type, KDGanttView* view,
Constructs an empty Gantt item.
\param type the type of the item to insert
- \param parentItem a tqparent item under which this one goes
+ \param parentItem a parent item under which this one goes
\param after another item at the same level behind which this one should go
\param lvtext the text to show in the list view
\param name the name by which the item can be identified. If no name
@@ -268,8 +268,8 @@ KDGanttViewItem::~KDGanttViewItem()
if ( listView() ) {
if ( isOpen() )
setOpen( false );
- if ( tqparent() )
- tqparent()->takeItem( this );
+ if ( parent() )
+ parent()->takeItem( this );
else
myGanttView->myListView->takeItem( this );
myGanttView->myTimeTable->updateMyContent();
@@ -463,9 +463,9 @@ void KDGanttViewItem::setDisplaySubitemsAsGroup( bool show )
if ( !show && _displaySubitemsAsGroup)
isVisibleInGanttView = true;
_displaySubitemsAsGroup = show;
- if ( tqparent() )
- if ( tqparent()->isOpen() )
- tqparent()->setOpen( true );
+ if ( parent() )
+ if ( parent()->isOpen() )
+ parent()->setOpen( true );
if ( isOpen() )
setOpen( true );
updateCanvasItems();
@@ -1248,14 +1248,14 @@ KDGanttViewItem* KDGanttViewItem::nextSibling() const
/*!
- Returns the tqparent item of this item
+ Returns the parent item of this item
- \return the tqparent item of this item, 0 if this item is a top-level
+ \return the parent item of this item, 0 if this item is a top-level
item
*/
-KDGanttViewItem* KDGanttViewItem::tqparent() const
+KDGanttViewItem* KDGanttViewItem::parent() const
{
- return (KDGanttViewItem*)TQListViewItem::tqparent();
+ return (KDGanttViewItem*)TQListViewItem::parent();
}
@@ -1674,22 +1674,22 @@ KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttView* view,
Creates a KDGanttViewItem according to the specification in a DOM
element.
- \param tqparent the tqparent item under which the item will be inserted
+ \param parent the parent item under which the item will be inserted
\param element the DOM element from which to read the specification
\return the newly created element
*/
-KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttViewItem* tqparent,
+KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttViewItem* parent,
TQDomElement& element )
{
TQString typeString = element.attribute( "Type" );
Q_ASSERT( !typeString.isEmpty() );
KDGanttViewItem* item;
if( typeString == "Task" )
- item = new KDGanttViewTaskItem( tqparent );
+ item = new KDGanttViewTaskItem( parent );
else if( typeString == "Summary" )
- item = new KDGanttViewSummaryItem( tqparent );
+ item = new KDGanttViewSummaryItem( parent );
else if( typeString == "Event" )
- item = new KDGanttViewEventItem( tqparent );
+ item = new KDGanttViewEventItem( parent );
else {
qDebug( "Unknown item type in KDGanttViewItem::createFromDomElement()" );
return 0;
@@ -1704,12 +1704,12 @@ KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttViewItem* tqparen
Creates a KDGanttViewItem according to the specification in a DOM
element.
- \param tqparent the tqparent item under which the item will be inserted
+ \param parent the parent item under which the item will be inserted
\param previous to item behind this one should appear
\param element the DOM element from which to read the specification
\return the newly created element
*/
-KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttViewItem* tqparent,
+KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttViewItem* parent,
KDGanttViewItem* previous,
TQDomElement& element )
{
@@ -1717,11 +1717,11 @@ KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttViewItem* tqparen
Q_ASSERT( !typeString.isEmpty() );
KDGanttViewItem* item;
if( typeString == "Task" )
- item = new KDGanttViewTaskItem( tqparent, previous );
+ item = new KDGanttViewTaskItem( parent, previous );
else if( typeString == "Summary" )
- item = new KDGanttViewSummaryItem( tqparent, previous );
+ item = new KDGanttViewSummaryItem( parent, previous );
else if( typeString == "Event" )
- item = new KDGanttViewEventItem( tqparent, previous );
+ item = new KDGanttViewEventItem( parent, previous );
else {
qDebug( "Unknown item type in KDGanttViewItem::createFromDomElement()" );
return 0;
@@ -2228,7 +2228,7 @@ void KDGanttViewItem::paintBranches ( TQPainter* p, const TQColorGroup& cg,
int x_c = w/2;
int y_c = y+y_coord+ temp->height ()/2;
int y_ce ;
- if ( temp->itemBelow() && temp->itemBelow()->tqparent() == this )
+ if ( temp->itemBelow() && temp->itemBelow()->parent() == this )
y_ce =y+y_coord+ temp->height ();
else
y_ce = y_c;
@@ -2255,11 +2255,11 @@ void KDGanttViewItem::resetSubitemVisibility()
if ( myGanttView->calendarMode() ) {
// in calendarmode only items can be opened which have subitems which have subitems
if ( ! temp ) {
- if ( !tqparent() )
- // has no tqparent, has no child : show!
+ if ( !parent() )
+ // has no parent, has no child : show!
setVisible( true );
else
- // has tqparent, has no child : hide!
+ // has parent, has no child : hide!
setVisible( false );
return;
}
diff --git a/kdgantt/KDGanttViewItem.h b/kdgantt/KDGanttViewItem.h
index e08630b87..9e54755b8 100644
--- a/kdgantt/KDGanttViewItem.h
+++ b/kdgantt/KDGanttViewItem.h
@@ -65,13 +65,13 @@ protected:
KDGanttViewItem( Type type, KDGanttView* view,
const TQString& lvtext = TQString(),
const TQString& name = TQString() );
- KDGanttViewItem( Type type, KDGanttViewItem* tqparent,
+ KDGanttViewItem( Type type, KDGanttViewItem* parent,
const TQString& lvtext = TQString(),
const TQString& name = TQString() );
KDGanttViewItem( Type type, KDGanttView* view, KDGanttViewItem* after,
const TQString& lvtext = TQString(),
const TQString& name = TQString() );
- KDGanttViewItem( Type type, KDGanttViewItem* tqparent,
+ KDGanttViewItem( Type type, KDGanttViewItem* parent,
KDGanttViewItem* after,
const TQString& lvtext = TQString(),
const TQString& name = TQString() );
@@ -166,7 +166,7 @@ public:
KDGanttViewItem* firstChild() const;
KDGanttViewItem* nextSibling() const;
- KDGanttViewItem* tqparent() const;
+ KDGanttViewItem* parent() const;
KDGanttViewItem* itemAbove();
KDGanttViewItem* itemBelow( bool includeDisabled = true );
KDGanttViewItem* getChildByName( const TQString& name );
@@ -180,9 +180,9 @@ public:
static KDGanttViewItem* createFromDomElement( KDGanttView* view,
KDGanttViewItem* previous,
TQDomElement& element );
- static KDGanttViewItem* createFromDomElement( KDGanttViewItem* tqparent,
+ static KDGanttViewItem* createFromDomElement( KDGanttViewItem* parent,
TQDomElement& element );
- static KDGanttViewItem* createFromDomElement( KDGanttViewItem* tqparent,
+ static KDGanttViewItem* createFromDomElement( KDGanttViewItem* parent,
KDGanttViewItem* previous,
TQDomElement& element );
diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp
index 2b63d1b1e..c6a326a3c 100644
--- a/kdgantt/KDGanttViewSubwidgets.cpp
+++ b/kdgantt/KDGanttViewSubwidgets.cpp
@@ -58,8 +58,8 @@
#include
#include
-KDTimeTableWidget:: KDTimeTableWidget( TQWidget* tqparent,KDGanttView* myGantt)
- : TQCanvas (TQT_TQOBJECT(tqparent))
+KDTimeTableWidget:: KDTimeTableWidget( TQWidget* parent,KDGanttView* myGantt)
+ : TQCanvas (TQT_TQOBJECT(parent))
{
myGanttView = myGantt;
taskLinksVisible = true;
@@ -695,8 +695,8 @@ int KDTimeTableWidget::getCoordX( TQDateTime dt ) {
/* ***************************************************************
KDTimeHeaderWidget:: KDTimeHeaderWidget
***************************************************************** */
-KDTimeHeaderWidget:: KDTimeHeaderWidget( TQWidget* tqparent,KDGanttView* gant )
- : TQWidget (tqparent)
+KDTimeHeaderWidget:: KDTimeHeaderWidget( TQWidget* parent,KDGanttView* gant )
+ : TQWidget (parent)
{
myToolTip = new KDTimeHeaderToolTip(this,this);
mySizeHint = 0;
@@ -2537,10 +2537,10 @@ void KDTimeHeaderWidget::mouseMoveEvent ( TQMouseEvent * e )
/* ***************************************************************
KDLegendWidget:: KDLegendWidget
***************************************************************** */
-KDLegendWidget:: KDLegendWidget( TQWidget* tqparent,
+KDLegendWidget:: KDLegendWidget( TQWidget* parent,
KDGanttMinimizeSplitter* legendParent ) :
KDGanttSemiSizingControl ( KDGanttSemiSizingControl::Before, Qt::Vertical,
- tqparent)
+ parent)
{
myLegendParent = legendParent;
dock = 0;
@@ -2688,7 +2688,7 @@ bool KDLegendWidget::isShown ( )
}
-KDListView::KDListView(TQWidget* tqparent, KDGanttView* gantView):TQListView (tqparent)
+KDListView::KDListView(TQWidget* parent, KDGanttView* gantView):TQListView (parent)
{
myGanttView = gantView;
setAcceptDrops(true);
@@ -2991,13 +2991,13 @@ void KDListView::dragMoveEvent ( TQDragMoveEvent * e)
}
if ( e->source() == myGanttView && gItem ){
// internal drag - do not allow to drag the item to a subitem of itself
- KDGanttViewItem* pItem = gItem->tqparent();
+ KDGanttViewItem* pItem = gItem->parent();
while ( pItem ) {
if ( pItem == myGanttView->myCanvasView->lastClickedItem ) {
e->accept( false );
return;
}
- pItem = pItem->tqparent();
+ pItem = pItem->parent();
}
if ( gItem == myGanttView->myCanvasView->lastClickedItem ) {
e->accept( false );
@@ -3152,8 +3152,8 @@ KDCanvasRectangle::KDCanvasRectangle( KDTimeTableWidget* canvas,
-KDGanttCanvasView::KDGanttCanvasView( KDGanttView* sender,TQCanvas* canvas, TQWidget* tqparent, const
- char* name ) : TQCanvasView ( canvas, tqparent, name ),
+KDGanttCanvasView::KDGanttCanvasView( KDGanttView* sender,TQCanvas* canvas, TQWidget* parent, const
+ char* name ) : TQCanvasView ( canvas, parent, name ),
movingGVItem( 0 ),
scrollBarTimer( 0, "scrollBarTimer" )
{
@@ -3311,20 +3311,20 @@ void KDGanttCanvasView::insertItemAsRoot( KDGanttViewItem* item )
if ( item == cuttedItem )
cuttedItem = 0;
}
-void KDGanttCanvasView::insertItemAsChild( KDGanttViewItem* tqparent, KDGanttViewItem* item )
+void KDGanttCanvasView::insertItemAsChild( KDGanttViewItem* parent, KDGanttViewItem* item )
{
- tqparent->insertItem( cuttedItem );
+ parent->insertItem( cuttedItem );
if ( item == cuttedItem )
cuttedItem = 0;
}
-void KDGanttCanvasView::insertItemAfter( KDGanttViewItem* tqparent , KDGanttViewItem* item )
+void KDGanttCanvasView::insertItemAfter( KDGanttViewItem* parent , KDGanttViewItem* item )
{
- if ( tqparent->tqparent() ) {
- tqparent->tqparent()->insertItem( item );
+ if ( parent->parent() ) {
+ parent->parent()->insertItem( item );
}
else
mySignalSender->myListView->insertItem( item );
- item->moveItem( tqparent );
+ item->moveItem( parent );
if ( item == cuttedItem )
cuttedItem = 0;
}
@@ -3332,9 +3332,9 @@ void KDGanttCanvasView::insertItemAfter( KDGanttViewItem* tqparent , KDGanttVie
void KDGanttCanvasView::cutItem()
{
lastClickedItem->hideSubtree();
- //qDebug("last clicked %d tqparent %d ", lastClickedItem , lastClickedItem->tqparent());
- if ( lastClickedItem->tqparent() )
- lastClickedItem->tqparent()->takeItem(lastClickedItem);
+ //qDebug("last clicked %d parent %d ", lastClickedItem , lastClickedItem->parent());
+ if ( lastClickedItem->parent() )
+ lastClickedItem->parent()->takeItem(lastClickedItem);
else
mySignalSender->myListView->takeItem( lastClickedItem );
mySignalSender->myTimeTable->updateMyContent();
@@ -3370,8 +3370,8 @@ void KDGanttCanvasView::pasteItem( int type )
lastClickedItem->insertItem( cuttedItem );
break;
case 2://after
- if ( lastClickedItem->tqparent() ) {
- lastClickedItem->tqparent()->insertItem( cuttedItem );
+ if ( lastClickedItem->parent() ) {
+ lastClickedItem->parent()->insertItem( cuttedItem );
}
else
mySignalSender->myListView->insertItem( cuttedItem );
@@ -3418,20 +3418,20 @@ void KDGanttCanvasView::newChildItem( int type )
temp = new KDGanttViewTaskItem( lastClickedItem, i18n( "New Task" ) );
break;
case 5:
- if ( lastClickedItem->tqparent() )
- temp = new KDGanttViewEventItem( lastClickedItem->tqparent(), lastClickedItem, i18n( "New Event" ) );
+ if ( lastClickedItem->parent() )
+ temp = new KDGanttViewEventItem( lastClickedItem->parent(), lastClickedItem, i18n( "New Event" ) );
else
temp = new KDGanttViewEventItem( mySignalSender, lastClickedItem, i18n( "New Event" ) );
break;
case 4:
- if ( lastClickedItem->tqparent() )
- temp = new KDGanttViewSummaryItem( lastClickedItem->tqparent(), lastClickedItem, i18n( "New Summary" ) );
+ if ( lastClickedItem->parent() )
+ temp = new KDGanttViewSummaryItem( lastClickedItem->parent(), lastClickedItem, i18n( "New Summary" ) );
else
temp = new KDGanttViewSummaryItem( mySignalSender, lastClickedItem, i18n( "New Summary" ) );
break;
case 6:
- if ( lastClickedItem->tqparent() )
- temp = new KDGanttViewTaskItem( lastClickedItem->tqparent(), lastClickedItem, i18n( "New Task" ) );
+ if ( lastClickedItem->parent() )
+ temp = new KDGanttViewTaskItem( lastClickedItem->parent(), lastClickedItem, i18n( "New Task" ) );
else
temp = new KDGanttViewTaskItem( mySignalSender, lastClickedItem, i18n( "New Task" ) );
break;
@@ -3984,7 +3984,7 @@ int KDGanttCanvasView::getLinkType(int from, int to) {
/*!
Represents the background color for a given interval of time (across all tasks).
\sa KDGanttView::addIntervalBackgroundColor
- \param view tqparent view
+ \param view parent view
*/
KDIntervalColorRectangle::KDIntervalColorRectangle( KDGanttView* view )
: KDCanvasRectangle( view->timeTableWidget(), 0, Type_is_KDGanttGridItem ),
diff --git a/kdgantt/KDGanttViewSubwidgets.h b/kdgantt/KDGanttViewSubwidgets.h
index 37e70a563..b044c10ec 100644
--- a/kdgantt/KDGanttViewSubwidgets.h
+++ b/kdgantt/KDGanttViewSubwidgets.h
@@ -99,7 +99,7 @@ public:
enum HourFormat { Hour_24, Hour_12 };
*/
- KDTimeHeaderWidget (TQWidget* tqparent,KDGanttView* gant);
+ KDTimeHeaderWidget (TQWidget* parent,KDGanttView* gant);
~KDTimeHeaderWidget();
TQString getToolTipText(TQPoint p);
@@ -257,7 +257,7 @@ class KDTimeTableWidget : public TQCanvas
TQ_OBJECT
public:
- KDTimeTableWidget (TQWidget* tqparent,KDGanttView* my);
+ KDTimeTableWidget (TQWidget* parent,KDGanttView* my);
void setBlockUpdating( bool block = true );
bool blockUpdating();
@@ -334,7 +334,7 @@ class KDLegendWidget : public KDGanttSemiSizingControl
TQ_OBJECT
public:
- KDLegendWidget ( TQWidget* tqparent, KDGanttMinimizeSplitter* legendParent );
+ KDLegendWidget ( TQWidget* parent, KDGanttMinimizeSplitter* legendParent );
void showMe(bool);
bool isShown();
void addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text );
@@ -361,7 +361,7 @@ class KDListView : public TQListView
TQ_OBJECT
public:
- KDListView (TQWidget* tqparent,KDGanttView* gv );
+ KDListView (TQWidget* parent,KDGanttView* gv );
KDGanttView* myGanttView;
void drawToPainter( TQPainter *p, bool drawHeader=false );
void setCalendarMode( bool mode );
@@ -490,7 +490,7 @@ class KDGanttCanvasView : public TQCanvasView
TQ_OBJECT
public:
- KDGanttCanvasView(KDGanttView* sender, TQCanvas* canvas = 0, TQWidget* tqparent = 0, const char* name = 0 );
+ KDGanttCanvasView(KDGanttView* sender, TQCanvas* canvas = 0, TQWidget* parent = 0, const char* name = 0 );
~KDGanttCanvasView();
TQString getToolTipText(TQPoint p);
TQString getWhatsThisText(TQPoint p);
diff --git a/kdgantt/KDGanttViewSummaryItem.cpp b/kdgantt/KDGanttViewSummaryItem.cpp
index 31d21cf9d..96980d2ac 100644
--- a/kdgantt/KDGanttViewSummaryItem.cpp
+++ b/kdgantt/KDGanttViewSummaryItem.cpp
@@ -65,15 +65,15 @@ KDGanttViewSummaryItem::KDGanttViewSummaryItem( KDGanttView* view,
/*!
Constructs an empty Gantt item of type event.
- \param tqparent a tqparent item under which this one goes
+ \param parent a parent item under which this one goes
\param lvtext the text to show in the list view
\param name the name by which the item can be identified. If no name
is specified, a unique name will be generated
*/
-KDGanttViewSummaryItem::KDGanttViewSummaryItem( KDGanttViewItem* tqparent,
+KDGanttViewSummaryItem::KDGanttViewSummaryItem( KDGanttViewItem* parent,
const TQString& lvtext,
const TQString& name ) :
- KDGanttViewItem( Summary, tqparent, lvtext, name )
+ KDGanttViewItem( Summary, parent, lvtext, name )
{
initItem();
}
@@ -101,17 +101,17 @@ KDGanttViewSummaryItem::KDGanttViewSummaryItem( KDGanttView* view,
/*!
Constructs an empty Gantt item of type event.
- \param tqparent a tqparent item under which this one goes
+ \param parent a parent item under which this one goes
\param after another item at the same level behind which this one should go
\param lvtext the text to show in the list view
\param name the name by which the item can be identified. If no name
is specified, a unique name will be generated
*/
-KDGanttViewSummaryItem::KDGanttViewSummaryItem( KDGanttViewItem* tqparent,
+KDGanttViewSummaryItem::KDGanttViewSummaryItem( KDGanttViewItem* parent,
KDGanttViewItem* after,
const TQString& lvtext,
const TQString& name ) :
- KDGanttViewItem( Summary, tqparent, after, lvtext, name )
+ KDGanttViewItem( Summary, parent, after, lvtext, name )
{
initItem();
@@ -272,7 +272,7 @@ void KDGanttViewSummaryItem::showItem( bool show, int coordY )
hideMe();
return;
}
- if ( displaySubitemsAsGroup() && !tqparent() && !isOpen() ) {
+ if ( displaySubitemsAsGroup() && !parent() && !isOpen() ) {
hideMe();
return;
}
diff --git a/kdgantt/KDGanttViewSummaryItem.h b/kdgantt/KDGanttViewSummaryItem.h
index 3b2bb9c8e..7361adca4 100644
--- a/kdgantt/KDGanttViewSummaryItem.h
+++ b/kdgantt/KDGanttViewSummaryItem.h
@@ -43,13 +43,13 @@ public:
KDGanttViewSummaryItem( KDGanttView* view,
const TQString& lvtext = TQString(),
const TQString& name = TQString() );
- KDGanttViewSummaryItem( KDGanttViewItem* tqparent,
+ KDGanttViewSummaryItem( KDGanttViewItem* parent,
const TQString& lvtext = TQString(),
const TQString& name = TQString() );
KDGanttViewSummaryItem( KDGanttView* view, KDGanttViewItem* after,
const TQString& lvtext = TQString(),
const TQString& name = TQString() );
- KDGanttViewSummaryItem( KDGanttViewItem* tqparent, KDGanttViewItem* after,
+ KDGanttViewSummaryItem( KDGanttViewItem* parent, KDGanttViewItem* after,
const TQString& lvtext = TQString(),
const TQString& name = TQString() );
virtual ~KDGanttViewSummaryItem();
diff --git a/kdgantt/KDGanttViewTaskItem.cpp b/kdgantt/KDGanttViewTaskItem.cpp
index 8154216bf..a89f23603 100644
--- a/kdgantt/KDGanttViewTaskItem.cpp
+++ b/kdgantt/KDGanttViewTaskItem.cpp
@@ -79,15 +79,15 @@ KDGanttViewTaskItem::KDGanttViewTaskItem( KDGanttView* view,
/*!
Constructs an empty Gantt item of type event.
- \param tqparent a tqparent item under which this one goes
+ \param parent a parent item under which this one goes
\param lvtext the text to show in the list view
\param name the name by which the item can be identified. If no name
is specified, a unique name will be generated
*/
-KDGanttViewTaskItem::KDGanttViewTaskItem( KDGanttViewItem* tqparent,
+KDGanttViewTaskItem::KDGanttViewTaskItem( KDGanttViewItem* parent,
const TQString& lvtext,
const TQString& name ) :
- KDGanttViewItem( Task, tqparent, lvtext, name )
+ KDGanttViewItem( Task, parent, lvtext, name )
{
initItem();
}
@@ -115,17 +115,17 @@ KDGanttViewTaskItem::KDGanttViewTaskItem( KDGanttView* view,
/*!
Constructs an empty Gantt item of type event.
- \param tqparent a tqparent item under which this one goes
+ \param parent a parent item under which this one goes
\param after another item at the same level behind which this one should go
\param lvtext the text to show in the listview
\param name the name by which the item can be identified. If no name
is specified, a unique name will be generated
*/
-KDGanttViewTaskItem::KDGanttViewTaskItem( KDGanttViewItem* tqparent,
+KDGanttViewTaskItem::KDGanttViewTaskItem( KDGanttViewItem* parent,
KDGanttViewItem* after,
const TQString& lvtext,
const TQString& name ) :
- KDGanttViewItem( Task, tqparent, after, lvtext, name )
+ KDGanttViewItem( Task, parent, after, lvtext, name )
{
initItem();
}
@@ -216,7 +216,7 @@ void KDGanttViewTaskItem::showItem(bool show, int coordY)
floatEndShape->setZ(startShape->z()+0.003); // less than textCanvas
floatEndShape->hide();
textCanvas->setZ( prio + 0.005 );
- if ( displaySubitemsAsGroup() && !tqparent() && !isOpen() ) {
+ if ( displaySubitemsAsGroup() && !parent() && !isOpen() ) {
hideMe();
return;
}
@@ -242,9 +242,9 @@ void KDGanttViewTaskItem::showItem(bool show, int coordY)
}
int hei = height();
if ( ! isVisible() ) {
- KDGanttViewItem * par = tqparent();
+ KDGanttViewItem * par = parent();
while ( par != 0 && !par->isVisible() )
- par = par->tqparent();
+ par = par->parent();
if ( par )
hei = par->height();
}
@@ -356,9 +356,9 @@ void KDGanttViewTaskItem::initItem()
{
isVisibleInGanttView = false;
- if ( myGanttView->calendarMode() && tqparent() ) {
+ if ( myGanttView->calendarMode() && parent() ) {
setVisible( false );
- tqparent()->setVisible( true );
+ parent()->setVisible( true );
} else
showItem(true);
//qDebug("initItem %s %s", listViewText().latin1(),startShape->brush().color().name().latin1() );
diff --git a/kdgantt/KDGanttViewTaskItem.h b/kdgantt/KDGanttViewTaskItem.h
index cd77240e4..aa958d2ce 100644
--- a/kdgantt/KDGanttViewTaskItem.h
+++ b/kdgantt/KDGanttViewTaskItem.h
@@ -46,13 +46,13 @@ public:
KDGanttViewTaskItem( KDGanttView* view,
const TQString& lvtext = TQString(),
const TQString& name = TQString() );
- KDGanttViewTaskItem( KDGanttViewItem* tqparent,
+ KDGanttViewTaskItem( KDGanttViewItem* parent,
const TQString& lvtext = TQString(),
const TQString& name = TQString() );
KDGanttViewTaskItem( KDGanttView* view, KDGanttViewItem* after,
const TQString& lvtext = TQString(),
const TQString& name = TQString() );
- KDGanttViewTaskItem( KDGanttViewItem* tqparent, KDGanttViewItem* after,
+ KDGanttViewTaskItem( KDGanttViewItem* parent, KDGanttViewItem* after,
const TQString& lvtext = TQString(),
const TQString& name = TQString() );
virtual ~KDGanttViewTaskItem();
diff --git a/kdgantt/KDGanttXMLTools.cpp b/kdgantt/KDGanttXMLTools.cpp
index e6246138c..5f2909c07 100644
--- a/kdgantt/KDGanttXMLTools.cpp
+++ b/kdgantt/KDGanttXMLTools.cpp
@@ -40,12 +40,12 @@
namespace KDGanttXML {
-void createBoolNode( TQDomDocument& doc, TQDomNode& tqparent,
+void createBoolNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName, bool value )
{
TQDomElement newElement =
doc.createElement( elementName );
- tqparent.appendChild( newElement );
+ parent.appendChild( newElement );
TQDomText elementContent =
doc.createTextNode( value ? "true" : "false" );
newElement.appendChild( elementContent );
@@ -53,59 +53,59 @@ void createBoolNode( TQDomDocument& doc, TQDomNode& tqparent,
-void createSizeNode( TQDomDocument& doc, TQDomNode& tqparent,
+void createSizeNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName, const TQSize& value )
{
TQDomElement newElement =
doc.createElement( elementName );
- tqparent.appendChild( newElement );
+ parent.appendChild( newElement );
newElement.setAttribute( "Width", value.width() );
newElement.setAttribute( "Height", value.height() );
}
-void createIntNode( TQDomDocument& doc, TQDomNode& tqparent,
+void createIntNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName, int value )
{
TQDomElement newElement =
doc.createElement( elementName );
- tqparent.appendChild( newElement );
+ parent.appendChild( newElement );
TQDomText elementContent =
doc.createTextNode( TQString::number( value ) );
newElement.appendChild( elementContent );
}
-void createDoubleNode( TQDomDocument& doc, TQDomNode& tqparent,
+void createDoubleNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName, double value )
{
TQDomElement newElement =
doc.createElement( elementName );
- tqparent.appendChild( newElement );
+ parent.appendChild( newElement );
TQDomText elementContent =
doc.createTextNode( TQString::number( value ) );
newElement.appendChild( elementContent );
}
-void createStringNode( TQDomDocument& doc, TQDomNode& tqparent,
+void createStringNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName,
const TQString& text )
{
TQDomElement newElement =
doc.createElement( elementName );
- tqparent.appendChild( newElement );
+ parent.appendChild( newElement );
TQDomText elementContent =
doc.createTextNode( text );
newElement.appendChild( elementContent );
}
-void createColorNode( TQDomDocument& doc, TQDomNode& tqparent,
+void createColorNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName, const TQColor& color )
{
TQDomElement colorElement = doc.createElement( elementName );
- tqparent.appendChild( colorElement );
+ parent.appendChild( colorElement );
colorElement.setAttribute( "Red",
TQString::number( color.red() ) );
colorElement.setAttribute( "Green",
@@ -115,12 +115,12 @@ void createColorNode( TQDomDocument& doc, TQDomNode& tqparent,
}
-void createBrushNode( TQDomDocument& doc, TQDomNode& tqparent,
+void createBrushNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName, const TQBrush& brush )
{
TQDomElement brushElement = doc.createElement( elementName );
- tqparent.appendChild( brushElement );
+ parent.appendChild( brushElement );
createColorNode( doc, brushElement, "Color", brush.color() );
createStringNode( doc, brushElement, "Style",
KDGanttXML::brushStyleToString( brush.style() ) );
@@ -129,11 +129,11 @@ void createBrushNode( TQDomDocument& doc, TQDomNode& tqparent,
}
-void createPixmapNode( TQDomDocument& doc, TQDomNode& tqparent,
+void createPixmapNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName, const TQPixmap& pixmap )
{
TQDomElement pixmapElement = doc.createElement( elementName );
- tqparent.appendChild( pixmapElement );
+ parent.appendChild( pixmapElement );
// Convert the pixmap to an image, save that image to an in-memory
// XPM representation and compress this representation. This
@@ -163,11 +163,11 @@ void createPixmapNode( TQDomDocument& doc, TQDomNode& tqparent,
}
-void createRectNode( TQDomDocument& doc, TQDomNode& tqparent,
+void createRectNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName, const TQRect& rect )
{
TQDomElement rectElement = doc.createElement( elementName );
- tqparent.appendChild( rectElement );
+ parent.appendChild( rectElement );
TQDomElement xElement = doc.createElement( "X" );
rectElement.appendChild( xElement );
TQDomText xContent = doc.createTextNode( TQString::number( rect.x() ) );
@@ -187,7 +187,7 @@ void createRectNode( TQDomDocument& doc, TQDomNode& tqparent,
}
-void createStringListNodes( TQDomDocument& doc, TQDomNode& tqparent,
+void createStringListNodes( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName,
const TQStringList* list )
{
@@ -197,18 +197,18 @@ void createStringListNodes( TQDomDocument& doc, TQDomNode& tqparent,
for( TQStringList::ConstIterator it = list->begin();
it != list->end(); ++it ) {
TQDomElement element = doc.createElement( elementName );
- tqparent.appendChild( element );
+ parent.appendChild( element );
TQDomText elementContent = doc.createTextNode( *it );
element.appendChild( elementContent );
}
}
-void createFontNode( TQDomDocument& doc, TQDomNode& tqparent,
+void createFontNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName, const TQFont& font )
{
TQDomElement fontElement = doc.createElement( elementName );
- tqparent.appendChild( fontElement );
+ parent.appendChild( fontElement );
createStringNode( doc, fontElement, "Family", font.family() );
createIntNode( doc, fontElement, "PointSize", font.pointSize() );
createIntNode( doc, fontElement, "PixelSize", font.pixelSize() );
@@ -217,44 +217,44 @@ void createFontNode( TQDomDocument& doc, TQDomNode& tqparent,
}
-void createPenNode( TQDomDocument& doc, TQDomNode& tqparent,
+void createPenNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName, const TQPen& pen )
{
TQDomElement penElement = doc.createElement( elementName );
- tqparent.appendChild( penElement );
+ parent.appendChild( penElement );
createIntNode( doc, penElement, "Width", pen.width() );
createColorNode( doc, penElement, "Color", pen.color() );
createStringNode( doc, penElement, "Style", penStyleToString( pen.style() ) );
}
-void createDateTimeNode( TQDomDocument& doc, TQDomNode& tqparent,
+void createDateTimeNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName,
const TQDateTime& datetime )
{
TQDomElement dateTimeElement = doc.createElement( elementName );
- tqparent.appendChild( dateTimeElement );
+ parent.appendChild( dateTimeElement );
createDateNode( doc, dateTimeElement, "Date", datetime.date() );
createTimeNode( doc, dateTimeElement, "Time", datetime.time() );
}
-void createDateNode( TQDomDocument& doc, TQDomNode& tqparent,
+void createDateNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName, const TQDate& date )
{
TQDomElement dateElement = doc.createElement( elementName );
- tqparent.appendChild( dateElement );
+ parent.appendChild( dateElement );
dateElement.setAttribute( "Year", TQString::number( date.year() ) );
dateElement.setAttribute( "Month", TQString::number( date.month() ) );
dateElement.setAttribute( "Day", TQString::number( date.day() ) );
}
-void createTimeNode( TQDomDocument& doc, TQDomNode& tqparent,
+void createTimeNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName, const TQTime& time )
{
TQDomElement timeElement = doc.createElement( elementName );
- tqparent.appendChild( timeElement );
+ parent.appendChild( timeElement );
timeElement.setAttribute( "Hour",
TQString::number( time.hour() ) );
timeElement.setAttribute( "Minute",
diff --git a/kdgantt/KDGanttXMLTools.h b/kdgantt/KDGanttXMLTools.h
index 8ea81f464..2583ec81b 100644
--- a/kdgantt/KDGanttXMLTools.h
+++ b/kdgantt/KDGanttXMLTools.h
@@ -50,39 +50,39 @@ namespace KDGanttXML {
TQString brushStyleToString( Qt::BrushStyle style );
Qt::BrushStyle stringToBrushStyle( const TQString& style );
- void createBoolNode( TQDomDocument& doc, TQDomNode& tqparent,
+ void createBoolNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName, bool value );
- void createSizeNode( TQDomDocument& doc, TQDomNode& tqparent,
+ void createSizeNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName, const TQSize& value );
- void createIntNode( TQDomDocument& doc, TQDomNode& tqparent,
+ void createIntNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName, int value );
- void createDoubleNode( TQDomDocument& doc, TQDomNode& tqparent,
+ void createDoubleNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName, double value );
- void createStringNode( TQDomDocument& doc, TQDomNode& tqparent,
+ void createStringNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName,
const TQString& text );
- void createColorNode( TQDomDocument& doc, TQDomNode& tqparent,
+ void createColorNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName, const TQColor& color );
- void createBrushNode( TQDomDocument& doc, TQDomNode& tqparent,
+ void createBrushNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName, const TQBrush& brush );
- void createPixmapNode( TQDomDocument& doc, TQDomNode& tqparent,
+ void createPixmapNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName, const TQPixmap& pixmap );
- void createRectNode( TQDomDocument& doc, TQDomNode& tqparent,
+ void createRectNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName, const TQRect& rect );
- void createStringListNodes( TQDomDocument& doc, TQDomNode& tqparent,
+ void createStringListNodes( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName,
const TQStringList* list );
- void createFontNode( TQDomDocument& doc, TQDomNode& tqparent,
+ void createFontNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName, const TQFont& font );
- void createPenNode( TQDomDocument& doc, TQDomNode& tqparent,
+ void createPenNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName, const TQPen& pen );
- void createDateTimeNode( TQDomDocument& doc, TQDomNode& tqparent,
+ void createDateTimeNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName,
const TQDateTime& datetime );
- void createDateNode( TQDomDocument& doc, TQDomNode& tqparent,
+ void createDateNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName, const TQDate& date );
- void createTimeNode( TQDomDocument& doc, TQDomNode& tqparent,
+ void createTimeNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName, const TQTime& time );
bool readIntNode( const TQDomElement& element, int& value );
bool readStringNode( const TQDomElement& element, TQString& value );
diff --git a/kfile-plugins/ics/kfile_ics.cpp b/kfile-plugins/ics/kfile_ics.cpp
index aa4ece8c9..b8346f4f4 100644
--- a/kfile-plugins/ics/kfile_ics.cpp
+++ b/kfile-plugins/ics/kfile_ics.cpp
@@ -33,8 +33,8 @@ using namespace KCal;
typedef KGenericFactory ICSFactory;
K_EXPORT_COMPONENT_FACTORY(kfile_ics, ICSFactory( "kfile_ics" ))
-ICSPlugin::ICSPlugin( TQObject *tqparent, const char *name, const TQStringList& args )
- : KFilePlugin( tqparent, name, args )
+ICSPlugin::ICSPlugin( TQObject *parent, const char *name, const TQStringList& args )
+ : KFilePlugin( parent, name, args )
{
KFileMimeTypeInfo* info = addMimeTypeInfo( "text/calendar" ); //TODO: vcs !!
diff --git a/kfile-plugins/ics/kfile_ics.h b/kfile-plugins/ics/kfile_ics.h
index 342c0d454..ad8078602 100644
--- a/kfile-plugins/ics/kfile_ics.h
+++ b/kfile-plugins/ics/kfile_ics.h
@@ -29,7 +29,7 @@ class ICSPlugin : public KFilePlugin
Q_OBJECT
TQ_OBJECT
public:
- ICSPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
+ ICSPlugin( TQObject *parent, const char *name, const TQStringList& args );
virtual bool readInfo( KFileMetaInfo& info, uint what );
};
diff --git a/kfile-plugins/palm-databases/kfile_palm.cpp b/kfile-plugins/palm-databases/kfile_palm.cpp
index 0e4db00cd..c38650766 100644
--- a/kfile-plugins/palm-databases/kfile_palm.cpp
+++ b/kfile-plugins/palm-databases/kfile_palm.cpp
@@ -33,10 +33,10 @@ typedef KGenericFactory PalmFactory;
K_EXPORT_COMPONENT_FACTORY(kfile_palm, PalmFactory( "kfile_palm" ))
-KPalmPlugin::KPalmPlugin(TQObject *tqparent, const char *name,
+KPalmPlugin::KPalmPlugin(TQObject *parent, const char *name,
const TQStringList &args)
- : KFilePlugin(tqparent, name, args)
+ : KFilePlugin(parent, name, args)
{
KFileMimeTypeInfo* info = addMimeTypeInfo( "application/vnd.palm" );
diff --git a/kfile-plugins/palm-databases/kfile_palm.h b/kfile-plugins/palm-databases/kfile_palm.h
index d42225ee1..edd9441b1 100644
--- a/kfile-plugins/palm-databases/kfile_palm.h
+++ b/kfile-plugins/palm-databases/kfile_palm.h
@@ -32,7 +32,7 @@ class KPalmPlugin: public KFilePlugin
TQ_OBJECT
public:
- KPalmPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
+ KPalmPlugin( TQObject *parent, const char *name, const TQStringList& args );
virtual bool readInfo( KFileMetaInfo& info, uint what);
// virtual bool writeInfo( const KFileMetaInfo& info ) const;
diff --git a/kfile-plugins/rfc822/kfile_rfc822.cpp b/kfile-plugins/rfc822/kfile_rfc822.cpp
index f5ee73c62..6d2488841 100644
--- a/kfile-plugins/rfc822/kfile_rfc822.cpp
+++ b/kfile-plugins/rfc822/kfile_rfc822.cpp
@@ -42,10 +42,10 @@ typedef KGenericFactory Rfc822Factory;
K_EXPORT_COMPONENT_FACTORY(kfile_rfc822, Rfc822Factory( "kfile_rfc822" ))
-KRfc822Plugin::KRfc822Plugin(TQObject *tqparent, const char *name,
+KRfc822Plugin::KRfc822Plugin(TQObject *parent, const char *name,
const TQStringList &args)
- : KFilePlugin(tqparent, name, args)
+ : KFilePlugin(parent, name, args)
{
KFileMimeTypeInfo* info = addMimeTypeInfo( "message/rfc822" );
diff --git a/kfile-plugins/rfc822/kfile_rfc822.h b/kfile-plugins/rfc822/kfile_rfc822.h
index 9a2325066..fee88d635 100644
--- a/kfile-plugins/rfc822/kfile_rfc822.h
+++ b/kfile-plugins/rfc822/kfile_rfc822.h
@@ -30,7 +30,7 @@ class KRfc822Plugin: public KFilePlugin
TQ_OBJECT
public:
- KRfc822Plugin( TQObject *tqparent, const char *name, const TQStringList& args );
+ KRfc822Plugin( TQObject *parent, const char *name, const TQStringList& args );
virtual bool readInfo( KFileMetaInfo& info, uint what);
};
diff --git a/kfile-plugins/vcf/kfile_vcf.cpp b/kfile-plugins/vcf/kfile_vcf.cpp
index 7297179d0..c8c853f76 100644
--- a/kfile-plugins/vcf/kfile_vcf.cpp
+++ b/kfile-plugins/vcf/kfile_vcf.cpp
@@ -33,10 +33,10 @@ typedef KGenericFactory VcfFactory;
K_EXPORT_COMPONENT_FACTORY(kfile_vcf, VcfFactory( "kfile_vcf" ))
-KVcfPlugin::KVcfPlugin(TQObject *tqparent, const char *name,
+KVcfPlugin::KVcfPlugin(TQObject *parent, const char *name,
const TQStringList &args)
- : KFilePlugin(tqparent, name, args)
+ : KFilePlugin(parent, name, args)
{
KFileMimeTypeInfo* info = addMimeTypeInfo( "text/x-vcard" );
diff --git a/kfile-plugins/vcf/kfile_vcf.h b/kfile-plugins/vcf/kfile_vcf.h
index e617d4db7..4f039e5da 100644
--- a/kfile-plugins/vcf/kfile_vcf.h
+++ b/kfile-plugins/vcf/kfile_vcf.h
@@ -30,7 +30,7 @@ class KVcfPlugin: public KFilePlugin
TQ_OBJECT
public:
- KVcfPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
+ KVcfPlugin( TQObject *parent, const char *name, const TQStringList& args );
virtual bool readInfo( KFileMetaInfo& info, uint what);
};
diff --git a/kgantt/kgantt/KGantt.cpp b/kgantt/kgantt/KGantt.cpp
index a3360c7a5..249f11ad9 100644
--- a/kgantt/kgantt/KGantt.cpp
+++ b/kgantt/kgantt/KGantt.cpp
@@ -15,8 +15,8 @@
KGantt::KGantt(KGanttItem* toplevelitem,
- TQWidget* tqparent, const char * name, WFlags f)
- : TQWidget(tqparent,name,f)
+ TQWidget* parent, const char * name, WFlags f)
+ : TQWidget(parent,name,f)
{
#ifdef _DEBUG_
printf("KGantt::KGantt()\n");
diff --git a/kgantt/kgantt/KGantt.h b/kgantt/kgantt/KGantt.h
index 7448e01a3..5fc77fe4d 100644
--- a/kgantt/kgantt/KGantt.h
+++ b/kgantt/kgantt/KGantt.h
@@ -103,7 +103,7 @@ public:
*
*/
KGantt(KGanttItem* toplevelitem = 0,
- TQWidget* tqparent = 0, const char * name=0, WFlags f=0 );
+ TQWidget* parent = 0, const char * name=0, WFlags f=0 );
/// Destructor.
diff --git a/kgantt/kgantt/KGanttBarConfig.cpp b/kgantt/kgantt/KGanttBarConfig.cpp
index e41dc7c60..ff5f4ee8e 100644
--- a/kgantt/kgantt/KGanttBarConfig.cpp
+++ b/kgantt/kgantt/KGanttBarConfig.cpp
@@ -13,9 +13,9 @@
KGanttBarConfig::KGanttBarConfig(xQGanttBarView* barview,
- TQWidget* tqparent,
+ TQWidget* parent,
const char * name, WFlags f)
- : TQWidget(tqparent,name,f)
+ : TQWidget(parent,name,f)
{
_barview = barview;
KColorButton* b = new KColorButton(this);
diff --git a/kgantt/kgantt/KGanttBarConfig.h b/kgantt/kgantt/KGanttBarConfig.h
index e12475b1d..fae399d05 100644
--- a/kgantt/kgantt/KGanttBarConfig.h
+++ b/kgantt/kgantt/KGanttBarConfig.h
@@ -43,7 +43,7 @@ class KGanttBarConfig : public TQWidget
public:
KGanttBarConfig(xQGanttBarView* barview,
- TQWidget* tqparent = 0, const char* name=0, WFlags f=0);
+ TQWidget* parent = 0, const char* name=0, WFlags f=0);
protected slots:
diff --git a/kgantt/kgantt/xQGanttBarView.cpp b/kgantt/kgantt/xQGanttBarView.cpp
index f85fea6b4..60d25797d 100644
--- a/kgantt/kgantt/xQGanttBarView.cpp
+++ b/kgantt/kgantt/xQGanttBarView.cpp
@@ -12,9 +12,9 @@
xQGanttBarView::xQGanttBarView(KGanttItem* toplevelitem,
- TQWidget* tqparent,
+ TQWidget* parent,
const char * name, WFlags f)
- : TQScrollView(tqparent,name,f)
+ : TQScrollView(parent,name,f)
{
_config = NULL;
diff --git a/kgantt/kgantt/xQGanttBarView.h b/kgantt/kgantt/xQGanttBarView.h
index d9037b404..b22753c53 100644
--- a/kgantt/kgantt/xQGanttBarView.h
+++ b/kgantt/kgantt/xQGanttBarView.h
@@ -62,7 +62,7 @@ public:
/*!
*
*/
- xQGanttBarView(KGanttItem* toplevelitem, TQWidget* tqparent = 0,
+ xQGanttBarView(KGanttItem* toplevelitem, TQWidget* parent = 0,
const char * name=0, WFlags f=0 );
diff --git a/kgantt/kgantt/xQGanttBarViewPort.cpp b/kgantt/kgantt/xQGanttBarViewPort.cpp
index 6ac4daaee..536761eaa 100644
--- a/kgantt/kgantt/xQGanttBarViewPort.cpp
+++ b/kgantt/kgantt/xQGanttBarViewPort.cpp
@@ -22,12 +22,12 @@
xQGanttBarViewPort::xQGanttBarViewPort(KGanttItem* toplevelitem,
- xQGanttBarView* tqparent,
+ xQGanttBarView* parent,
const char * name, WFlags f)
- : TQFrame(tqparent,name,f)
+ : TQFrame(parent,name,f)
/////////////////////////////////////////////////////////////////////////////
{
- _tqparent = tqparent;
+ _parent = parent;
closedIcon = TQPixmap(open_xpm);
openedIcon = TQPixmap(close_xpm);
@@ -239,7 +239,7 @@ xQGanttBarViewPort::initMenu()
pix = _iconloader->loadIcon("configure.png", KIcon::Toolbar , 16 );
if(pix.isNull()) printf("configure.png not found !\n");
- _menu->insertItem(pix, i18n("Configure Gantt..."), _tqparent, TQT_SLOT(showConfig()));
+ _menu->insertItem(pix, i18n("Configure Gantt..."), _parent, TQT_SLOT(showConfig()));
}
@@ -839,7 +839,7 @@ xQGanttBarViewPort::zoom(double sfactor, int sx, int sy)
recalc();
adjustSize();
- _tqparent->center(screenX(wx), screenY(wy) );
+ _parent->center(screenX(wx), screenY(wy) );
TQWidget::update();
@@ -854,12 +854,12 @@ xQGanttBarViewPort::zoom(double sfactor)
{
printf("zoom %f \n", sfactor );
- int x = (int) (_tqparent->visibleWidth()/2 + 0.5);
- int y = (int) (_tqparent->visibleHeight()/2 + 0.5);
+ int x = (int) (_parent->visibleWidth()/2 + 0.5);
+ int y = (int) (_parent->visibleHeight()/2 + 0.5);
printf("dx/2 = %d, dy/2 = %d \n", x,y);
- zoom(sfactor, x + _tqparent->contentsX(), y + _tqparent->contentsY() );
+ zoom(sfactor, x + _parent->contentsX(), y + _parent->contentsY() );
}
@@ -872,7 +872,7 @@ xQGanttBarViewPort::zoomAll()
printf("zoom all. scaleX = %f\n", _scaleX );
#endif
- _scaleX = ((double) _tqparent->visibleWidth()*60)/
+ _scaleX = ((double) _parent->visibleWidth()*60)/
((double) (_toplevelitem->getStart().secsTo(_toplevelitem->getEnd()) + _marginX*120));
recalc();
diff --git a/kgantt/kgantt/xQGanttBarViewPort.h b/kgantt/kgantt/xQGanttBarViewPort.h
index e84761e14..fa6b7483e 100644
--- a/kgantt/kgantt/xQGanttBarViewPort.h
+++ b/kgantt/kgantt/xQGanttBarViewPort.h
@@ -104,7 +104,7 @@ public:
/*!
*
*/
- xQGanttBarViewPort(KGanttItem* toplevelitem, xQGanttBarView* tqparent = 0,
+ xQGanttBarViewPort(KGanttItem* toplevelitem, xQGanttBarView* parent = 0,
const char * name=0, WFlags f=0 );
@@ -245,7 +245,7 @@ private:
// this will be set by setParentScrollView()
- xQGanttBarView* _tqparent;
+ xQGanttBarView* _parent;
int _grid, _snapgrid;
bool _drawGrid, _drawHeader;
diff --git a/kgantt/kgantt/xQGanttBarViewPort_Events.cpp b/kgantt/kgantt/xQGanttBarViewPort_Events.cpp
index ffd85d305..52f017e27 100644
--- a/kgantt/kgantt/xQGanttBarViewPort_Events.cpp
+++ b/kgantt/kgantt/xQGanttBarViewPort_Events.cpp
@@ -245,7 +245,7 @@ xQGanttBarViewPort::mouseReleaseEvent(TQMouseEvent* e)
double sys_width = fabs(x2 - x1);
- double mass = (_tqparent->visibleWidth()/ sys_width);
+ double mass = (_parent->visibleWidth()/ sys_width);
zoom(mass, (int) (x1+(x2-x1)/2), (int) (y1+(y2-y1)/2) );
diff --git a/kgantt/kgantt/xQGanttListView.cpp b/kgantt/kgantt/xQGanttListView.cpp
index f5a587dab..3f5f44c28 100644
--- a/kgantt/kgantt/xQGanttListView.cpp
+++ b/kgantt/kgantt/xQGanttListView.cpp
@@ -10,9 +10,9 @@
#include
#include
-xQGanttListView::xQGanttListView(KGanttItem* toplevelitem, TQWidget* tqparent,
+xQGanttListView::xQGanttListView(KGanttItem* toplevelitem, TQWidget* parent,
const char * name, WFlags f)
- : TQScrollView(tqparent,name,f)
+ : TQScrollView(parent,name,f)
/////////////////////////////////////////////////////////
{
_toplevelitem = toplevelitem;
diff --git a/kgantt/kgantt/xQGanttListView.h b/kgantt/kgantt/xQGanttListView.h
index fa0f973da..3842abe88 100644
--- a/kgantt/kgantt/xQGanttListView.h
+++ b/kgantt/kgantt/xQGanttListView.h
@@ -59,7 +59,7 @@ public:
/*!
*
*/
- xQGanttListView(KGanttItem* toplevelitem, TQWidget* tqparent = 0,
+ xQGanttListView(KGanttItem* toplevelitem, TQWidget* parent = 0,
const char * name=0, WFlags f=0 );
diff --git a/kgantt/kgantt/xQGanttListViewPort.cpp b/kgantt/kgantt/xQGanttListViewPort.cpp
index 2549c8807..d643fe8cb 100644
--- a/kgantt/kgantt/xQGanttListViewPort.cpp
+++ b/kgantt/kgantt/xQGanttListViewPort.cpp
@@ -13,9 +13,9 @@
int xQGanttListViewPort::_ListViewCounter = 0;
-xQGanttListViewPort::xQGanttListViewPort(KGanttItem* toplevelitem, TQWidget* tqparent,
+xQGanttListViewPort::xQGanttListViewPort(KGanttItem* toplevelitem, TQWidget* parent,
const char * name, WFlags f )
- : TQFrame(tqparent,name,f)
+ : TQFrame(parent,name,f)
{
_toplevelitem = toplevelitem;
diff --git a/kgantt/kgantt/xQGanttListViewPort.h b/kgantt/kgantt/xQGanttListViewPort.h
index a2e97ca3b..365b316ba 100644
--- a/kgantt/kgantt/xQGanttListViewPort.h
+++ b/kgantt/kgantt/xQGanttListViewPort.h
@@ -61,7 +61,7 @@ public:
/*!
*
*/
- xQGanttListViewPort(KGanttItem* toplevelitem, TQWidget* tqparent = 0,
+ xQGanttListViewPort(KGanttItem* toplevelitem, TQWidget* parent = 0,
const char * name=0, WFlags f=0 );
diff --git a/kioslaves/mbox/mboxfile.cc b/kioslaves/mbox/mboxfile.cc
index 3c6c6cc7a..271b71019 100644
--- a/kioslaves/mbox/mboxfile.cc
+++ b/kioslaves/mbox/mboxfile.cc
@@ -20,9 +20,9 @@
#include
-MBoxFile::MBoxFile( const UrlInfo* info, MBoxProtocol* tqparent )
+MBoxFile::MBoxFile( const UrlInfo* info, MBoxProtocol* parent )
: m_info( info ),
- m_mbox( tqparent )
+ m_mbox( parent )
{
assert( m_info );
}
diff --git a/kioslaves/mbox/mboxfile.h b/kioslaves/mbox/mboxfile.h
index a628e3817..b8a98973e 100644
--- a/kioslaves/mbox/mboxfile.h
+++ b/kioslaves/mbox/mboxfile.h
@@ -32,9 +32,9 @@ public:
/**
* Constructor
* @param info The urlinfo which must be used
- * @param tqparent The MBoxProtocol tqparent instance, used to throw errors.
+ * @param parent The MBoxProtocol parent instance, used to throw errors.
*/
- MBoxFile( const UrlInfo* info, MBoxProtocol* tqparent );
+ MBoxFile( const UrlInfo* info, MBoxProtocol* parent );
/**
* Empty destructor
@@ -61,7 +61,7 @@ protected:
const UrlInfo* const m_info;
/**
- * A instance of the tqparent protocol, meant to throw errors if neccesairy.
+ * A instance of the parent protocol, meant to throw errors if neccesairy.
*/
MBoxProtocol* const m_mbox;
};
diff --git a/kioslaves/mbox/readmbox.cc b/kioslaves/mbox/readmbox.cc
index cc8503a5d..6094bfc01 100644
--- a/kioslaves/mbox/readmbox.cc
+++ b/kioslaves/mbox/readmbox.cc
@@ -37,8 +37,8 @@
#include
-ReadMBox::ReadMBox( const UrlInfo* info, MBoxProtocol* tqparent, bool onlynew, bool savetime )
- : MBoxFile( info, tqparent ),
+ReadMBox::ReadMBox( const UrlInfo* info, MBoxProtocol* parent, bool onlynew, bool savetime )
+ : MBoxFile( info, parent ),
m_file( 0 ),
m_stream( 0 ),
m_current_line( new TQString( TQString() ) ),
diff --git a/kioslaves/mbox/readmbox.h b/kioslaves/mbox/readmbox.h
index ea63068ca..046767be7 100644
--- a/kioslaves/mbox/readmbox.h
+++ b/kioslaves/mbox/readmbox.h
@@ -40,11 +40,11 @@ public:
* Constructor
*
* @param info The information of the file to read
- * @param tqparent The instance of the tqparent MBoxProtocol.
+ * @param parent The instance of the parent MBoxProtocol.
* @param onlynew Only read new messages from the MBox file.
* @param savetime If true, the atime of the mbox-file is preserved (note that this touch the ctime).
*/
- ReadMBox( const UrlInfo* info, MBoxProtocol* tqparent, bool onlynew = false, bool savetime = false );
+ ReadMBox( const UrlInfo* info, MBoxProtocol* parent, bool onlynew = false, bool savetime = false );
/**
* Destructor
diff --git a/kitchensync/libqopensync/syncchange.h b/kitchensync/libqopensync/syncchange.h
index 1ab3fb720..4b356dcf5 100644
--- a/kitchensync/libqopensync/syncchange.h
+++ b/kitchensync/libqopensync/syncchange.h
@@ -92,7 +92,7 @@ class SyncChange
TQString objectFormatName() const;
/**
- Returns the tqparent member of this change.
+ Returns the parent member of this change.
*/
Member member() const;
diff --git a/kitchensync/src/aboutpage.cpp b/kitchensync/src/aboutpage.cpp
index 1590338c2..6055864a2 100644
--- a/kitchensync/src/aboutpage.cpp
+++ b/kitchensync/src/aboutpage.cpp
@@ -48,8 +48,8 @@ static TQString readFile( const TQString &fileName )
return content;
}
-AboutPage::AboutPage( TQWidget *tqparent )
- : TQWidget( tqparent, "AboutPage" )
+AboutPage::AboutPage( TQWidget *parent )
+ : TQWidget( parent, "AboutPage" )
{
TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
diff --git a/kitchensync/src/aboutpage.h b/kitchensync/src/aboutpage.h
index 9da3a72b9..ce813c206 100644
--- a/kitchensync/src/aboutpage.h
+++ b/kitchensync/src/aboutpage.h
@@ -31,7 +31,7 @@ class AboutPage : public TQWidget
TQ_OBJECT
public:
- AboutPage( TQWidget *tqparent );
+ AboutPage( TQWidget *parent );
signals:
void addGroup();
diff --git a/kitchensync/src/configgui.cpp b/kitchensync/src/configgui.cpp
index 2fb7ef18d..6e2aa5d70 100644
--- a/kitchensync/src/configgui.cpp
+++ b/kitchensync/src/configgui.cpp
@@ -49,8 +49,8 @@
#include
#include
-ConfigGui::ConfigGui( const QSync::Member &member, TQWidget *tqparent )
- : TQWidget( tqparent ), mMember( member )
+ConfigGui::ConfigGui( const QSync::Member &member, TQWidget *parent )
+ : TQWidget( parent ), mMember( member )
{
mTopLayout = new TQVBoxLayout( this );
mTopLayout->setSpacing( KDialog::spacingHint() );
@@ -76,49 +76,49 @@ TQString ConfigGui::instanceName() const
}
ConfigGui *ConfigGui::Factory::create( const QSync::Member &member,
- TQWidget *tqparent )
+ TQWidget *parent )
{
TQString name = member.pluginName();
if ( name == "file-sync" ) {
- return new ConfigGuiFile( member, tqparent );
+ return new ConfigGuiFile( member, parent );
} else if ( name == "palm-sync" ) {
- return new ConfigGuiPalm( member, tqparent );
+ return new ConfigGuiPalm( member, parent );
} else if ( name == "irmc-sync" ) {
- return new ConfigGuiIRMC( member, tqparent );
+ return new ConfigGuiIRMC( member, parent );
} else if ( name == "syncml-obex-client" ) {
- return new ConfigGuiSyncmlObex( member, tqparent );
+ return new ConfigGuiSyncmlObex( member, parent );
} else if ( name == "syncml-http-server" ) {
- return new ConfigGuiSyncmlHttp( member, tqparent );
+ return new ConfigGuiSyncmlHttp( member, parent );
} else if ( name == "opie-sync" ) {
- return new ConfigGuiOpie( member, tqparent );
+ return new ConfigGuiOpie( member, parent );
} else if ( name == "gnokii-sync" ) {
- return new ConfigGuiGnokii( member, tqparent );
+ return new ConfigGuiGnokii( member, parent );
} else if ( name == "gpe-sync" ) {
- return new ConfigGuiGpe( member, tqparent );
+ return new ConfigGuiGpe( member, parent );
} else if ( name == "google-calendar" ) {
- return new ConfigGuiGoogleCalendar( member, tqparent );
+ return new ConfigGuiGoogleCalendar( member, parent );
} else if ( name == "ldap-sync" ) {
- return new ConfigGuiLdap( member, tqparent );
+ return new ConfigGuiLdap( member, parent );
} else if ( name == "kdepim-sync" ) {
- return new ConfigGuiBlank( member, tqparent );
+ return new ConfigGuiBlank( member, parent );
} else if ( name == "jescs-sync" ) {
- return new ConfigGuiJescs( member, tqparent );
+ return new ConfigGuiJescs( member, parent );
} else if ( name == "evo2-sync" ) {
- return new ConfigGuiEvo2( member, tqparent );
+ return new ConfigGuiEvo2( member, parent );
} else if ( name == "moto-sync" ) {
- return new ConfigGuiMoto( member, tqparent );
+ return new ConfigGuiMoto( member, parent );
} else if ( name == "synce-plugin" ) {
- return new ConfigGuiSynce( member, tqparent );
+ return new ConfigGuiSynce( member, parent );
} else if ( name == "sunbird-sync" ) {
- return new ConfigGuiSunbird( member, tqparent );
+ return new ConfigGuiSunbird( member, parent );
} else {
- return new ConfigGuiXml( member, tqparent );
+ return new ConfigGuiXml( member, parent );
}
}
-ConfigGuiXml::ConfigGuiXml( const QSync::Member &member, TQWidget *tqparent )
- : ConfigGui( member, tqparent )
+ConfigGuiXml::ConfigGuiXml( const QSync::Member &member, TQWidget *parent )
+ : ConfigGui( member, parent )
{
mTextEdit = new TQTextEdit( this );
topLayout()->addWidget( mTextEdit );
diff --git a/kitchensync/src/configgui.h b/kitchensync/src/configgui.h
index 9f784dc2b..6b7b1b105 100644
--- a/kitchensync/src/configgui.h
+++ b/kitchensync/src/configgui.h
@@ -32,12 +32,12 @@ class TQTextEdit;
class ConfigGui : public TQWidget
{
public:
- ConfigGui( const QSync::Member &, TQWidget *tqparent );
+ ConfigGui( const QSync::Member &, TQWidget *parent );
class Factory
{
public:
- static ConfigGui *create( const QSync::Member &, TQWidget *tqparent );
+ static ConfigGui *create( const QSync::Member &, TQWidget *parent );
};
void setInstanceName( const TQString & );
@@ -60,7 +60,7 @@ class ConfigGui : public TQWidget
class ConfigGuiXml : public ConfigGui
{
public:
- ConfigGuiXml( const QSync::Member &, TQWidget *tqparent );
+ ConfigGuiXml( const QSync::Member &, TQWidget *parent );
void load( const TQString & );
TQString save() const;
diff --git a/kitchensync/src/configguiblank.cpp b/kitchensync/src/configguiblank.cpp
index e5e60f201..3e9d47b65 100644
--- a/kitchensync/src/configguiblank.cpp
+++ b/kitchensync/src/configguiblank.cpp
@@ -26,8 +26,8 @@
#include
#include
-ConfigGuiBlank::ConfigGuiBlank( const QSync::Member &member, TQWidget *tqparent )
- : ConfigGui( member, tqparent )
+ConfigGuiBlank::ConfigGuiBlank( const QSync::Member &member, TQWidget *parent )
+ : ConfigGui( member, parent )
{
TQLabel *label = new TQLabel( i18n( "This member/plugin needs no configuration." ), this );
topLayout()->addWidget( label );
diff --git a/kitchensync/src/configguiblank.h b/kitchensync/src/configguiblank.h
index 738c5adb8..e2048ac79 100644
--- a/kitchensync/src/configguiblank.h
+++ b/kitchensync/src/configguiblank.h
@@ -26,7 +26,7 @@
class ConfigGuiBlank : public ConfigGui
{
public:
- ConfigGuiBlank( const QSync::Member &member, TQWidget *tqparent = 0 );
+ ConfigGuiBlank( const QSync::Member &member, TQWidget *parent = 0 );
void load( const TQString &xml );
TQString save() const;
diff --git a/kitchensync/src/configguievo2.cpp b/kitchensync/src/configguievo2.cpp
index 3a6db784e..0c79fedf0 100644
--- a/kitchensync/src/configguievo2.cpp
+++ b/kitchensync/src/configguievo2.cpp
@@ -32,8 +32,8 @@
#include
#include
-ConfigGuiEvo2::ConfigGuiEvo2( const QSync::Member &member, TQWidget *tqparent )
- : ConfigGui( member, tqparent )
+ConfigGuiEvo2::ConfigGuiEvo2( const QSync::Member &member, TQWidget *parent )
+ : ConfigGui( member, parent )
{
initGUI();
}
diff --git a/kitchensync/src/configguievo2.h b/kitchensync/src/configguievo2.h
index 5e030aa97..7e3a17679 100644
--- a/kitchensync/src/configguievo2.h
+++ b/kitchensync/src/configguievo2.h
@@ -29,7 +29,7 @@ class KURLRequester;
class ConfigGuiEvo2 : public ConfigGui
{
public:
- ConfigGuiEvo2( const QSync::Member &, TQWidget *tqparent );
+ ConfigGuiEvo2( const QSync::Member &, TQWidget *parent );
void load( const TQString &xml );
diff --git a/kitchensync/src/configguifile.cpp b/kitchensync/src/configguifile.cpp
index fdf4c8ce8..6a8b0402c 100644
--- a/kitchensync/src/configguifile.cpp
+++ b/kitchensync/src/configguifile.cpp
@@ -30,8 +30,8 @@
#include
#include
-ConfigGuiFile::ConfigGuiFile( const QSync::Member &member, TQWidget *tqparent )
- : ConfigGui( member, tqparent )
+ConfigGuiFile::ConfigGuiFile( const QSync::Member &member, TQWidget *parent )
+ : ConfigGui( member, parent )
{
TQBoxLayout *filenameLayout = new TQHBoxLayout( topLayout() );
diff --git a/kitchensync/src/configguifile.h b/kitchensync/src/configguifile.h
index 7859fbeee..db9385223 100644
--- a/kitchensync/src/configguifile.h
+++ b/kitchensync/src/configguifile.h
@@ -29,7 +29,7 @@ class TQCheckBox;
class ConfigGuiFile : public ConfigGui
{
public:
- ConfigGuiFile( const QSync::Member &, TQWidget *tqparent );
+ ConfigGuiFile( const QSync::Member &, TQWidget *parent );
void load( const TQString &xml );
TQString save() const;
diff --git a/kitchensync/src/configguigcalendar.cpp b/kitchensync/src/configguigcalendar.cpp
index d832157e7..8e8006764 100644
--- a/kitchensync/src/configguigcalendar.cpp
+++ b/kitchensync/src/configguigcalendar.cpp
@@ -29,8 +29,8 @@
#include
#include
-ConfigGuiGoogleCalendar::ConfigGuiGoogleCalendar( const QSync::Member &member, TQWidget *tqparent )
- : ConfigGui( member, tqparent )
+ConfigGuiGoogleCalendar::ConfigGuiGoogleCalendar( const QSync::Member &member, TQWidget *parent )
+ : ConfigGui( member, parent )
{
TQBoxLayout *userLayout = new TQHBoxLayout( topLayout() );
diff --git a/kitchensync/src/configguigcalendar.h b/kitchensync/src/configguigcalendar.h
index 458e948d8..198cf77ca 100644
--- a/kitchensync/src/configguigcalendar.h
+++ b/kitchensync/src/configguigcalendar.h
@@ -29,7 +29,7 @@ class TQLineEdit;
class ConfigGuiGoogleCalendar : public ConfigGui
{
public:
- ConfigGuiGoogleCalendar( const QSync::Member &, TQWidget *tqparent );
+ ConfigGuiGoogleCalendar( const QSync::Member &, TQWidget *parent );
void load( const TQString &xml );
TQString save() const;
diff --git a/kitchensync/src/configguignokii.cpp b/kitchensync/src/configguignokii.cpp
index dfc7413e7..84db02752 100644
--- a/kitchensync/src/configguignokii.cpp
+++ b/kitchensync/src/configguignokii.cpp
@@ -34,8 +34,8 @@
#include
#include
-ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *tqparent )
- : ConfigGui( member, tqparent )
+ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent )
+ : ConfigGui( member, parent )
{
TQGridLayout *tqlayout = new TQGridLayout( topLayout() );
diff --git a/kitchensync/src/configguignokii.h b/kitchensync/src/configguignokii.h
index 673dce0a0..d99e19f8b 100644
--- a/kitchensync/src/configguignokii.h
+++ b/kitchensync/src/configguignokii.h
@@ -37,7 +37,7 @@ class ConfigGuiGnokii : public ConfigGui
TQ_OBJECT
public:
- ConfigGuiGnokii( const QSync::Member &, TQWidget *tqparent );
+ ConfigGuiGnokii( const QSync::Member &, TQWidget *parent );
void load( const TQString &xml );
TQString save() const;
diff --git a/kitchensync/src/configguigpe.cpp b/kitchensync/src/configguigpe.cpp
index 260552642..118aed14a 100644
--- a/kitchensync/src/configguigpe.cpp
+++ b/kitchensync/src/configguigpe.cpp
@@ -32,8 +32,8 @@
#include
#include
-ConfigGuiGpe::ConfigGuiGpe( const QSync::Member &member, TQWidget *tqparent )
- : ConfigGui( member, tqparent )
+ConfigGuiGpe::ConfigGuiGpe( const QSync::Member &member, TQWidget *parent )
+ : ConfigGui( member, parent )
{
initGUI();
diff --git a/kitchensync/src/configguigpe.h b/kitchensync/src/configguigpe.h
index 0d4888f60..e1fc10c6e 100644
--- a/kitchensync/src/configguigpe.h
+++ b/kitchensync/src/configguigpe.h
@@ -32,7 +32,7 @@ class KLineEdit;
class ConfigGuiGpe : public ConfigGui
{
public:
- ConfigGuiGpe( const QSync::Member &, TQWidget *tqparent );
+ ConfigGuiGpe( const QSync::Member &, TQWidget *parent );
void load( const TQString &xml );
TQString save() const;
diff --git a/kitchensync/src/configguiirmc.cpp b/kitchensync/src/configguiirmc.cpp
index 8bff86fea..721c82d70 100644
--- a/kitchensync/src/configguiirmc.cpp
+++ b/kitchensync/src/configguiirmc.cpp
@@ -42,8 +42,8 @@
#include "configguiirmc.h"
-ConfigGuiIRMC::ConfigGuiIRMC( const QSync::Member &member, TQWidget *tqparent )
- : ConfigGui( member, tqparent )
+ConfigGuiIRMC::ConfigGuiIRMC( const QSync::Member &member, TQWidget *parent )
+ : ConfigGui( member, parent )
{
initGUI();
diff --git a/kitchensync/src/configguiirmc.h b/kitchensync/src/configguiirmc.h
index 5fe5b454a..572b714cc 100644
--- a/kitchensync/src/configguiirmc.h
+++ b/kitchensync/src/configguiirmc.h
@@ -40,7 +40,7 @@ class ConfigGuiIRMC : public ConfigGui
TQ_OBJECT
public:
- ConfigGuiIRMC( const QSync::Member &, TQWidget *tqparent );
+ ConfigGuiIRMC( const QSync::Member &, TQWidget *parent );
void load( const TQString &xml );
TQString save() const;
diff --git a/kitchensync/src/configguijescs.cpp b/kitchensync/src/configguijescs.cpp
index e284c3e76..b7a94c447 100644
--- a/kitchensync/src/configguijescs.cpp
+++ b/kitchensync/src/configguijescs.cpp
@@ -30,8 +30,8 @@
#include
#include
-ConfigGuiJescs::ConfigGuiJescs( const QSync::Member &member, TQWidget *tqparent )
- : ConfigGui( member, tqparent )
+ConfigGuiJescs::ConfigGuiJescs( const QSync::Member &member, TQWidget *parent )
+ : ConfigGui( member, parent )
{
initGUI();
}
diff --git a/kitchensync/src/configguijescs.h b/kitchensync/src/configguijescs.h
index 6884bbbd7..1667900c9 100644
--- a/kitchensync/src/configguijescs.h
+++ b/kitchensync/src/configguijescs.h
@@ -30,7 +30,7 @@ class TQCheckBox;
class ConfigGuiJescs : public ConfigGui
{
public:
- ConfigGuiJescs( const QSync::Member &, TQWidget *tqparent );
+ ConfigGuiJescs( const QSync::Member &, TQWidget *parent );
void load( const TQString &xml );
diff --git a/kitchensync/src/configguildap.cpp b/kitchensync/src/configguildap.cpp
index b5ebd02ea..fd9dad4b6 100644
--- a/kitchensync/src/configguildap.cpp
+++ b/kitchensync/src/configguildap.cpp
@@ -32,8 +32,8 @@
#include
#include
-ConfigGuiLdap::ConfigGuiLdap( const QSync::Member &member, TQWidget *tqparent )
- : ConfigGui( member, tqparent )
+ConfigGuiLdap::ConfigGuiLdap( const QSync::Member &member, TQWidget *parent )
+ : ConfigGui( member, parent )
{
initGUI();
diff --git a/kitchensync/src/configguildap.h b/kitchensync/src/configguildap.h
index 1db94357f..07d97f09d 100644
--- a/kitchensync/src/configguildap.h
+++ b/kitchensync/src/configguildap.h
@@ -39,7 +39,7 @@ class ConfigGuiLdap : public ConfigGui
TQ_OBJECT
public:
- ConfigGuiLdap( const QSync::Member &, TQWidget *tqparent );
+ ConfigGuiLdap( const QSync::Member &, TQWidget *parent );
void load( const TQString &xml );
TQString save() const;
diff --git a/kitchensync/src/configguimoto.cpp b/kitchensync/src/configguimoto.cpp
index b9ec2342c..e461a808f 100644
--- a/kitchensync/src/configguimoto.cpp
+++ b/kitchensync/src/configguimoto.cpp
@@ -29,8 +29,8 @@
#include
#include
-ConfigGuiMoto::ConfigGuiMoto( const QSync::Member &member, TQWidget *tqparent )
- : ConfigGui( member, tqparent )
+ConfigGuiMoto::ConfigGuiMoto( const QSync::Member &member, TQWidget *parent )
+ : ConfigGui( member, parent )
{
initGUI();
}
diff --git a/kitchensync/src/configguimoto.h b/kitchensync/src/configguimoto.h
index 1c5cd0f0e..cd588facf 100644
--- a/kitchensync/src/configguimoto.h
+++ b/kitchensync/src/configguimoto.h
@@ -29,7 +29,7 @@ class KLineEdit;
class ConfigGuiMoto : public ConfigGui
{
public:
- ConfigGuiMoto( const QSync::Member &, TQWidget *tqparent );
+ ConfigGuiMoto( const QSync::Member &, TQWidget *parent );
void load( const TQString &xml );
TQString save() const;
diff --git a/kitchensync/src/configguiopie.cpp b/kitchensync/src/configguiopie.cpp
index c2b3be2ec..c74623345 100644
--- a/kitchensync/src/configguiopie.cpp
+++ b/kitchensync/src/configguiopie.cpp
@@ -30,8 +30,8 @@
#include
#include
-ConfigGuiOpie::ConfigGuiOpie( const QSync::Member &member, TQWidget *tqparent )
- : ConfigGui( member, tqparent )
+ConfigGuiOpie::ConfigGuiOpie( const QSync::Member &member, TQWidget *parent )
+ : ConfigGui( member, parent )
{
TQGridLayout *tqlayout = new TQGridLayout( topLayout() );
diff --git a/kitchensync/src/configguiopie.h b/kitchensync/src/configguiopie.h
index b798de93c..e90f4acfe 100644
--- a/kitchensync/src/configguiopie.h
+++ b/kitchensync/src/configguiopie.h
@@ -30,7 +30,7 @@ class TQSpinBox;
class ConfigGuiOpie : public ConfigGui
{
public:
- ConfigGuiOpie( const QSync::Member &, TQWidget *tqparent );
+ ConfigGuiOpie( const QSync::Member &, TQWidget *parent );
void load( const TQString &xml );
TQString save() const;
diff --git a/kitchensync/src/configguipalm.cpp b/kitchensync/src/configguipalm.cpp
index 688e0cc0d..03d87cdb4 100644
--- a/kitchensync/src/configguipalm.cpp
+++ b/kitchensync/src/configguipalm.cpp
@@ -35,8 +35,8 @@
#include "configguipalm.h"
-ConfigGuiPalm::ConfigGuiPalm( const QSync::Member &member, TQWidget *tqparent )
- : ConfigGui( member, tqparent )
+ConfigGuiPalm::ConfigGuiPalm( const QSync::Member &member, TQWidget *parent )
+ : ConfigGui( member, parent )
{
initGUI();
diff --git a/kitchensync/src/configguipalm.h b/kitchensync/src/configguipalm.h
index 86c797a07..354e5a29f 100644
--- a/kitchensync/src/configguipalm.h
+++ b/kitchensync/src/configguipalm.h
@@ -33,7 +33,7 @@ class TQSpinBox;
class ConfigGuiPalm : public ConfigGui
{
public:
- ConfigGuiPalm( const QSync::Member &, TQWidget *tqparent );
+ ConfigGuiPalm( const QSync::Member &, TQWidget *parent );
void load( const TQString &xml );
TQString save() const;
diff --git a/kitchensync/src/configguisunbird.cpp b/kitchensync/src/configguisunbird.cpp
index b77ce93ba..d51101aeb 100644
--- a/kitchensync/src/configguisunbird.cpp
+++ b/kitchensync/src/configguisunbird.cpp
@@ -40,8 +40,8 @@
#include
#include
-ConfigGuiSunbird::ConfigGuiSunbird( const QSync::Member &member, TQWidget *tqparent )
- : ConfigGui( member, tqparent )
+ConfigGuiSunbird::ConfigGuiSunbird( const QSync::Member &member, TQWidget *parent )
+ : ConfigGui( member, parent )
{
TQTabWidget *tabWidget = new TQTabWidget( this );
topLayout()->addWidget( tabWidget );
@@ -209,14 +209,14 @@ void ConfigGuiSunbird::delWebdavCalendar( WebdavCalendar *calendar )
calendar->deleteLater();
}
-LocalCalendar::LocalCalendar( TQWidget *tqparent )
- : TQWidget( tqparent )
+LocalCalendar::LocalCalendar( TQWidget *parent )
+ : TQWidget( parent )
{
initGui();
}
-LocalCalendar::LocalCalendar( const TQString &path, const TQString &defaultcal, const TQString &days, TQWidget *tqparent )
- : TQWidget( tqparent )
+LocalCalendar::LocalCalendar( const TQString &path, const TQString &defaultcal, const TQString &days, TQWidget *parent )
+ : TQWidget( parent )
{
initGui();
@@ -275,15 +275,15 @@ void LocalCalendar::deleteWidget()
emit deleteRequest( this );
}
-WebdavCalendar::WebdavCalendar( TQWidget *tqparent )
- : TQWidget( tqparent )
+WebdavCalendar::WebdavCalendar( TQWidget *parent )
+ : TQWidget( parent )
{
initGui();
};
WebdavCalendar::WebdavCalendar( const TQString &username, const TQString &password, const TQString &url,
- const TQString &defaultcal, const TQString &days, TQWidget *tqparent )
- : TQWidget( tqparent )
+ const TQString &defaultcal, const TQString &days, TQWidget *parent )
+ : TQWidget( parent )
{
initGui();
diff --git a/kitchensync/src/configguisunbird.h b/kitchensync/src/configguisunbird.h
index 25ac78a9f..5095a4e02 100644
--- a/kitchensync/src/configguisunbird.h
+++ b/kitchensync/src/configguisunbird.h
@@ -42,10 +42,10 @@ class LocalCalendar : public TQWidget
TQ_OBJECT
public:
- LocalCalendar( TQWidget *tqparent = 0 );
+ LocalCalendar( TQWidget *parent = 0 );
LocalCalendar( const TQString &path,
const TQString &defaultcal,
- const TQString &days, TQWidget *tqparent = 0 );
+ const TQString &days, TQWidget *parent = 0 );
KURLRequester *mPathRequester;
TQCheckBox *mDaysCheckBox;
@@ -69,12 +69,12 @@ class WebdavCalendar : public TQWidget
TQ_OBJECT
public:
- WebdavCalendar( TQWidget *tqparent = 0 );
+ WebdavCalendar( TQWidget *parent = 0 );
WebdavCalendar( const TQString &username,
const TQString &password,
const TQString &url,
const TQString &defaultcal,
- const TQString &days, TQWidget *tqparent = 0 );
+ const TQString &days, TQWidget *parent = 0 );
KLineEdit *mUrl;
TQCheckBox *mDaysCheckBox;
@@ -100,7 +100,7 @@ class ConfigGuiSunbird : public ConfigGui
TQ_OBJECT
public:
- ConfigGuiSunbird( const QSync::Member &, TQWidget *tqparent );
+ ConfigGuiSunbird( const QSync::Member &, TQWidget *parent );
void load( const TQString &xml );
diff --git a/kitchensync/src/configguisynce.cpp b/kitchensync/src/configguisynce.cpp
index 5ff5aeacc..898300769 100644
--- a/kitchensync/src/configguisynce.cpp
+++ b/kitchensync/src/configguisynce.cpp
@@ -30,8 +30,8 @@
#include
#include
-ConfigGuiSynce::ConfigGuiSynce( const QSync::Member &member, TQWidget *tqparent )
- : ConfigGui( member, tqparent )
+ConfigGuiSynce::ConfigGuiSynce( const QSync::Member &member, TQWidget *parent )
+ : ConfigGui( member, parent )
{
initGUI();
}
diff --git a/kitchensync/src/configguisynce.h b/kitchensync/src/configguisynce.h
index fb318f9d0..680b1b128 100644
--- a/kitchensync/src/configguisynce.h
+++ b/kitchensync/src/configguisynce.h
@@ -31,7 +31,7 @@ class KLineEdit;
class ConfigGuiSynce : public ConfigGui
{
public:
- ConfigGuiSynce( const QSync::Member &, TQWidget *tqparent );
+ ConfigGuiSynce( const QSync::Member &, TQWidget *parent );
void load( const TQString &xml );
diff --git a/kitchensync/src/configguisyncmlhttp.cpp b/kitchensync/src/configguisyncmlhttp.cpp
index 3e1dac1aa..26a8c2241 100644
--- a/kitchensync/src/configguisyncmlhttp.cpp
+++ b/kitchensync/src/configguisyncmlhttp.cpp
@@ -35,8 +35,8 @@
#include
#include
-ConfigGuiSyncmlHttp::ConfigGuiSyncmlHttp( const QSync::Member &member, TQWidget *tqparent )
- : ConfigGui( member, tqparent ), mUrl( 0 ), mPort( 0 )
+ConfigGuiSyncmlHttp::ConfigGuiSyncmlHttp( const QSync::Member &member, TQWidget *parent )
+ : ConfigGui( member, parent ), mUrl( 0 ), mPort( 0 )
{
TQTabWidget *tabWidget = new TQTabWidget( this );
@@ -137,12 +137,12 @@ ConfigGuiSyncmlHttp::ConfigGuiSyncmlHttp( const QSync::Member &member, TQWidget
topLayout()->addStretch( 1 );
}
-void ConfigGuiSyncmlHttp::addLineEdit( TQWidget *tqparent, const TQString &text, KComboBox **edit, int row )
+void ConfigGuiSyncmlHttp::addLineEdit( TQWidget *parent, const TQString &text, KComboBox **edit, int row )
{
- TQLabel *label = new TQLabel( text, tqparent);
+ TQLabel *label = new TQLabel( text, parent);
mGridLayout->addWidget( label, row, 0 );
- *edit = new KComboBox( true, tqparent );
+ *edit = new KComboBox( true, parent );
mGridLayout->addWidget( *edit, row, 1 );
}
diff --git a/kitchensync/src/configguisyncmlhttp.h b/kitchensync/src/configguisyncmlhttp.h
index de71586d5..accff70e8 100644
--- a/kitchensync/src/configguisyncmlhttp.h
+++ b/kitchensync/src/configguisyncmlhttp.h
@@ -39,7 +39,7 @@ class ConfigGuiSyncmlHttp : public ConfigGui
TQ_OBJECT
public:
- ConfigGuiSyncmlHttp( const QSync::Member &, TQWidget *tqparent );
+ ConfigGuiSyncmlHttp( const QSync::Member &, TQWidget *parent );
void load( const TQString &xml );
TQString save() const;
@@ -62,7 +62,7 @@ class ConfigGuiSyncmlHttp : public ConfigGui
KComboBox *mNoteDb;
protected slots:
- void addLineEdit( TQWidget *tqparent, const TQString &text, KComboBox **edit, int row );
+ void addLineEdit( TQWidget *parent, const TQString &text, KComboBox **edit, int row );
};
#endif
diff --git a/kitchensync/src/configguisyncmlobex.cpp b/kitchensync/src/configguisyncmlobex.cpp
index 1bb4bdaf1..61833b4eb 100644
--- a/kitchensync/src/configguisyncmlobex.cpp
+++ b/kitchensync/src/configguisyncmlobex.cpp
@@ -37,8 +37,8 @@
#include
#include
-ConfigGuiSyncmlObex::ConfigGuiSyncmlObex( const QSync::Member &member, TQWidget *tqparent )
- : ConfigGui( member, tqparent )
+ConfigGuiSyncmlObex::ConfigGuiSyncmlObex( const QSync::Member &member, TQWidget *parent )
+ : ConfigGui( member, parent )
{
TQTabWidget *tabWidget = new TQTabWidget( this );
topLayout()->addWidget( tabWidget );
@@ -308,12 +308,12 @@ TQString ConfigGuiSyncmlObex::save() const
return xml;
}
-void ConfigGuiSyncmlObex::addLineEdit( TQWidget *tqparent, const TQString &text, KComboBox **edit, int row )
+void ConfigGuiSyncmlObex::addLineEdit( TQWidget *parent, const TQString &text, KComboBox **edit, int row )
{
- TQLabel *label = new TQLabel( text, tqparent );
+ TQLabel *label = new TQLabel( text, parent );
mGridLayout->addWidget( label, row, 0 );
- *edit = new KComboBox( true, tqparent );
+ *edit = new KComboBox( true, parent );
mGridLayout->addWidget( *edit, row, 1 );
}
diff --git a/kitchensync/src/configguisyncmlobex.h b/kitchensync/src/configguisyncmlobex.h
index a4e427474..7ee4d3f30 100644
--- a/kitchensync/src/configguisyncmlobex.h
+++ b/kitchensync/src/configguisyncmlobex.h
@@ -41,7 +41,7 @@ class ConfigGuiSyncmlObex : public ConfigGui
TQ_OBJECT
public:
- ConfigGuiSyncmlObex( const QSync::Member &, TQWidget *tqparent = 0 );
+ ConfigGuiSyncmlObex( const QSync::Member &, TQWidget *parent = 0 );
void load( const TQString &xml );
TQString save() const;
@@ -82,7 +82,7 @@ class ConfigGuiSyncmlObex : public ConfigGui
KComboBox *mNoteDb;
protected slots:
- void addLineEdit( TQWidget *tqparent, const TQString &text, KComboBox **edit, int row );
+ void addLineEdit( TQWidget *parent, const TQString &text, KComboBox **edit, int row );
};
#endif
diff --git a/kitchensync/src/conflictdialog.cpp b/kitchensync/src/conflictdialog.cpp
index c3e236ccc..39943ffe4 100644
--- a/kitchensync/src/conflictdialog.cpp
+++ b/kitchensync/src/conflictdialog.cpp
@@ -20,7 +20,7 @@
#include "conflictdialog.h"
-ConflictDialog::ConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent )
- : TQDialog( tqparent ), mMapping( mapping )
+ConflictDialog::ConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent )
+ : TQDialog( parent ), mMapping( mapping )
{
}
diff --git a/kitchensync/src/conflictdialog.h b/kitchensync/src/conflictdialog.h
index 81c91138b..2e48c0390 100644
--- a/kitchensync/src/conflictdialog.h
+++ b/kitchensync/src/conflictdialog.h
@@ -31,7 +31,7 @@
class ConflictDialog : public TQDialog
{
public:
- ConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent );
+ ConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent );
protected:
QSync::SyncMapping mMapping;
diff --git a/kitchensync/src/connectionwidgets.cpp b/kitchensync/src/connectionwidgets.cpp
index f6157b6fa..bb25c271d 100644
--- a/kitchensync/src/connectionwidgets.cpp
+++ b/kitchensync/src/connectionwidgets.cpp
@@ -40,8 +40,8 @@
#include "connectionwidgets.h"
-BluetoothWidget::BluetoothWidget( TQWidget *tqparent )
- : TQWidget( tqparent )
+BluetoothWidget::BluetoothWidget( TQWidget *parent )
+ : TQWidget( parent )
{
TQGridLayout *tqlayout = new TQGridLayout( this );
@@ -100,8 +100,8 @@ TQString BluetoothWidget::channel() const
}
// FIXME - Only IrMC specific
-IRWidget::IRWidget( TQWidget *tqparent )
- : TQWidget( tqparent )
+IRWidget::IRWidget( TQWidget *parent )
+ : TQWidget( parent )
{
TQGridLayout *tqlayout = new TQGridLayout( this, 3, 3, 11, 3 );
@@ -122,10 +122,10 @@ IRWidget::IRWidget( TQWidget *tqparent )
tqlayout->setRowStretch( 2, 1 );
}
-void IRWidget::load( const TQDomElement &tqparent )
+void IRWidget::load( const TQDomElement &parent )
{
TQDomNode node;
- for ( node = tqparent.firstChild(); !node.isNull(); node = node.nextSibling() ) {
+ for ( node = parent.firstChild(); !node.isNull(); node = node.nextSibling() ) {
TQDomElement element = node.toElement();
if ( element.tagName() == "irname" )
mDevice->setText( element.text() );
@@ -134,20 +134,20 @@ void IRWidget::load( const TQDomElement &tqparent )
}
}
-void IRWidget::save( TQDomDocument &doc, TQDomElement &tqparent )
+void IRWidget::save( TQDomDocument &doc, TQDomElement &parent )
{
TQDomElement element = doc.createElement( "irname" );
element.appendChild( doc.createTextNode( mDevice->text() ) );
- tqparent.appendChild( element );
+ parent.appendChild( element );
element = doc.createElement( "irserial" );
element.appendChild( doc.createTextNode( mSerialNumber->text() ) );
- tqparent.appendChild( element );
+ parent.appendChild( element );
}
// FIXME - Only IrMC specific
-CableWidget::CableWidget( TQWidget *tqparent )
- : TQWidget( tqparent )
+CableWidget::CableWidget( TQWidget *parent )
+ : TQWidget( parent )
{
TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 11, 3 );
@@ -176,10 +176,10 @@ CableWidget::CableWidget( TQWidget *tqparent )
mDevice->insertItem( "/dev/ttyUSB1" );
}
-void CableWidget::load( const TQDomElement &tqparent )
+void CableWidget::load( const TQDomElement &parent )
{
TQDomNode node;
- for ( node = tqparent.firstChild(); !node.isNull(); node = node.nextSibling() ) {
+ for ( node = parent.firstChild(); !node.isNull(); node = node.nextSibling() ) {
TQDomElement element = node.toElement();
if ( element.tagName() == "cabletype" )
mManufacturer->setCurrentItem( element.text().toInt() );
@@ -188,19 +188,19 @@ void CableWidget::load( const TQDomElement &tqparent )
}
}
-void CableWidget::save( TQDomDocument &doc, TQDomElement &tqparent )
+void CableWidget::save( TQDomDocument &doc, TQDomElement &parent )
{
TQDomElement element = doc.createElement( "cabletype" );
element.appendChild( doc.createTextNode( TQString::number( mManufacturer->currentItem() ) ) );
- tqparent.appendChild( element );
+ parent.appendChild( element );
element = doc.createElement( "cabledev" );
element.appendChild( doc.createTextNode( mDevice->currentText() ) );
- tqparent.appendChild( element );
+ parent.appendChild( element );
}
-UsbWidget::UsbWidget( TQWidget *tqparent )
- : TQWidget( tqparent )
+UsbWidget::UsbWidget( TQWidget *parent )
+ : TQWidget( parent )
{
TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 11, 3);
diff --git a/kitchensync/src/connectionwidgets.h b/kitchensync/src/connectionwidgets.h
index 5ffc9bc5e..ec514cb44 100644
--- a/kitchensync/src/connectionwidgets.h
+++ b/kitchensync/src/connectionwidgets.h
@@ -41,7 +41,7 @@ class BluetoothWidget : public TQWidget
TQ_OBJECT
public:
- BluetoothWidget( TQWidget *tqparent );
+ BluetoothWidget( TQWidget *parent );
void hideChannel();
void showChannel();
@@ -63,7 +63,7 @@ class IRWidget : public TQWidget
TQ_OBJECT
public:
- IRWidget( TQWidget *tqparent );
+ IRWidget( TQWidget *parent );
void load( const TQDomElement& );
void save( TQDomDocument&, TQDomElement& );
@@ -76,7 +76,7 @@ class IRWidget : public TQWidget
class CableWidget : public TQWidget
{
public:
- CableWidget( TQWidget *tqparent );
+ CableWidget( TQWidget *parent );
void load( const TQDomElement& );
void save( TQDomDocument&, TQDomElement& );
@@ -89,7 +89,7 @@ class CableWidget : public TQWidget
class UsbWidget : public TQWidget
{
public:
- UsbWidget( TQWidget *tqparent );
+ UsbWidget( TQWidget *parent );
int interface() const;
void setInterface( int interface );
diff --git a/kitchensync/src/groupconfig.cpp b/kitchensync/src/groupconfig.cpp
index f8f16988c..99ff35fdb 100644
--- a/kitchensync/src/groupconfig.cpp
+++ b/kitchensync/src/groupconfig.cpp
@@ -41,8 +41,8 @@
#include
#include
-GroupConfig::GroupConfig( TQWidget *tqparent )
- : TQWidget( tqparent )
+GroupConfig::GroupConfig( TQWidget *parent )
+ : TQWidget( parent )
{
TQBoxLayout *topLayout = new TQVBoxLayout( this );
topLayout->setSpacing( KDialog::spacingHint() );
diff --git a/kitchensync/src/groupconfig.h b/kitchensync/src/groupconfig.h
index be19641dc..151fe7948 100644
--- a/kitchensync/src/groupconfig.h
+++ b/kitchensync/src/groupconfig.h
@@ -37,7 +37,7 @@ class GroupConfig : public TQWidget
TQ_OBJECT
public:
- GroupConfig( TQWidget *tqparent );
+ GroupConfig( TQWidget *parent );
void setSyncProcess( SyncProcess *process );
diff --git a/kitchensync/src/groupconfigcommon.cpp b/kitchensync/src/groupconfigcommon.cpp
index cda75c8cf..5a0cf49d8 100644
--- a/kitchensync/src/groupconfigcommon.cpp
+++ b/kitchensync/src/groupconfigcommon.cpp
@@ -38,8 +38,8 @@
#include "groupconfigcommon.h"
-ObjectTypeSelector::ObjectTypeSelector( TQWidget *tqparent )
- : TQWidget( tqparent )
+ObjectTypeSelector::ObjectTypeSelector( TQWidget *parent )
+ : TQWidget( parent )
{
TQGridLayout *tqlayout = new TQGridLayout( this );
tqlayout->setMargin( 0 );
@@ -125,8 +125,8 @@ void ObjectTypeSelector::save( QSync::Group group )
config.setActiveObjectTypes( objectTypes );
}
-GroupConfigCommon::GroupConfigCommon( TQWidget *tqparent )
- : TQWidget( tqparent )
+GroupConfigCommon::GroupConfigCommon( TQWidget *parent )
+ : TQWidget( parent )
{
TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
diff --git a/kitchensync/src/groupconfigcommon.h b/kitchensync/src/groupconfigcommon.h
index b406d4519..8b298316f 100644
--- a/kitchensync/src/groupconfigcommon.h
+++ b/kitchensync/src/groupconfigcommon.h
@@ -33,7 +33,7 @@ class TQCheckBox;
class ObjectTypeSelector : public TQWidget
{
public:
- ObjectTypeSelector( TQWidget *tqparent );
+ ObjectTypeSelector( TQWidget *parent );
void load( const QSync::Group &group );
void save( QSync::Group group );
@@ -45,7 +45,7 @@ class ObjectTypeSelector : public TQWidget
class GroupConfigCommon : public TQWidget
{
public:
- GroupConfigCommon( TQWidget *tqparent );
+ GroupConfigCommon( TQWidget *parent );
void setSyncProcess( SyncProcess *syncProcess );
void save();
diff --git a/kitchensync/src/groupconfigdialog.cpp b/kitchensync/src/groupconfigdialog.cpp
index bf48ce210..4d8be65d0 100644
--- a/kitchensync/src/groupconfigdialog.cpp
+++ b/kitchensync/src/groupconfigdialog.cpp
@@ -26,8 +26,8 @@
#include
-GroupConfigDialog::GroupConfigDialog( TQWidget *tqparent, SyncProcess *process )
- : KDialogBase( tqparent, 0, true, i18n("Configure Synchronization Group"),
+GroupConfigDialog::GroupConfigDialog( TQWidget *parent, SyncProcess *process )
+ : KDialogBase( parent, 0, true, i18n("Configure Synchronization Group"),
Ok )
{
TQFrame *topFrame = makeMainWidget();
diff --git a/kitchensync/src/groupconfigdialog.h b/kitchensync/src/groupconfigdialog.h
index 712f627ae..2871853c6 100644
--- a/kitchensync/src/groupconfigdialog.h
+++ b/kitchensync/src/groupconfigdialog.h
@@ -31,7 +31,7 @@ class GroupConfigDialog : public KDialogBase
TQ_OBJECT
public:
- GroupConfigDialog( TQWidget *tqparent, SyncProcess * );
+ GroupConfigDialog( TQWidget *parent, SyncProcess * );
~GroupConfigDialog();
protected slots:
diff --git a/kitchensync/src/groupitem.cpp b/kitchensync/src/groupitem.cpp
index 71a8deff9..3a294f5ba 100644
--- a/kitchensync/src/groupitem.cpp
+++ b/kitchensync/src/groupitem.cpp
@@ -40,8 +40,8 @@
#include "groupitem.h"
-GroupItem::GroupItem( KWidgetList *tqparent, SyncProcess *process )
- : KWidgetListItem( tqparent ), mSyncProcess( process ),
+GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process )
+ : KWidgetListItem( parent ), mSyncProcess( process ),
mCallbackHandler( new QSync::CallbackHandler ),
mProcessedItems( 0 ), mMaxProcessedItems( 0 ),
mSynchronizing( false )
@@ -345,9 +345,9 @@ void GroupItem::engineChanged( QSync::Engine *engine )
this->update();
}
-MemberItem::MemberItem( TQWidget *tqparent, SyncProcess *process,
+MemberItem::MemberItem( TQWidget *parent, SyncProcess *process,
const QSync::Member &member )
- : TQWidget( tqparent ), mSyncProcess( process ), mMember( member )
+ : TQWidget( parent ), mSyncProcess( process ), mMember( member )
{
TQFont boldFont;
boldFont.setBold( true );
diff --git a/kitchensync/src/groupitem.h b/kitchensync/src/groupitem.h
index 0202f13d9..524fa0369 100644
--- a/kitchensync/src/groupitem.h
+++ b/kitchensync/src/groupitem.h
@@ -91,7 +91,7 @@ class GroupItem : public KWidgetListItem
class MemberItem : public TQWidget
{
public:
- MemberItem( TQWidget *tqparent, SyncProcess *syncProcess,
+ MemberItem( TQWidget *parent, SyncProcess *syncProcess,
const QSync::Member &member );
SyncProcess* syncProcess() const { return mSyncProcess; }
diff --git a/kitchensync/src/groupview.cpp b/kitchensync/src/groupview.cpp
index d7afdf10d..8e1adf87e 100644
--- a/kitchensync/src/groupview.cpp
+++ b/kitchensync/src/groupview.cpp
@@ -26,8 +26,8 @@
#include "groupview.h"
-GroupView::GroupView( TQWidget *tqparent )
- : TQWidget( tqparent ), mAboutPage( 0 )
+GroupView::GroupView( TQWidget *parent )
+ : TQWidget( parent ), mAboutPage( 0 )
{
mLayout = new TQVBoxLayout( this );
diff --git a/kitchensync/src/groupview.h b/kitchensync/src/groupview.h
index 88f8da21f..b3891f675 100644
--- a/kitchensync/src/groupview.h
+++ b/kitchensync/src/groupview.h
@@ -32,7 +32,7 @@ class GroupView : public TQWidget
TQ_OBJECT
public:
- GroupView( TQWidget *tqparent );
+ GroupView( TQWidget *parent );
SyncProcess* selectedSyncProcess() const;
diff --git a/kitchensync/src/htmldiffalgodisplay.cpp b/kitchensync/src/htmldiffalgodisplay.cpp
index 9094216ee..3a05641dd 100644
--- a/kitchensync/src/htmldiffalgodisplay.cpp
+++ b/kitchensync/src/htmldiffalgodisplay.cpp
@@ -30,8 +30,8 @@ static TQString textToHTML( const TQString &text )
return TQStyleSheet::convertFromPlainText( text );
}
-HTMLDiffAlgoDisplay::HTMLDiffAlgoDisplay( TQWidget *tqparent )
- : KTextBrowser( tqparent )
+HTMLDiffAlgoDisplay::HTMLDiffAlgoDisplay( TQWidget *parent )
+ : KTextBrowser( parent )
{
setWrapPolicy( TQTextEdit::AtWordBoundary );
setVScrollBarMode( TQScrollView::AlwaysOff );
diff --git a/kitchensync/src/htmldiffalgodisplay.h b/kitchensync/src/htmldiffalgodisplay.h
index f7964e18c..b3d52259f 100644
--- a/kitchensync/src/htmldiffalgodisplay.h
+++ b/kitchensync/src/htmldiffalgodisplay.h
@@ -32,7 +32,7 @@ namespace KSync {
class HTMLDiffAlgoDisplay : virtual public DiffAlgoDisplay, public KTextBrowser
{
public:
- HTMLDiffAlgoDisplay( TQWidget *tqparent );
+ HTMLDiffAlgoDisplay( TQWidget *parent );
void begin();
void end();
diff --git a/kitchensync/src/kwidgetlist.cpp b/kitchensync/src/kwidgetlist.cpp
index 89008f06f..396e144f6 100644
--- a/kitchensync/src/kwidgetlist.cpp
+++ b/kitchensync/src/kwidgetlist.cpp
@@ -38,8 +38,8 @@ class KWidgetList::Private
TQVBox *mBox;
};
-KWidgetList::KWidgetList( TQWidget *tqparent, const char *name )
- : TQScrollView( tqparent, name ),
+KWidgetList::KWidgetList( TQWidget *parent, const char *name )
+ : TQScrollView( parent, name ),
d( new Private )
{
d->mBox = new TQVBox( viewport() );
@@ -256,8 +256,8 @@ bool KWidgetList::eventFilter( TQObject *object, TQEvent *event )
return TQScrollView::eventFilter( object, event );
}
-KWidgetListItem::KWidgetListItem( KWidgetList *tqparent, const char *name )
- : TQWidget( tqparent, name )
+KWidgetListItem::KWidgetListItem( KWidgetList *parent, const char *name )
+ : TQWidget( parent, name )
{
mForegroundColor = KGlobalSettings::textColor();
mBackgroundColor = KGlobalSettings::baseColor();
diff --git a/kitchensync/src/kwidgetlist.h b/kitchensync/src/kwidgetlist.h
index 89586b891..9fb4915c7 100644
--- a/kitchensync/src/kwidgetlist.h
+++ b/kitchensync/src/kwidgetlist.h
@@ -32,7 +32,7 @@ class KWidgetList : public TQScrollView
TQ_OBJECT
public:
- KWidgetList( TQWidget *tqparent = 0, const char *name = 0 );
+ KWidgetList( TQWidget *parent = 0, const char *name = 0 );
~KWidgetList();
uint count() const;
@@ -70,7 +70,7 @@ class KWidgetList : public TQScrollView
class KWidgetListItem : public TQWidget
{
public:
- KWidgetListItem( KWidgetList *tqparent, const char *name = 0 );
+ KWidgetListItem( KWidgetList *parent, const char *name = 0 );
~KWidgetListItem();
void setSelected( bool selected );
diff --git a/kitchensync/src/memberconfig.cpp b/kitchensync/src/memberconfig.cpp
index c6da7a3ab..c2216546c 100644
--- a/kitchensync/src/memberconfig.cpp
+++ b/kitchensync/src/memberconfig.cpp
@@ -30,8 +30,8 @@
#include
#include
-MemberConfig::MemberConfig( TQWidget *tqparent, const QSync::Member &member )
- : TQWidget( tqparent ), mMember( member )
+MemberConfig::MemberConfig( TQWidget *parent, const QSync::Member &member )
+ : TQWidget( parent ), mMember( member )
{
TQBoxLayout *topLayout = new TQVBoxLayout( this );
diff --git a/kitchensync/src/memberconfig.h b/kitchensync/src/memberconfig.h
index 2e20e63ee..2abc4f4c2 100644
--- a/kitchensync/src/memberconfig.h
+++ b/kitchensync/src/memberconfig.h
@@ -33,7 +33,7 @@ class MemberConfig : public TQWidget
TQ_OBJECT
public:
- MemberConfig( TQWidget *tqparent, const QSync::Member & );
+ MemberConfig( TQWidget *parent, const QSync::Member & );
~MemberConfig();
void loadData();
diff --git a/kitchensync/src/multiconflictdialog.cpp b/kitchensync/src/multiconflictdialog.cpp
index 35679392d..e7c037610 100644
--- a/kitchensync/src/multiconflictdialog.cpp
+++ b/kitchensync/src/multiconflictdialog.cpp
@@ -33,8 +33,8 @@
class ChangeItem : public KWidgetListItem
{
public:
- ChangeItem( KWidgetList *tqparent, const QSync::SyncChange &change )
- : KWidgetListItem( tqparent ),
+ ChangeItem( KWidgetList *parent, const QSync::SyncChange &change )
+ : KWidgetListItem( parent ),
mChange( change )
{
TQGridLayout *tqlayout = new TQGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() );
@@ -71,8 +71,8 @@ class ChangeItem : public KWidgetListItem
QSync::SyncChange mChange;
};
-MultiConflictDialog::MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent )
- : ConflictDialog( mapping, tqparent )
+MultiConflictDialog::MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent )
+ : ConflictDialog( mapping, parent )
{
initGUI();
diff --git a/kitchensync/src/multiconflictdialog.h b/kitchensync/src/multiconflictdialog.h
index fd0cdef53..8709ee63a 100644
--- a/kitchensync/src/multiconflictdialog.h
+++ b/kitchensync/src/multiconflictdialog.h
@@ -31,7 +31,7 @@ class MultiConflictDialog : public ConflictDialog
TQ_OBJECT
public:
- MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent );
+ MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent );
~MultiConflictDialog();
private slots:
diff --git a/kitchensync/src/part.cpp b/kitchensync/src/part.cpp
index 70163b421..f66eece63 100644
--- a/kitchensync/src/part.cpp
+++ b/kitchensync/src/part.cpp
@@ -37,9 +37,9 @@ typedef KParts::GenericFactory< KitchenSyncPart > KitchenSyncFactory;
K_EXPORT_COMPONENT_FACTORY( libkitchensyncpart, KitchenSyncFactory )
KitchenSyncPart::KitchenSyncPart( TQWidget *parentWidget, const char *widgetName,
- TQObject *tqparent, const char *name,
+ TQObject *parent, const char *name,
const TQStringList& )
- : KParts::ReadOnlyPart( tqparent, name )
+ : KParts::ReadOnlyPart( parent, name )
{
setInstance( KitchenSyncFactory::instance() );
diff --git a/kitchensync/src/part.h b/kitchensync/src/part.h
index 14d612610..eeb113c98 100644
--- a/kitchensync/src/part.h
+++ b/kitchensync/src/part.h
@@ -34,7 +34,7 @@ class KitchenSyncPart: public KParts::ReadOnlyPart
public:
KitchenSyncPart( TQWidget *parentWidget, const char *widgetName,
- TQObject *tqparent, const char *name, const TQStringList& );
+ TQObject *parent, const char *name, const TQStringList& );
virtual ~KitchenSyncPart();
static KAboutData *createAboutData();
diff --git a/kitchensync/src/pluginpicker.cpp b/kitchensync/src/pluginpicker.cpp
index 10f311f9d..d8d6c46d5 100644
--- a/kitchensync/src/pluginpicker.cpp
+++ b/kitchensync/src/pluginpicker.cpp
@@ -57,8 +57,8 @@ PluginItem::PluginItem( KWidgetList *list, const QSync::Plugin &plugin )
}
-PluginPicker::PluginPicker( TQWidget *tqparent )
- : TQWidget( tqparent )
+PluginPicker::PluginPicker( TQWidget *parent )
+ : TQWidget( parent )
{
TQBoxLayout *tqlayout = new TQVBoxLayout( this );
@@ -94,8 +94,8 @@ QSync::Plugin PluginPicker::selectedPlugin() const
}
-PluginPickerDialog::PluginPickerDialog( TQWidget *tqparent )
- : KDialogBase( tqparent, 0, true, i18n("Select Member Type"), Ok | Cancel )
+PluginPickerDialog::PluginPickerDialog( TQWidget *parent )
+ : KDialogBase( parent, 0, true, i18n("Select Member Type"), Ok | Cancel )
{
TQFrame *topFrame = makeMainWidget();
@@ -114,9 +114,9 @@ QSync::Plugin PluginPickerDialog::selectedPlugin() const
return mPicker->selectedPlugin();
}
-QSync::Plugin PluginPickerDialog::getPlugin( TQWidget *tqparent )
+QSync::Plugin PluginPickerDialog::getPlugin( TQWidget *parent )
{
- PluginPickerDialog dlg( tqparent );
+ PluginPickerDialog dlg( parent );
if ( dlg.exec() )
return dlg.selectedPlugin();
else
diff --git a/kitchensync/src/pluginpicker.h b/kitchensync/src/pluginpicker.h
index fbaed3f26..44564ddb6 100644
--- a/kitchensync/src/pluginpicker.h
+++ b/kitchensync/src/pluginpicker.h
@@ -45,7 +45,7 @@ class PluginPicker : public TQWidget
TQ_OBJECT
public:
- PluginPicker( TQWidget *tqparent );
+ PluginPicker( TQWidget *parent );
QSync::Plugin selectedPlugin() const;
@@ -65,11 +65,11 @@ class PluginPickerDialog : public KDialogBase
TQ_OBJECT
public:
- PluginPickerDialog( TQWidget *tqparent );
+ PluginPickerDialog( TQWidget *parent );
QSync::Plugin selectedPlugin() const;
- static QSync::Plugin getPlugin( TQWidget *tqparent );
+ static QSync::Plugin getPlugin( TQWidget *parent );
protected slots:
void slotOk();
diff --git a/kitchensync/src/singleconflictdialog.cpp b/kitchensync/src/singleconflictdialog.cpp
index c70402795..f9228e174 100644
--- a/kitchensync/src/singleconflictdialog.cpp
+++ b/kitchensync/src/singleconflictdialog.cpp
@@ -32,8 +32,8 @@
#include "singleconflictdialog.h"
-SingleConflictDialog::SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent )
- : ConflictDialog( mapping, tqparent ), mDiffAlgo( 0 )
+SingleConflictDialog::SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent )
+ : ConflictDialog( mapping, parent ), mDiffAlgo( 0 )
{
initGUI();
diff --git a/kitchensync/src/singleconflictdialog.h b/kitchensync/src/singleconflictdialog.h
index 9c80f7fc6..249620c2d 100644
--- a/kitchensync/src/singleconflictdialog.h
+++ b/kitchensync/src/singleconflictdialog.h
@@ -36,7 +36,7 @@ class SingleConflictDialog : public ConflictDialog
TQ_OBJECT
public:
- SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent );
+ SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent );
~SingleConflictDialog();
private slots:
diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox
index ab2391090..cc1111582 100644
--- a/kmail/Mainpage.dox
+++ b/kmail/Mainpage.dox
@@ -527,7 +527,7 @@ class SortCacheItem:
folder) messages is cached on disk in a file named .$FOLDER.index.sorted
so if, for example the name of a folder is foo, the associated sorting
cache file would be called ".foo.index.sorted".
- For each message, its serial number, that of its tqparent, the length of its
+ For each message, its serial number, that of its parent, the length of its
sorting key, and the key itself are written to this file. At the start of
the file several per folder counts and flags are cached additionally,
immediately after a short file headers. The entries from the start of the
@@ -544,13 +544,13 @@ class SortCacheItem:
What is used for figuring out threading?
- messages can have an In-Reply-To header that contains the message id of
- another message. This is called a perfect tqparent.
+ another message. This is called a perfect parent.
- additionally there is the References header which, if present, holds a
list of message ids that the current message is a follow up to. We
currently use the second to last entry in that list only. See further
down for the reasoning behind that.
- If the above two fail and the message is prefixed (Re: foo, Fwd: foo etc.)
- an attempt is made to find a tqparent by looking for messages with the same
+ an attempt is made to find a parent by looking for messages with the same
subject. How that is done is explained below as well.
For all these comparisons of header contents, the md5 hashes of the headers
@@ -578,22 +578,22 @@ Strategy:
has been moved away in the meantime (possibly by outside forces such as
other clients) and a deleted counter is incremented and all further
processing stopped for this message.
- The messages tqparent serial number, as read from the sorted file is then
- used to look up the tqparent and reset it to -1 should it not be in the
+ The messages parent serial number, as read from the sorted file is then
+ used to look up the parent and reset it to -1 should it not be in the
current folder anymore. -1 and -2 are special values that can show up
- as tqparent serial numbers and are used to encode the following:
- -1 means this message has no perfect tqparent, a tqparent for it needs to
+ as parent serial numbers and are used to encode the following:
+ -1 means this message has no perfect parent, a parent for it needs to
be found from among the other messages, if there is a suitable one
-2 means this message is top level and will forever stay so, no need
- to even try to find a tqparent. This is also used for the non-threaded
+ to even try to find a parent. This is also used for the non-threaded
case. These are messages that have neither an In-Reply-To header nor
a References header and have a subject that is not prefixed.
- In case there is a perfect tqparent, the current sort cache item is
+ In case there is a perfect parent, the current sort cache item is
appended to the parents list of unsorted tqchildren, or to that of
root, if there is not. A sort cache item is created in the mSortCache
- for the tqparent, if it is not already there. Messages with a tqparent of
+ for the parent, if it is not already there. Messages with a parent of
-1 are appended to the "unparented" list, which is later traversed and
- its elements threaded. Messages with -2 as the tqparent are tqchildren of
+ its elements threaded. Messages with -2 as the parent are tqchildren of
root as well, as noted above, and will remain so.
Once the end of the file is reached, we should have a nicely filled
@@ -612,7 +612,7 @@ Strategy:
well.
The next step is finding parents for those messages that are either new, or
- had a tqparent of -1 in the .sorted file. To that end, a dict of all sort
+ had a parent of -1 in the .sorted file. To that end, a dict of all sort
cache items indexed by the md5 hash of their messsage id headers is created,
that will be used for looking up sort cache items by message id. The list of
yet unparented messages is then traversed and findParent() called for each
@@ -638,7 +638,7 @@ Strategy:
- since the above is a common special case, it is worth trying. I think. ;)
- If the tqparent found is perfect (In-Reply-To), the sort cache items is marked
+ If the parent found is perfect (In-Reply-To), the sort cache items is marked
as such. mIsImperfectlyThreaded is used for that purposer, we will soon see
why that flag is needed.
@@ -647,29 +647,29 @@ Strategy:
are collected into a second dict ( QDict< QPtrList< SortCacheItem > > )
that contains for each different subject an entry holding a list of (so far
top level) messages with that subject, that are potential parents for
- threading by subjects. These lists are sorted by date, so the tqparent closest
+ threading by subjects. These lists are sorted by date, so the parent closest
by date can be chosen. Sorting of these lists happens via insertion sort
while they are built because not only are they expected to be short (apart
from hard corner cases such as cvs commit lists, for which subject threading
makes little sense anyhow and where it should be turned off), but also since
the messages should be roughly pre sorted by date in the store already.
Some cursory benchmarking supports that assumption.
- If now a tqparent is needed for a message with a certain subject, the list of
+ If now a parent is needed for a message with a certain subject, the list of
top level messages with that subject is traversed and the first one that is
- older than our message is chosen as it's tqparent. Parents more than six weeks
+ older than our message is chosen as it's parent. Parents more than six weeks
older than the message are not accepted. The reasoning being that if a new
message with the same subject turns up after such a long time, the chances
that it is still part of the same thread are slim. The value of six weeks
is chosen as a result of a poll conducted on #kde-devel, so it's probably
bogus. :) All of this happens in the aptly named: findParentBySubject().
- Everthing that still has no tqparent after this ends up at toplevel, no further
+ Everthing that still has no parent after this ends up at toplevel, no further
attemp is made at finding one. If you are reading this because you want to
implement threading by body search or somesuch, please go away, I don't like
you. :)
Ok, so far we have only operated on sort cache items, nothing ui wise has
- happened yet. Now that we have established the tqparent/child relations of all
+ happened yet. Now that we have established the parent/child relations of all
messages, it's time to create HeaderItems for them for use in the header
list. But wait, you say, what about sorting? Wouldn't it make sense to do
that first? Exactly, you're a clever bugger, ey? Here, have a cookie. ;)
@@ -706,14 +706,14 @@ What happens when a message arrives in the folder?
structures described above are updated accordingly. If threading is enabled,
the new message is threaded using the same findParent and findParentBySubject
methods used on folder open. If the message ends up in a watched or ignored
- thread, those status bits are inherited from the tqparent. The message is also
+ thread, those status bits are inherited from the parent. The message is also
added to the dict of header items, the index of messages by message id and,
if applicable and if the message is threaded at top level, to the list of
potential parents for subject threading.
After those house keeping tasks are performed, the list of as of yet imper-
fectly threaded messages is traversed and our newly arrived message is
- considered as a new tqparent for each item on it. This is especially important
+ considered as a new parent for each item on it. This is especially important
to ensure that parents arriving out of order after their tqchildren still end
up as parents. If necessary, the entries in the .sorted file of rethreaded
messages are updated. An entry for the new message itself is appended to the
@@ -735,7 +735,7 @@ What happens when a message is removed from the folder?
mented. Then a list of tqchildren of the message is assembled containing those
tqchildren that have to be reparented now that our message has gone away. If
one of those tqchildren has been marked as toBeDeleted, it is simply added to
- root at top level, because there is no need to find a tqparent for it if it is
+ root at top level, because there is no need to find a parent for it if it is
to go away as well. This is an optimization to avoid rethreading all
messages in a thread when deleting several messages in a thread, or even the
whole thread. The KMMoveCommand marks all messages that will be moved out of
@@ -743,7 +743,7 @@ What happens when a message is removed from the folder?
can be avoided. Note that that does not work when moving messages via filter
action.
- That list of tqchildren is then traversed and a new tqparent found for each one
+ That list of tqchildren is then traversed and a new parent found for each one
using, again, findParent and findParentBySubject. When a message becomes
imperfectly threaded in the process, it is added to the corresponding list.
diff --git a/kmail/accountcombobox.cpp b/kmail/accountcombobox.cpp
index 252a49c86..7ae3d2a37 100644
--- a/kmail/accountcombobox.cpp
+++ b/kmail/accountcombobox.cpp
@@ -34,8 +34,8 @@
using namespace KMail;
-AccountComboBox::AccountComboBox( TQWidget* tqparent, const char* name )
- : TQComboBox( tqparent, name )
+AccountComboBox::AccountComboBox( TQWidget* parent, const char* name )
+ : TQComboBox( parent, name )
{
connect( kmkernel->acctMgr(), TQT_SIGNAL( accountAdded( KMAccount* ) ),
this, TQT_SLOT( slotRefreshAccounts() ) );
diff --git a/kmail/accountcombobox.h b/kmail/accountcombobox.h
index 04a8bc07c..48c5d6a8b 100644
--- a/kmail/accountcombobox.h
+++ b/kmail/accountcombobox.h
@@ -45,7 +45,7 @@ class AccountComboBox : public TQComboBox
TQ_OBJECT
public:
- AccountComboBox( TQWidget* tqparent, const char* name = 0 );
+ AccountComboBox( TQWidget* parent, const char* name = 0 );
void setCurrentAccount( KMAccount* account );
KMAccount* currentAccount() const;
diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp
index de168cebb..93616ac8f 100644
--- a/kmail/accountdialog.cpp
+++ b/kmail/accountdialog.cpp
@@ -268,8 +268,8 @@ ProcmailRCParser::expandVars(const TQString &s)
AccountDialog::AccountDialog( const TQString & caption, KMAccount *account,
- TQWidget *tqparent, const char *name, bool modal )
- : KDialogBase( tqparent, name, modal, caption, Ok|Cancel|Help, Ok, true ),
+ TQWidget *parent, const char *name, bool modal )
+ : KDialogBase( parent, name, modal, caption, Ok|Cancel|Help, Ok, true ),
mAccount( account ),
mServerTest( 0 ),
mCurCapa( AllCapa ),
@@ -2267,8 +2267,8 @@ void AccountDialog::slotEditSharedNamespace()
}
}
-NamespaceLineEdit::NamespaceLineEdit( TQWidget* tqparent )
- : KLineEdit( tqparent )
+NamespaceLineEdit::NamespaceLineEdit( TQWidget* parent )
+ : KLineEdit( parent )
{
}
@@ -2278,9 +2278,9 @@ void NamespaceLineEdit::setText( const TQString& text )
KLineEdit::setText( text );
}
-NamespaceEditDialog::NamespaceEditDialog( TQWidget *tqparent,
+NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent,
ImapAccountBase::imapNamespace type, ImapAccountBase::nsDelimMap* map )
- : KDialogBase( tqparent, "edit_namespace", false, TQString(),
+ : KDialogBase( parent, "edit_namespace", false, TQString(),
Ok|Cancel, Ok, true ), mType( type ), mNamespaceMap( map )
{
TQVBox *page = makeVBoxMainWidget();
diff --git a/kmail/accountdialog.h b/kmail/accountdialog.h
index 060b576a0..8a65d418f 100644
--- a/kmail/accountdialog.h
+++ b/kmail/accountdialog.h
@@ -59,7 +59,7 @@ class AccountDialog : public KDialogBase
public:
AccountDialog( const TQString & caption, KMAccount *account,
- TQWidget *tqparent=0, const char *name=0, bool modal=true );
+ TQWidget *parent=0, const char *name=0, bool modal=true );
virtual ~AccountDialog();
private:
struct LocalWidgets
@@ -306,7 +306,7 @@ class NamespaceLineEdit: public KLineEdit
TQ_OBJECT
public:
- NamespaceLineEdit( TQWidget* tqparent );
+ NamespaceLineEdit( TQWidget* parent );
const TQString& lastText() { return mLastText; }
@@ -323,7 +323,7 @@ class NamespaceEditDialog: public KDialogBase
TQ_OBJECT
public:
- NamespaceEditDialog( TQWidget* tqparent, ImapAccountBase::imapNamespace type,
+ NamespaceEditDialog( TQWidget* parent, ImapAccountBase::imapNamespace type,
ImapAccountBase::nsDelimMap* map );
protected slots:
diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp
index be69edd0f..6a188fbb5 100644
--- a/kmail/accountwizard.cpp
+++ b/kmail/accountwizard.cpp
@@ -81,8 +81,8 @@ class AccountTypeBox : public KListBox
public:
enum Type { Local, POP3, IMAP, dIMAP, Maildir };
- AccountTypeBox( TQWidget *tqparent )
- : KListBox( tqparent, "AccountTypeBox" )
+ AccountTypeBox( TQWidget *parent )
+ : KListBox( parent, "AccountTypeBox" )
{
mTypeList << i18n( "Local mailbox" );
mTypeList << i18n( "POP3" );
@@ -107,8 +107,8 @@ class AccountTypeBox : public KListBox
TQStringList mTypeList;
};
-AccountWizard::AccountWizard( KMKernel *kernel, TQWidget *tqparent )
- : KWizard( tqparent, "KWizard" ), mKernel( kernel ),
+AccountWizard::AccountWizard( KMKernel *kernel, TQWidget *parent )
+ : KWizard( parent, "KWizard" ), mKernel( kernel ),
mAccount( 0 ), mTransportInfo( 0 ), mServerTest( 0 )
{
setupWelcomePage();
@@ -118,12 +118,12 @@ AccountWizard::AccountWizard( KMKernel *kernel, TQWidget *tqparent )
setupServerInformationPage();
}
-void AccountWizard::start( KMKernel *kernel, TQWidget *tqparent )
+void AccountWizard::start( KMKernel *kernel, TQWidget *parent )
{
KConfigGroup wizardConfig( KMKernel::config(), "AccountWizard" );
if ( wizardConfig.readBoolEntry( "ShowOnStartup", true ) ) {
- AccountWizard wizard( kernel, tqparent );
+ AccountWizard wizard( kernel, parent );
int result = wizard.exec();
if ( result == TQDialog::Accepted ) {
wizardConfig.writeEntry( "ShowOnStartup", false );
diff --git a/kmail/accountwizard.h b/kmail/accountwizard.h
index 6a05fc655..6e77dd6e6 100644
--- a/kmail/accountwizard.h
+++ b/kmail/accountwizard.h
@@ -53,9 +53,9 @@ class AccountWizard : public KWizard
run successfully before.
@param kernel The mail kernel the wizard should work on.
- @param tqparent The tqparent widget of the dialog.
+ @param parent The parent widget of the dialog.
*/
- static void start( KMKernel *kernel, TQWidget *tqparent = 0 );
+ static void start( KMKernel *kernel, TQWidget *parent = 0 );
/**
Reimplemented
@@ -63,7 +63,7 @@ class AccountWizard : public KWizard
void showPage( TQWidget *page );
protected:
- AccountWizard( KMKernel *kernel, TQWidget *tqparent );
+ AccountWizard( KMKernel *kernel, TQWidget *parent );
~AccountWizard() {};
void setupWelcomePage();
diff --git a/kmail/actionscheduler.cpp b/kmail/actionscheduler.cpp
index 913245e99..71475a93d 100644
--- a/kmail/actionscheduler.cpp
+++ b/kmail/actionscheduler.cpp
@@ -421,7 +421,7 @@ void ActionScheduler::fetchMessage()
} else if (msg) {
fetchTimeOutTime = TQTime::currentTime();
fetchTimeOutTimer->start( 60 * 1000, true );
- FolderJob *job = msg->tqparent()->createJob( msg );
+ FolderJob *job = msg->parent()->createJob( msg );
connect( job, TQT_SIGNAL(messageRetrieved( KMMessage* )),
TQT_SLOT(messageFetched( KMMessage* )) );
lastJob = job;
@@ -461,8 +461,8 @@ void ActionScheduler::messageFetched( KMMessage *msg )
} else {
fetchMessageTimer->start( 0, true );
}
- if (mFetchUnget && msg->tqparent())
- msg->tqparent()->unGetMsg( msg->tqparent()->find( msg ));
+ if (mFetchUnget && msg->parent())
+ msg->parent()->unGetMsg( msg->parent()->find( msg ));
return;
}
@@ -562,7 +562,7 @@ void ActionScheduler::processMessage()
return;
}
if (msg) {
- FolderJob *job = msg->tqparent()->createJob( msg );
+ FolderJob *job = msg->parent()->createJob( msg );
connect( job, TQT_SIGNAL(messageRetrieved( KMMessage* )),
TQT_SLOT(messageRetrieved( KMMessage* )) );
job->start();
@@ -665,7 +665,7 @@ void ActionScheduler::moveMessage()
if (mOriginalSerNum)
orgMsg = message( mOriginalSerNum );
mResult = mOldReturnCode; // ignore errors in deleting original message
- if (!orgMsg || !orgMsg->tqparent()) {
+ if (!orgMsg || !orgMsg->parent()) {
// Original message is gone, no point filtering it anymore
mSrcFolder->removeMsg( mSrcFolder->find( msg ) );
kdDebug(5006) << "The original serial number is missing. "
@@ -675,11 +675,11 @@ void ActionScheduler::moveMessage()
return;
} else {
if (!folder) // no filter folder specified leave in current place
- folder = orgMsg->tqparent();
+ folder = orgMsg->parent();
}
mIgnore = true;
- assert( msg->tqparent() == mSrcFolder.operator->() );
+ assert( msg->parent() == mSrcFolder.operator->() );
mSrcFolder->take( mSrcFolder->find( msg ) );
mSrcFolder->addMsg( msg );
mIgnore = false;
@@ -719,7 +719,7 @@ void ActionScheduler::moveMessageFinished( KMCommand *command )
mResult = mOldReturnCode; // ignore errors in deleting original message
KMCommand *cmd = 0;
- if (msg && msg->tqparent()) {
+ if (msg && msg->parent()) {
cmd = new KMMoveCommand( 0, msg );
// cmd->start(); // Note: sensitive logic here.
}
diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp
index dccca6a89..4091c715c 100644
--- a/kmail/antispamwizard.cpp
+++ b/kmail/antispamwizard.cpp
@@ -57,8 +57,8 @@
using namespace KMail;
AntiSpamWizard::AntiSpamWizard( WizardMode mode,
- TQWidget* tqparent, KMFolderTree * mainFolderTree )
- : KWizard( tqparent ),
+ TQWidget* parent, KMFolderTree * mainFolderTree )
+ : KWizard( parent ),
mInfoPage( 0 ),
mSpamRulesPage( 0 ),
mVirusRulesPage( 0 ),
@@ -830,9 +830,9 @@ void AntiSpamWizard::ConfigReader::sortToolList()
//---------------------------------------------------------------------------
-ASWizPage::ASWizPage( TQWidget * tqparent, const char * name,
+ASWizPage::ASWizPage( TQWidget * parent, const char * name,
const TQString *bannerName )
- : TQWidget( tqparent, name )
+ : TQWidget( parent, name )
{
TQString banner = "kmwizard.png";
if ( bannerName && !bannerName->isEmpty() )
@@ -852,8 +852,8 @@ ASWizPage::ASWizPage( TQWidget * tqparent, const char * name,
//---------------------------------------------------------------------------
ASWizInfoPage::ASWizInfoPage( AntiSpamWizard::WizardMode mode,
- TQWidget * tqparent, const char * name )
- : ASWizPage( tqparent, name )
+ TQWidget * parent, const char * name )
+ : ASWizPage( parent, name )
{
TQBoxLayout * tqlayout = new TQVBoxLayout( mLayout );
@@ -936,9 +936,9 @@ void ASWizInfoPage::processSelectionChange()
//---------------------------------------------------------------------------
-ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * tqparent, const char * name,
+ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name,
KMFolderTree * mainFolderTree )
- : ASWizPage( tqparent, name )
+ : ASWizPage( parent, name )
{
TQVBoxLayout *tqlayout = new TQVBoxLayout( mLayout );
@@ -1059,9 +1059,9 @@ void ASWizSpamRulesPage::allowUnsureFolderSelection( bool enabled )
//---------------------------------------------------------------------------
-ASWizVirusRulesPage::ASWizVirusRulesPage( TQWidget * tqparent, const char * name,
+ASWizVirusRulesPage::ASWizVirusRulesPage( TQWidget * parent, const char * name,
KMFolderTree * mainFolderTree )
- : ASWizPage( tqparent, name )
+ : ASWizPage( parent, name )
{
TQGridLayout *grid = new TQGridLayout( mLayout, 5, 1, KDialog::spacingHint() );
@@ -1135,8 +1135,8 @@ void ASWizVirusRulesPage::processSelectionChange()
//---------------------------------------------------------------------------
-ASWizSummaryPage::ASWizSummaryPage( TQWidget * tqparent, const char * name )
- : ASWizPage( tqparent, name )
+ASWizSummaryPage::ASWizSummaryPage( TQWidget * parent, const char * name )
+ : ASWizPage( parent, name )
{
TQBoxLayout * tqlayout = new TQVBoxLayout( mLayout );
diff --git a/kmail/antispamwizard.h b/kmail/antispamwizard.h
index a17e341a2..04ec41046 100644
--- a/kmail/antispamwizard.h
+++ b/kmail/antispamwizard.h
@@ -115,13 +115,13 @@ namespace KMail {
/** Constructor that needs to initialize from the main folder tree
of KMail.
@param mode The mode the wizard should run in.
- @param tqparent The tqparent widget for the wizard.
+ @param parent The parent widget for the wizard.
@param mainFolderTree The main folder tree from which the folders
are copied to allow the selection of a spam folder in a tree
within one of the wizard pages.
*/
AntiSpamWizard( WizardMode mode,
- TQWidget * tqparent, KMFolderTree * mainFolderTree );
+ TQWidget * parent, KMFolderTree * mainFolderTree );
protected:
/**
@@ -284,7 +284,7 @@ namespace KMail {
class ASWizPage : public TQWidget
{
public:
- ASWizPage( TQWidget *tqparent, const char *name,
+ ASWizPage( TQWidget *parent, const char *name,
const TQString *bannerName = 0);
protected:
@@ -303,7 +303,7 @@ namespace KMail {
public:
ASWizInfoPage( AntiSpamWizard::WizardMode mode,
- TQWidget *tqparent, const char *name );
+ TQWidget *parent, const char *name );
void setScanProgressText( const TQString &toolName );
void addAvailableTool( const TQString &visibleName );
@@ -329,7 +329,7 @@ namespace KMail {
TQ_OBJECT
public:
- ASWizSpamRulesPage( TQWidget * tqparent, const char * name, KMFolderTree * mainFolderTree );
+ ASWizSpamRulesPage( TQWidget * parent, const char * name, KMFolderTree * mainFolderTree );
bool markAsReadSelected() const;
bool moveSpamSelected() const;
@@ -362,7 +362,7 @@ namespace KMail {
TQ_OBJECT
public:
- ASWizVirusRulesPage( TQWidget * tqparent, const char * name, KMFolderTree * mainFolderTree );
+ ASWizVirusRulesPage( TQWidget * parent, const char * name, KMFolderTree * mainFolderTree );
bool pipeRulesSelected() const;
bool moveRulesSelected() const;
@@ -389,7 +389,7 @@ namespace KMail {
TQ_OBJECT
public:
- ASWizSummaryPage( TQWidget * tqparent, const char * name );
+ ASWizSummaryPage( TQWidget * parent, const char * name );
void setSummaryText( const TQString & text );
diff --git a/kmail/archivefolderdialog.cpp b/kmail/archivefolderdialog.cpp
index f6cfac629..21c345fb3 100644
--- a/kmail/archivefolderdialog.cpp
+++ b/kmail/archivefolderdialog.cpp
@@ -49,11 +49,11 @@ static TQString standardArchivePath( const TQString &folderName )
"_" + TQDate::tqcurrentDate().toString( Qt::ISODate ) + ".tar.bz2";
}
-ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *tqparent )
- : KDialogBase( tqparent, "archive_folder_dialog", false, i18n( "Archive Folder" ),
+ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent )
+ : KDialogBase( parent, "archive_folder_dialog", false, i18n( "Archive Folder" ),
KDialogBase::Ok | KDialogBase::Cancel,
KDialogBase::Ok, true ),
- mParentWidget( tqparent )
+ mParentWidget( parent )
{
TQWidget *mainWidget = new TQWidget( this );
TQGridLayout *mainLayout = new TQGridLayout( mainWidget );
diff --git a/kmail/archivefolderdialog.h b/kmail/archivefolderdialog.h
index cc4699594..b38d0aeea 100644
--- a/kmail/archivefolderdialog.h
+++ b/kmail/archivefolderdialog.h
@@ -37,7 +37,7 @@ class ArchiveFolderDialog : public KDialogBase
public:
- ArchiveFolderDialog( TQWidget *tqparent = 0 );
+ ArchiveFolderDialog( TQWidget *parent = 0 );
void setFolder( KMFolder *defaultFolder );
protected slots:
diff --git a/kmail/attachmentlistview.cpp b/kmail/attachmentlistview.cpp
index 7eebbbb22..18e8ddafa 100644
--- a/kmail/attachmentlistview.cpp
+++ b/kmail/attachmentlistview.cpp
@@ -47,9 +47,9 @@ using KPIM::MailListDrag;
namespace KMail {
AttachmentListView::AttachmentListView( KMail::Composer * composer,
- TQWidget* tqparent,
+ TQWidget* parent,
const char* name )
- : KListView( tqparent, name ),
+ : KListView( parent, name ),
mComposer( composer )
{
setAcceptDrops( true );
diff --git a/kmail/attachmentlistview.h b/kmail/attachmentlistview.h
index a25d792e8..3f1f83fea 100644
--- a/kmail/attachmentlistview.h
+++ b/kmail/attachmentlistview.h
@@ -32,7 +32,7 @@ class AttachmentListView : public KListView
Q_OBJECT
TQ_OBJECT
public:
- AttachmentListView( KMail::Composer * composer = 0, TQWidget* tqparent = 0,
+ AttachmentListView( KMail::Composer * composer = 0, TQWidget* parent = 0,
const char* name = 0 );
virtual ~AttachmentListView();
diff --git a/kmail/backupjob.cpp b/kmail/backupjob.cpp
index e3a2ac0dd..43209ca7b 100644
--- a/kmail/backupjob.cpp
+++ b/kmail/backupjob.cpp
@@ -36,12 +36,12 @@
using namespace KMail;
-BackupJob::BackupJob( TQWidget *tqparent )
- : TQObject( tqparent ),
+BackupJob::BackupJob( TQWidget *parent )
+ : TQObject( parent ),
mArchiveType( Zip ),
mRootFolder( 0 ),
mArchive( 0 ),
- mParentWidget( tqparent ),
+ mParentWidget( parent ),
mCurrentFolderOpen( false ),
mArchivedMessages( 0 ),
mArchivedSize( 0 ),
@@ -236,8 +236,8 @@ void BackupJob::archiveNextMessage()
mCurrentMessage = message;
TQTimer::singleShot( 0, this, TQT_SLOT( processCurrentMessage() ) );
}
- else if ( message->tqparent() ) {
- mCurrentJob = message->tqparent()->createJob( message );
+ else if ( message->parent() ) {
+ mCurrentJob = message->parent()->createJob( message );
mCurrentJob->setCancellable( false );
connect( mCurrentJob, TQT_SIGNAL( messageRetrieved( KMMessage* ) ),
this, TQT_SLOT( messageRetrieved( KMMessage* ) ) );
@@ -247,7 +247,7 @@ void BackupJob::archiveNextMessage()
}
else {
kdWarning(5006) << "Message with subject " << mCurrentMessage->subject()
- << " is neither complete nor has a tqparent!" << endl;
+ << " is neither complete nor has a parent!" << endl;
abort( i18n( "Internal error while trying to retrieve a message from folder '%1'." )
.tqarg( mCurrentFolder->name() ) );
}
diff --git a/kmail/backupjob.h b/kmail/backupjob.h
index 500e671ac..7a56be172 100644
--- a/kmail/backupjob.h
+++ b/kmail/backupjob.h
@@ -55,7 +55,7 @@ class BackupJob : public TQObject
// These enum values have to stay in sync with the format combobox of ArchiveFolderDialog!
enum ArchiveType { Zip = 0, Tar = 1, TarBz2 = 2, TarGz = 3 };
- explicit BackupJob( TQWidget *tqparent = 0 );
+ explicit BackupJob( TQWidget *parent = 0 );
~BackupJob();
void setRootFolder( KMFolder *rootFolder );
void setSaveLocation( const KURL &savePath );
diff --git a/kmail/bodyvisitor.cpp b/kmail/bodyvisitor.cpp
index 8a40d7443..04b7a98b8 100644
--- a/kmail/bodyvisitor.cpp
+++ b/kmail/bodyvisitor.cpp
@@ -76,9 +76,9 @@ namespace KMail {
while ( (part = it.current()) != 0 )
{
++it;
- // skip this part if the tqparent part is already loading
- if ( part->tqparent() &&
- selected.contains( part->tqparent() ) &&
+ // skip this part if the parent part is already loading
+ if ( part->parent() &&
+ selected.contains( part->parent() ) &&
part->loadPart() )
continue;
@@ -114,7 +114,7 @@ namespace KMail {
headerCheck = false;
// check whether to load this part or not:
- // look at the basic list, ask the subclass and check the tqparent
+ // look at the basic list, ask the subclass and check the parent
if ( mBasicList.contains( part->originalContentTypeStr() ) ||
parentNeedsLoading( part ) ||
addPartToList( part ) )
@@ -142,13 +142,13 @@ namespace KMail {
KMMessagePart *part = msgPart;
while ( part )
{
- if ( part->tqparent() &&
- ( part->tqparent()->originalContentTypeStr() == "MULTIPART/SIGNED" ||
+ if ( part->parent() &&
+ ( part->parent()->originalContentTypeStr() == "MULTIPART/SIGNED" ||
( msgPart->originalContentTypeStr() == "APPLICATION/OCTET-STREAM" &&
- part->tqparent()->originalContentTypeStr() == "MULTIPART/ENCRYPTED" ) ) )
+ part->parent()->originalContentTypeStr() == "MULTIPART/ENCRYPTED" ) ) )
return true;
- part = part->tqparent();
+ part = part->parent();
}
return false;
}
diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp
index d13382511..6dcae58c1 100644
--- a/kmail/cachedimapjob.cpp
+++ b/kmail/cachedimapjob.cpp
@@ -534,8 +534,8 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job )
}
// make copy of setting, to reset it before potentially destroying 'it'
- bool silentUpload = static_cast((*it).tqparent->storage())->silentUpload();
- static_cast((*it).tqparent->storage())->setSilentUpload( false );
+ bool silentUpload = static_cast((*it).parent->storage())->silentUpload();
+ static_cast((*it).parent->storage())->setSilentUpload( false );
if ( job->error() && !silentUpload ) {
TQString myError = "
" + i18n("Error while uploading folder")
@@ -549,7 +549,7 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job )
return;
} else {
KMFolderCachedImap* storage = static_cast( (*it).current->storage() );
- KMFolderCachedImap* parentStorage = static_cast( (*it).tqparent->storage() );
+ KMFolderCachedImap* parentStorage = static_cast( (*it).parent->storage() );
Q_ASSERT( storage );
Q_ASSERT( parentStorage );
if ( storage->imapPath().isEmpty() ) {
@@ -581,9 +581,9 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job )
url.setPath( path );
if ( mAccount->groupwareType() != KMAcctCachedImap::GroupwareScalix ) {
- // Associate the jobData with the tqparent folder, not with the child
+ // Associate the jobData with the parent folder, not with the child
// This is necessary in case of an error while creating the subfolder,
- // so that folderComplete is called on the tqparent (and the sync resetted).
+ // so that folderComplete is called on the parent (and the sync resetted).
ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
jd.items << folder->label(); // for the err msg
jd.current = folder->folder();
@@ -679,7 +679,7 @@ void CachedImapJob::slotCheckUidValidityResult(KIO::Job * job)
if( job->error() ) {
mErrorCode = job->error();
- mAccount->handleJobError( job, i18n( "Error while reading folder %1 on the server: " ).tqarg( (*it).tqparent->label() ) + '\n' );
+ mAccount->handleJobError( job, i18n( "Error while reading folder %1 on the server: " ).tqarg( (*it).parent->label() ) + '\n' );
delete this;
return;
}
@@ -892,9 +892,9 @@ void CachedImapJob::slotListMessagesResult( KIO::Job * job )
}
//-----------------------------------------------------------------------------
-void CachedImapJob::setParentFolder( const KMFolderCachedImap* tqparent )
+void CachedImapJob::setParentFolder( const KMFolderCachedImap* parent )
{
- mParentFolder = const_cast( tqparent );
+ mParentFolder = const_cast( parent );
}
}
diff --git a/kmail/cachedimapjob.h b/kmail/cachedimapjob.h
index cf9dab57e..9931df701 100644
--- a/kmail/cachedimapjob.h
+++ b/kmail/cachedimapjob.h
@@ -95,7 +95,7 @@ public:
virtual ~CachedImapJob();
- void setParentFolder( const KMFolderCachedImap* tqparent );
+ void setParentFolder( const KMFolderCachedImap* parent );
signals:
// only emitted for uid validity checking jobs with PERMANENTFLAGS responses
diff --git a/kmail/chiasmuskeyselector.cpp b/kmail/chiasmuskeyselector.cpp
index d88c3164b..475ddd44f 100644
--- a/kmail/chiasmuskeyselector.cpp
+++ b/kmail/chiasmuskeyselector.cpp
@@ -7,10 +7,10 @@
#include
#include
-ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* tqparent, const TQString& caption,
+ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* parent, const TQString& caption,
const TQStringList& keys, const TQString& currentKey,
const TQString& lastOptions )
- : KDialogBase( tqparent, "chiasmusKeySelector", true, caption, Ok|Cancel, Ok, true )
+ : KDialogBase( parent, "chiasmusKeySelector", true, caption, Ok|Cancel, Ok, true )
{
TQWidget *page = makeMainWidget();
diff --git a/kmail/chiasmuskeyselector.h b/kmail/chiasmuskeyselector.h
index 3402fd370..d136305fc 100644
--- a/kmail/chiasmuskeyselector.h
+++ b/kmail/chiasmuskeyselector.h
@@ -12,7 +12,7 @@ class ChiasmusKeySelector : public KDialogBase
TQ_OBJECT
public:
- ChiasmusKeySelector( TQWidget* tqparent, const TQString& caption,
+ ChiasmusKeySelector( TQWidget* parent, const TQString& caption,
const TQStringList& keys, const TQString& currentKey,
const TQString& lastOptions );
diff --git a/kmail/colorlistbox.cpp b/kmail/colorlistbox.cpp
index a0ebc8253..a813a910d 100644
--- a/kmail/colorlistbox.cpp
+++ b/kmail/colorlistbox.cpp
@@ -29,8 +29,8 @@
#include "colorlistbox.h"
-ColorListBox::ColorListBox( TQWidget *tqparent, const char *name, WFlags f )
- :KListBox( tqparent, name, f ), mCurrentOnDragEnter(-1)
+ColorListBox::ColorListBox( TQWidget *parent, const char *name, WFlags f )
+ :KListBox( parent, name, f ), mCurrentOnDragEnter(-1)
{
connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) );
setAcceptDrops( true);
diff --git a/kmail/colorlistbox.h b/kmail/colorlistbox.h
index bb9e5b171..384647f65 100644
--- a/kmail/colorlistbox.h
+++ b/kmail/colorlistbox.h
@@ -29,7 +29,7 @@ class ColorListBox : public KListBox
TQ_OBJECT
public:
- ColorListBox( TQWidget *tqparent=0, const char * name=0, WFlags f=0 );
+ ColorListBox( TQWidget *parent=0, const char * name=0, WFlags f=0 );
void setColor( uint index, const TQColor &color );
TQColor color( uint index ) const;
signals:
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index c0d775cf2..771f7a755 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -214,9 +214,9 @@ namespace {
}
-ConfigureDialog::ConfigureDialog( TQWidget *tqparent, const char *name, bool modal )
+ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal )
: KCMultiDialog( KDialogBase::IconList, KGuiItem( i18n( "&Load Profile..." ) ),
- KGuiItem(), User2, i18n( "Configure" ), tqparent, name, modal )
+ KGuiItem(), User2, i18n( "Configure" ), parent, name, modal )
, mProfileDialog( 0 )
{
KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() );
@@ -284,8 +284,8 @@ TQString IdentityPage::helpAnchor() const {
return TQString::tqfromLatin1("configure-identity");
}
-IdentityPage::IdentityPage( TQWidget * tqparent, const char * name )
- : ConfigModule( tqparent, name ),
+IdentityPage::IdentityPage( TQWidget * parent, const char * name )
+ : ConfigModule( parent, name ),
mIdentityDialog( 0 )
{
TQHBoxLayout * hlay = new TQHBoxLayout( this, 0, KDialog::spacingHint() );
@@ -555,8 +555,8 @@ TQString AccountsPage::helpAnchor() const {
return TQString::tqfromLatin1("configure-accounts");
}
-AccountsPage::AccountsPage( TQWidget * tqparent, const char * name )
- : ConfigModuleWithTabs( tqparent, name )
+AccountsPage::AccountsPage( TQWidget * parent, const char * name )
+ : ConfigModuleWithTabs( parent, name )
{
//
// "Receiving" tab:
@@ -581,8 +581,8 @@ TQString AccountsPage::SendingTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-accounts-sending");
}
-AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab( tqparent, name )
+AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab( parent, name )
{
mTransportInfoList.setAutoDelete( true );
// temp. vars:
@@ -1056,8 +1056,8 @@ TQString AccountsPage::ReceivingTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-accounts-receiving");
}
-AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab ( tqparent, name )
+AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab ( parent, name )
{
// temp. vars:
TQVBoxLayout *vlay;
@@ -1481,8 +1481,8 @@ TQString AppearancePage::helpAnchor() const {
return TQString::tqfromLatin1("configure-appearance");
}
-AppearancePage::AppearancePage( TQWidget * tqparent, const char * name )
- : ConfigModuleWithTabs( tqparent, name )
+AppearancePage::AppearancePage( TQWidget * parent, const char * name )
+ : ConfigModuleWithTabs( parent, name )
{
//
// "Fonts" tab:
@@ -1551,8 +1551,8 @@ static const struct {
};
static const int numFontNames = sizeof fontNames / sizeof *fontNames;
-AppearancePageFontsTab::AppearancePageFontsTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab( tqparent, name ), mActiveFontIndex( -1 )
+AppearancePageFontsTab::AppearancePageFontsTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab( parent, name ), mActiveFontIndex( -1 )
{
assert( numFontNames == sizeof mFont / sizeof *mFont );
// tmp. vars:
@@ -1729,8 +1729,8 @@ static const struct {
};
static const int numColorNames = sizeof colorNames / sizeof *colorNames;
-AppearancePageColorsTab::AppearancePageColorsTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab( tqparent, name )
+AppearancePageColorsTab::AppearancePageColorsTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab( parent, name )
{
// tmp. vars:
TQVBoxLayout *vlay;
@@ -1900,8 +1900,8 @@ static const EnumConfigEntry readerWindowMode = {
readerWindowModes, DIM(readerWindowModes), 1
};
-AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab( tqparent, name )
+AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab( parent, name )
{
// tmp. vars:
TQVBoxLayout * vlay;
@@ -1992,8 +1992,8 @@ static const struct {
static const int numDateDisplayConfig =
sizeof dateDisplayConfig / sizeof *dateDisplayConfig;
-AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab( tqparent, name ),
+AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab( parent, name ),
mCustomDateFormatEdit( 0 )
{
// tmp. vars:
@@ -2249,9 +2249,9 @@ TQString AppearancePage::ReaderTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-appearance-reader");
}
-AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * tqparent,
+AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent,
const char * name )
- : ConfigModuleTab( tqparent, name )
+ : ConfigModuleTab( parent, name )
{
TQVBoxLayout *vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
@@ -2475,9 +2475,9 @@ TQString AppearancePage::SystemTrayTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-appearance-systemtray");
}
-AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * tqparent,
+AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * parent,
const char * name )
- : ConfigModuleTab( tqparent, name )
+ : ConfigModuleTab( parent, name )
{
TQVBoxLayout * vlay = new TQVBoxLayout( this, KDialog::marginHint(),
KDialog::spacingHint() );
@@ -2540,8 +2540,8 @@ TQString ComposerPage::helpAnchor() const {
return TQString::tqfromLatin1("configure-composer");
}
-ComposerPage::ComposerPage( TQWidget * tqparent, const char * name )
- : ConfigModuleWithTabs( tqparent, name )
+ComposerPage::ComposerPage( TQWidget * parent, const char * name )
+ : ConfigModuleWithTabs( parent, name )
{
//
// "General" tab:
@@ -2599,8 +2599,8 @@ TQString ComposerPage::GeneralTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-composer-general");
}
-ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab( tqparent, name )
+ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab( parent, name )
{
// tmp. vars:
TQVBoxLayout *vlay;
@@ -2913,8 +2913,8 @@ TQString ComposerPage::PhrasesTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-composer-phrases");
}
-ComposerPagePhrasesTab::ComposerPagePhrasesTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab( tqparent, name )
+ComposerPagePhrasesTab::ComposerPagePhrasesTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab( parent, name )
{
// tmp. vars:
TQGridLayout *glay;
@@ -3125,8 +3125,8 @@ TQString ComposerPage::TemplatesTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-composer-templates");
}
-ComposerPageTemplatesTab::ComposerPageTemplatesTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab ( tqparent, name )
+ComposerPageTemplatesTab::ComposerPageTemplatesTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab ( parent, name )
{
TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
@@ -3149,8 +3149,8 @@ TQString ComposerPage::CustomTemplatesTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-composer-custom-templates");
}
-ComposerPageCustomTemplatesTab::ComposerPageCustomTemplatesTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab ( tqparent, name )
+ComposerPageCustomTemplatesTab::ComposerPageCustomTemplatesTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab ( parent, name )
{
TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
@@ -3173,8 +3173,8 @@ TQString ComposerPage::SubjectTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-composer-subject");
}
-ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab( tqparent, name )
+ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab( parent, name )
{
// tmp. vars:
TQVBoxLayout *vlay;
@@ -3257,8 +3257,8 @@ TQString ComposerPage::CharsetTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-composer-charset");
}
-ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab( tqparent, name )
+ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab( parent, name )
{
// tmp. vars:
TQVBoxLayout *vlay;
@@ -3352,8 +3352,8 @@ TQString ComposerPage::HeadersTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-composer-headers");
}
-ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab( tqparent, name )
+ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab( parent, name )
{
// tmp. vars:
TQVBoxLayout *vlay;
@@ -3567,9 +3567,9 @@ TQString ComposerPage::AttachmentsTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-composer-attachments");
}
-ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * tqparent,
+ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent,
const char * name )
- : ConfigModuleTab( tqparent, name ) {
+ : ConfigModuleTab( parent, name ) {
// tmp. vars:
TQVBoxLayout *vlay;
TQLabel *label;
@@ -3672,8 +3672,8 @@ TQString SecurityPage::helpAnchor() const {
return TQString::tqfromLatin1("configure-security");
}
-SecurityPage::SecurityPage( TQWidget * tqparent, const char * name )
- : ConfigModuleWithTabs( tqparent, name )
+SecurityPage::SecurityPage( TQWidget * parent, const char * name )
+ : ConfigModuleWithTabs( parent, name )
{
//
// "Reading" tab:
@@ -3719,8 +3719,8 @@ TQString SecurityPage::GeneralTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-security-reading");
}
-SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab ( tqparent, name )
+SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab ( parent, name )
{
// tmp. vars:
TQVBoxLayout *vlay;
@@ -3996,8 +3996,8 @@ TQString SecurityPage::ComposerCryptoTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-security-composing");
}
-SecurityPageComposerCryptoTab::SecurityPageComposerCryptoTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab ( tqparent, name )
+SecurityPageComposerCryptoTab::SecurityPageComposerCryptoTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab ( parent, name )
{
// the margins are inside mWidget itself
TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, 0 );
@@ -4071,8 +4071,8 @@ TQString SecurityPage::WarningTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-security-warnings");
}
-SecurityPageWarningTab::SecurityPageWarningTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab( tqparent, name )
+SecurityPageWarningTab::SecurityPageWarningTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab( parent, name )
{
// the margins are inside mWidget itself
TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, 0 );
@@ -4180,8 +4180,8 @@ TQString SecurityPage::SMimeTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-security-smime-validation");
}
-SecurityPageSMimeTab::SecurityPageSMimeTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab( tqparent, name )
+SecurityPageSMimeTab::SecurityPageSMimeTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab( parent, name )
{
// the margins are inside mWidget itself
TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, 0 );
@@ -4498,8 +4498,8 @@ TQString SecurityPage::CryptPlugTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-security-crypto-backends");
}
-SecurityPageCryptPlugTab::SecurityPageCryptPlugTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab( tqparent, name )
+SecurityPageCryptPlugTab::SecurityPageCryptPlugTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab( parent, name )
{
TQVBoxLayout * vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
@@ -4531,8 +4531,8 @@ TQString MiscPage::helpAnchor() const {
return TQString::tqfromLatin1("configure-misc");
}
-MiscPage::MiscPage( TQWidget * tqparent, const char * name )
- : ConfigModuleWithTabs( tqparent, name )
+MiscPage::MiscPage( TQWidget * parent, const char * name )
+ : ConfigModuleWithTabs( parent, name )
{
mFolderTab = new FolderTab();
addTab( mFolderTab, i18n("&Folders") );
@@ -4546,8 +4546,8 @@ TQString MiscPage::FolderTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-misc-folders");
}
-MiscPageFolderTab::MiscPageFolderTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab( tqparent, name )
+MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab( parent, name )
{
// temp. vars:
TQVBoxLayout *vlay;
@@ -4800,8 +4800,8 @@ TQString MiscPage::GroupwareTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-misc-groupware");
}
-MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* tqparent, const char* name )
- : ConfigModuleTab( tqparent, name )
+MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name )
+ : ConfigModuleTab( parent, name )
{
TQBoxLayout* vlay = new TQVBoxLayout( this, KDialog::marginHint(),
KDialog::spacingHint() );
@@ -4866,7 +4866,7 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* tqparent, const char* name
this, TQT_SLOT( slotEmitChanged( void ) ) );
mFolderComboLabel = new TQLabel( mBox ); // text depends on storage format
- toolTip = i18n( "Set the tqparent of the resource folders" );
+ toolTip = i18n( "Set the parent of the resource folders" );
whatsThis = i18n( GlobalSettings::self()->theIMAPResourceFolderParentItem()->whatsThis().utf8() );
TQToolTip::add( mFolderComboLabel, toolTip );
TQWhatsThis::add( mFolderComboLabel, whatsThis );
diff --git a/kmail/configuredialog.h b/kmail/configuredialog.h
index a44f5db14..ece1d83fd 100644
--- a/kmail/configuredialog.h
+++ b/kmail/configuredialog.h
@@ -37,7 +37,7 @@ class ConfigureDialog : public KCMultiDialog
TQ_OBJECT
public:
- ConfigureDialog( TQWidget *tqparent=0, const char *name=0, bool modal=true );
+ ConfigureDialog( TQWidget *parent=0, const char *name=0, bool modal=true );
~ConfigureDialog();
signals:
diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp
index 7a8820236..a7fe20419 100644
--- a/kmail/configuredialog_p.cpp
+++ b/kmail/configuredialog_p.cpp
@@ -38,9 +38,9 @@
NewIdentityDialog::NewIdentityDialog( const TQStringList & identities,
- TQWidget *tqparent, const char *name,
+ TQWidget *parent, const char *name,
bool modal )
- : KDialogBase( tqparent, name, modal, i18n("New Identity"),
+ : KDialogBase( parent, name, modal, i18n("New Identity"),
Ok|Cancel|Help, Ok, true )
{
setHelp( TQString::tqfromLatin1("configure-identity-newidentitydialog") );
@@ -122,9 +122,9 @@ void NewIdentityDialog::slotEnableOK( const TQString & proposedIdentityName ) {
enableButtonOK( true );
}
-ListView::ListView( TQWidget *tqparent, const char *name,
+ListView::ListView( TQWidget *parent, const char *name,
int visibleItem )
- : KListView( tqparent, name )
+ : KListView( parent, name )
{
setVisibleItem(visibleItem);
}
@@ -191,9 +191,9 @@ TQSize ListView::tqsizeHint() const
static TQString flagPng = TQString::tqfromLatin1("/flag.png");
NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs,
- TQWidget *tqparent, const char *name,
+ TQWidget *parent, const char *name,
bool modal )
- : KDialogBase( tqparent, name, modal, i18n("New Language"), Ok|Cancel, Ok, true )
+ : KDialogBase( parent, name, modal, i18n("New Language"), Ok|Cancel, Ok, true )
{
// tqlayout the page (a combobox with label):
TQWidget *page = makeMainWidget();
@@ -244,8 +244,8 @@ TQString NewLanguageDialog::language() const
}
-LanguageComboBox::LanguageComboBox( bool rw, TQWidget *tqparent, const char *name )
- : TQComboBox( rw, tqparent, name )
+LanguageComboBox::LanguageComboBox( bool rw, TQWidget *parent, const char *name )
+ : TQComboBox( rw, parent, name )
{
}
@@ -284,8 +284,8 @@ void LanguageComboBox::setLanguage( const TQString & language )
//
//
-ProfileDialog::ProfileDialog( TQWidget * tqparent, const char * name, bool modal )
- : KDialogBase( tqparent, name, modal, i18n("Load Profile"), Ok|Cancel, Ok, true )
+ProfileDialog::ProfileDialog( TQWidget * parent, const char * name, bool modal )
+ : KDialogBase( parent, name, modal, i18n("Load Profile"), Ok|Cancel, Ok, true )
{
// tmp. vars:
TQWidget * page = makeMainWidget();
@@ -364,9 +364,9 @@ void ProfileDialog::slotOk() {
}
-ConfigModuleWithTabs::ConfigModuleWithTabs( TQWidget * tqparent,
+ConfigModuleWithTabs::ConfigModuleWithTabs( TQWidget * parent,
const char * name )
- : ConfigModule( tqparent, name )
+ : ConfigModule( parent, name )
{
TQVBoxLayout *vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
mTabWidget = new TQTabWidget( this );
diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h
index b1c34379a..455f8579f 100644
--- a/kmail/configuredialog_p.h
+++ b/kmail/configuredialog_p.h
@@ -84,7 +84,7 @@ public:
enum DuplicateMode { Empty, ControlCenter, ExistingEntry };
NewIdentityDialog( const TQStringList & identities,
- TQWidget *tqparent=0, const char *name=0, bool modal=true );
+ TQWidget *parent=0, const char *name=0, bool modal=true );
TQString identityName() const { return mLineEdit->text(); }
TQString duplicateIdentity() const { return mComboBox->currentText(); }
@@ -127,7 +127,7 @@ class NewLanguageDialog : public KDialogBase
TQ_OBJECT
public:
- NewLanguageDialog( LanguageItemList & suppressedLangs, TQWidget *tqparent=0,
+ NewLanguageDialog( LanguageItemList & suppressedLangs, TQWidget *parent=0,
const char *name=0, bool modal=true );
TQString language() const;
@@ -142,7 +142,7 @@ class LanguageComboBox : public TQComboBox
TQ_OBJECT
public:
- LanguageComboBox( bool rw, TQWidget *tqparent=0, const char *name=0 );
+ LanguageComboBox( bool rw, TQWidget *parent=0, const char *name=0 );
int insertLanguage( const TQString & language );
TQString language() const;
void setLanguage( const TQString & language );
@@ -158,7 +158,7 @@ class ProfileDialog : public KDialogBase {
Q_OBJECT
TQ_OBJECT
public:
- ProfileDialog( TQWidget * tqparent=0, const char * name=0, bool modal=false );
+ ProfileDialog( TQWidget * parent=0, const char * name=0, bool modal=false );
signals:
void profileSelected( KConfig * profile );
@@ -180,8 +180,8 @@ class ConfigModule : public KCModule {
Q_OBJECT
TQ_OBJECT
public:
- ConfigModule( TQWidget * tqparent=0, const char * name=0 )
- : KCModule ( tqparent, name )
+ ConfigModule( TQWidget * parent=0, const char * name=0 )
+ : KCModule ( parent, name )
{}
~ConfigModule() {}
@@ -208,8 +208,8 @@ class ConfigModuleTab : public TQWidget {
Q_OBJECT
TQ_OBJECT
public:
- ConfigModuleTab( TQWidget *tqparent=0, const char* name=0 )
- :TQWidget( tqparent, name )
+ ConfigModuleTab( TQWidget *parent=0, const char* name=0 )
+ :TQWidget( parent, name )
{}
~ConfigModuleTab() {}
void load();
@@ -243,7 +243,7 @@ class ConfigModuleWithTabs : public ConfigModule {
Q_OBJECT
TQ_OBJECT
public:
- ConfigModuleWithTabs( TQWidget * tqparent=0, const char * name=0 );
+ ConfigModuleWithTabs( TQWidget * parent=0, const char * name=0 );
~ConfigModuleWithTabs() {}
// don't reimplement any of those methods
@@ -271,7 +271,7 @@ class KDE_EXPORT IdentityPage : public ConfigModule {
Q_OBJECT
TQ_OBJECT
public:
- IdentityPage( TQWidget * tqparent=0, const char * name=0 );
+ IdentityPage( TQWidget * parent=0, const char * name=0 );
~IdentityPage() {}
TQString helpAnchor() const;
@@ -322,7 +322,7 @@ class AccountsPageSendingTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- AccountsPageSendingTab( TQWidget * tqparent=0, const char * name=0 );
+ AccountsPageSendingTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -360,7 +360,7 @@ class AccountsPageReceivingTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- AccountsPageReceivingTab( TQWidget * tqparent=0, const char * name=0 );
+ AccountsPageReceivingTab( TQWidget * parent=0, const char * name=0 );
~AccountsPageReceivingTab();
TQString helpAnchor() const;
void save();
@@ -405,7 +405,7 @@ class KDE_EXPORT AccountsPage : public ConfigModuleWithTabs {
Q_OBJECT
TQ_OBJECT
public:
- AccountsPage( TQWidget * tqparent=0, const char * name=0 );
+ AccountsPage( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
@@ -433,7 +433,7 @@ class AppearancePageFontsTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- AppearancePageFontsTab( TQWidget * tqparent=0, const char * name=0 );
+ AppearancePageFontsTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -461,7 +461,7 @@ class AppearancePageColorsTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- AppearancePageColorsTab( TQWidget * tqparent=0, const char * name=0 );
+ AppearancePageColorsTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -483,7 +483,7 @@ class AppearancePageLayoutTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- AppearancePageLayoutTab( TQWidget * tqparent=0, const char * name=0 );
+ AppearancePageLayoutTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -506,7 +506,7 @@ class AppearancePageHeadersTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- AppearancePageHeadersTab( TQWidget * tqparent=0, const char * name=0 );
+ AppearancePageHeadersTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
@@ -533,7 +533,7 @@ class AppearancePageReaderTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- AppearancePageReaderTab( TQWidget * tqparent=0, const char * name=0 );
+ AppearancePageReaderTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
@@ -565,7 +565,7 @@ class AppearancePageSystemTrayTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- AppearancePageSystemTrayTab( TQWidget * tqparent=0, const char * name=0 );
+ AppearancePageSystemTrayTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
@@ -584,7 +584,7 @@ class KDE_EXPORT AppearancePage : public ConfigModuleWithTabs {
Q_OBJECT
TQ_OBJECT
public:
- AppearancePage( TQWidget * tqparent=0, const char * name=0 );
+ AppearancePage( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
@@ -615,7 +615,7 @@ class ComposerPageGeneralTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- ComposerPageGeneralTab( TQWidget * tqparent=0, const char * name=0 );
+ ComposerPageGeneralTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -649,7 +649,7 @@ class ComposerPagePhrasesTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- ComposerPagePhrasesTab( TQWidget * tqparent=0, const char * name=0 );
+ ComposerPagePhrasesTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -681,7 +681,7 @@ class ComposerPageTemplatesTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- ComposerPageTemplatesTab( TQWidget * tqparent=0, const char * name=0 );
+ ComposerPageTemplatesTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -699,7 +699,7 @@ class ComposerPageCustomTemplatesTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- ComposerPageCustomTemplatesTab( TQWidget * tqparent=0, const char * name=0 );
+ ComposerPageCustomTemplatesTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -717,7 +717,7 @@ class ComposerPageSubjectTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- ComposerPageSubjectTab( TQWidget * tqparent=0, const char * name=0 );
+ ComposerPageSubjectTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -736,7 +736,7 @@ class ComposerPageCharsetTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- ComposerPageCharsetTab( TQWidget * tqparent=0, const char * name=0 );
+ ComposerPageCharsetTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -758,7 +758,7 @@ class ComposerPageHeadersTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- ComposerPageHeadersTab( TQWidget * tqparent=0, const char * name=0 );
+ ComposerPageHeadersTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -791,7 +791,7 @@ class ComposerPageAttachmentsTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- ComposerPageAttachmentsTab( TQWidget * tqparent=0, const char * name=0 );
+ ComposerPageAttachmentsTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -813,7 +813,7 @@ class KDE_EXPORT ComposerPage : public ConfigModuleWithTabs {
Q_OBJECT
TQ_OBJECT
public:
- ComposerPage( TQWidget * tqparent=0, const char * name=0 );
+ ComposerPage( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
@@ -848,7 +848,7 @@ class SecurityPageGeneralTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- SecurityPageGeneralTab( TQWidget * tqparent=0, const char * name=0 );
+ SecurityPageGeneralTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -874,7 +874,7 @@ class SecurityPageComposerCryptoTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- SecurityPageComposerCryptoTab( TQWidget * tqparent=0, const char * name=0 );
+ SecurityPageComposerCryptoTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
@@ -894,7 +894,7 @@ class SecurityPageWarningTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- SecurityPageWarningTab( TQWidget * tqparent=0, const char * name=0 );
+ SecurityPageWarningTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
@@ -918,7 +918,7 @@ class SecurityPageSMimeTab : public ConfigModuleTab, public DCOPObject {
TQ_OBJECT
K_DCOP
public:
- SecurityPageSMimeTab( TQWidget * tqparent=0, const char * name=0 );
+ SecurityPageSMimeTab( TQWidget * parent=0, const char * name=0 );
~SecurityPageSMimeTab();
TQString helpAnchor() const;
@@ -945,7 +945,7 @@ class SecurityPageCryptPlugTab : public ConfigModuleTab
Q_OBJECT
TQ_OBJECT
public:
- SecurityPageCryptPlugTab( TQWidget * tqparent = 0, const char* name = 0 );
+ SecurityPageCryptPlugTab( TQWidget * parent = 0, const char* name = 0 );
~SecurityPageCryptPlugTab();
TQString helpAnchor() const;
@@ -964,7 +964,7 @@ class KDE_EXPORT SecurityPage : public ConfigModuleWithTabs {
Q_OBJECT
TQ_OBJECT
public:
- SecurityPage( TQWidget * tqparent=0, const char * name=0 );
+ SecurityPage( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
@@ -996,7 +996,7 @@ class MiscPageFolderTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- MiscPageFolderTab( TQWidget * tqparent=0, const char * name=0 );
+ MiscPageFolderTab( TQWidget * parent=0, const char * name=0 );
void save();
TQString helpAnchor() const;
@@ -1027,7 +1027,7 @@ class MiscPageGroupwareTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- MiscPageGroupwareTab( TQWidget * tqparent=0, const char * name=0 );
+ MiscPageGroupwareTab( TQWidget * parent=0, const char * name=0 );
void save();
TQString helpAnchor() const;
@@ -1069,7 +1069,7 @@ class KDE_EXPORT MiscPage : public ConfigModuleWithTabs {
Q_OBJECT
TQ_OBJECT
public:
- MiscPage( TQWidget * tqparent=0, const char * name=0 );
+ MiscPage( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
typedef MiscPageFolderTab FolderTab;
@@ -1090,7 +1090,7 @@ class ListView : public KListView {
Q_OBJECT
TQ_OBJECT
public:
- ListView( TQWidget *tqparent=0, const char *name=0, int visibleItem=10 );
+ ListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 );
void resizeColums();
void setVisibleItem( int visibleItem, bool updateSize=true );
diff --git a/kmail/copyfolderjob.h b/kmail/copyfolderjob.h
index 743d8b618..61726cdc3 100644
--- a/kmail/copyfolderjob.h
+++ b/kmail/copyfolderjob.h
@@ -55,7 +55,7 @@ public:
/**
* Create a new job
* @param storage of the folder that should be copied
- * @param newParent the target tqparent folder
+ * @param newParent the target parent folder
*/
CopyFolderJob( FolderStorage* const storage, KMFolderDir* const newParent = 0 );
@@ -70,7 +70,7 @@ public:
protected slots:
- /** Create the target directory under the new tqparent. Returns success or failure.*/
+ /** Create the target directory under the new parent. Returns success or failure.*/
bool createTargetDir();
/** Copy all messages from the original folder to mNewFolder */
diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp
index 4f1684907..279c71ae6 100644
--- a/kmail/customtemplates.cpp
+++ b/kmail/customtemplates.cpp
@@ -52,8 +52,8 @@
#include "customtemplates.h"
-CustomTemplates::CustomTemplates( TQWidget *tqparent, const char *name )
- :CustomTemplatesBase( tqparent, name ),
+CustomTemplates::CustomTemplates( TQWidget *parent, const char *name )
+ :CustomTemplatesBase( parent, name ),
mCurrentItem( 0 ),
mBlockChangeSignal( false )
{
diff --git a/kmail/customtemplates.h b/kmail/customtemplates.h
index 21695824a..c850723f8 100644
--- a/kmail/customtemplates.h
+++ b/kmail/customtemplates.h
@@ -43,7 +43,7 @@ class CustomTemplates : public CustomTemplatesBase
public:
- CustomTemplates( TQWidget *tqparent = 0, const char *name = 0 );
+ CustomTemplates( TQWidget *parent = 0, const char *name = 0 );
~CustomTemplates();
void load();
diff --git a/kmail/dictionarycombobox.cpp b/kmail/dictionarycombobox.cpp
index 85c82b928..6eb1b4934 100644
--- a/kmail/dictionarycombobox.cpp
+++ b/kmail/dictionarycombobox.cpp
@@ -42,8 +42,8 @@
namespace KMail {
- DictionaryComboBox::DictionaryComboBox( TQWidget * tqparent, const char * name )
- : TQComboBox( false, tqparent, name ),
+ DictionaryComboBox::DictionaryComboBox( TQWidget * parent, const char * name )
+ : TQComboBox( false, parent, name ),
mSpellConfig( 0 ),
mDefaultDictionary( 0 )
{
diff --git a/kmail/dictionarycombobox.h b/kmail/dictionarycombobox.h
index 481605025..c847baa03 100644
--- a/kmail/dictionarycombobox.h
+++ b/kmail/dictionarycombobox.h
@@ -49,7 +49,7 @@ namespace KMail {
Q_OBJECT
TQ_OBJECT
public:
- DictionaryComboBox( TQWidget * tqparent=0, const char * name=0 );
+ DictionaryComboBox( TQWidget * parent=0, const char * name=0 );
~DictionaryComboBox();
TQString currentDictionaryName() const;
diff --git a/kmail/distributionlistdialog.cpp b/kmail/distributionlistdialog.cpp
index 6ee1492a2..cc947e8eb 100644
--- a/kmail/distributionlistdialog.cpp
+++ b/kmail/distributionlistdialog.cpp
@@ -93,9 +93,9 @@ class DistributionListItem : public TQCheckListItem
};
-DistributionListDialog::DistributionListDialog( TQWidget *tqparent )
+DistributionListDialog::DistributionListDialog( TQWidget *parent )
: KDialogBase( Plain, i18n("Save Distribution List"), User1 | Cancel,
- User1, tqparent, 0, false, false, i18n("Save List") )
+ User1, parent, 0, false, false, i18n("Save List") )
{
TQFrame *topFrame = plainPage();
diff --git a/kmail/distributionlistdialog.h b/kmail/distributionlistdialog.h
index 8d57b6dce..6643557c4 100644
--- a/kmail/distributionlistdialog.h
+++ b/kmail/distributionlistdialog.h
@@ -31,7 +31,7 @@ class KListView;
class DistributionListDialog : public KDialogBase
{
public:
- DistributionListDialog( TQWidget *tqparent );
+ DistributionListDialog( TQWidget *parent );
void setRecipients( const Recipient::List & );
diff --git a/kmail/editorwatcher.cpp b/kmail/editorwatcher.cpp
index ae12c1241..48facf1f4 100644
--- a/kmail/editorwatcher.cpp
+++ b/kmail/editorwatcher.cpp
@@ -49,8 +49,8 @@
using namespace KMail;
EditorWatcher::EditorWatcher(const KURL & url, const TQString &mimeType, bool openWith,
- TQObject * tqparent, TQWidget *parentWidget) :
- TQObject( tqparent ),
+ TQObject * parent, TQWidget *parentWidget) :
+ TQObject( parent ),
mUrl( url ),
mMimeType( mimeType ),
mOpenWith( openWith ),
@@ -127,11 +127,11 @@ void EditorWatcher::inotifyEvent()
struct inotify_event *event = (struct inotify_event *) &buffer[offset];
size -= sizeof( struct inotify_event ) + event->len;
offset += sizeof( struct inotify_event ) + event->len;
- if ( event->tqmask & IN_OPEN )
+ if ( event->mask & IN_OPEN )
mFileOpen = true;
- if ( event->tqmask & IN_CLOSE )
+ if ( event->mask & IN_CLOSE )
mFileOpen = false;
- if ( event->tqmask & IN_MODIFY )
+ if ( event->mask & IN_MODIFY )
mFileModified = true;
}
}
diff --git a/kmail/editorwatcher.h b/kmail/editorwatcher.h
index daa35d8a8..d98faa4ec 100644
--- a/kmail/editorwatcher.h
+++ b/kmail/editorwatcher.h
@@ -42,13 +42,13 @@ class EditorWatcher : public TQObject
public:
/**
* Constructs an EditorWatcher.
- * @param tqparent the tqparent object of this EditorWatcher, which will take care of deleting
- * this EditorWatcher if the tqparent is deleted.
- * @param parentWidget the tqparent widget of this EditorWatcher, which will be used as the tqparent
+ * @param parent the parent object of this EditorWatcher, which will take care of deleting
+ * this EditorWatcher if the parent is deleted.
+ * @param parentWidget the parent widget of this EditorWatcher, which will be used as the parent
* widget for message dialogs.
*/
EditorWatcher( const KURL &url, const TQString &mimeType, bool openWith,
- TQObject *tqparent, TQWidget *parentWidget );
+ TQObject *parent, TQWidget *parentWidget );
bool start();
bool fileChanged() const { return mFileModified; }
signals:
diff --git a/kmail/expirypropertiesdialog.cpp b/kmail/expirypropertiesdialog.cpp
index c43cefc18..e992eace5 100644
--- a/kmail/expirypropertiesdialog.cpp
+++ b/kmail/expirypropertiesdialog.cpp
@@ -23,7 +23,7 @@
using namespace KMail;
/*
- * Constructs a ExpiryPropertiesDialog as a child of 'tqparent', with the
+ * Constructs a ExpiryPropertiesDialog as a child of 'parent', with the
* name 'name'.
*
*/
diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp
index 9de9271ef..148c2278f 100644
--- a/kmail/favoritefolderview.cpp
+++ b/kmail/favoritefolderview.cpp
@@ -49,8 +49,8 @@
using namespace KMail;
-FavoriteFolderViewItem::FavoriteFolderViewItem(FavoriteFolderView * tqparent, const TQString & name, KMFolder * folder)
- : KMFolderTreeItem( tqparent, name, folder ),
+FavoriteFolderViewItem::FavoriteFolderViewItem(FavoriteFolderView * parent, const TQString & name, KMFolder * folder)
+ : KMFolderTreeItem( parent, name, folder ),
mOldName( folder->label() )
{
// same stuff as in KMFolderTreeItem again, this time even with virtual methods working
@@ -81,8 +81,8 @@ void FavoriteFolderViewItem::nameChanged()
TQValueList FavoriteFolderView::mInstances;
-FavoriteFolderView::FavoriteFolderView( KMMainWidget *mainWidget, TQWidget * tqparent) :
- FolderTreeBase( mainWidget, tqparent ),
+FavoriteFolderView::FavoriteFolderView( KMMainWidget *mainWidget, TQWidget * parent) :
+ FolderTreeBase( mainWidget, parent ),
mContextMenuItem( 0 ),
mReadingConfig( false )
{
@@ -399,8 +399,8 @@ TQString FavoriteFolderView::prettyName(KMFolderTreeItem * fti)
assert( fti->folder() );
TQString name = fti->folder()->label();
TQListViewItem *accountFti = fti;
- while ( accountFti->tqparent() )
- accountFti = accountFti->tqparent();
+ while ( accountFti->parent() )
+ accountFti = accountFti->parent();
if ( fti->type() == KFolderTreeItem::Inbox ) {
if ( fti->protocol() == KFolderTreeItem::Local || fti->protocol() == KFolderTreeItem::NONE ) {
name = i18n( "Local Inbox" );
diff --git a/kmail/favoritefolderview.h b/kmail/favoritefolderview.h
index e0e34d269..2119f13d8 100644
--- a/kmail/favoritefolderview.h
+++ b/kmail/favoritefolderview.h
@@ -30,7 +30,7 @@ class FavoriteFolderViewItem : public KMFolderTreeItem
Q_OBJECT
TQ_OBJECT
public:
- FavoriteFolderViewItem( FavoriteFolderView *tqparent, const TQString & name, KMFolder* folder );
+ FavoriteFolderViewItem( FavoriteFolderView *parent, const TQString & name, KMFolder* folder );
protected:
bool useTopLevelIcon() const { return false; }
@@ -49,7 +49,7 @@ class FavoriteFolderView : public FolderTreeBase
TQ_OBJECT
public:
- FavoriteFolderView( KMMainWidget *mainWidget, TQWidget *tqparent = 0 );
+ FavoriteFolderView( KMMainWidget *mainWidget, TQWidget *parent = 0 );
~FavoriteFolderView();
void readConfig();
diff --git a/kmail/filterimporterexporter.cpp b/kmail/filterimporterexporter.cpp
index 3299d1dfc..d63278ad7 100644
--- a/kmail/filterimporterexporter.cpp
+++ b/kmail/filterimporterexporter.cpp
@@ -46,8 +46,8 @@
using namespace KMail;
-FilterSelectionDialog::FilterSelectionDialog( TQWidget * tqparent )
- :KDialogBase( tqparent, "filterselection", true, i18n("Select Filters"), Ok|Cancel, Ok, true ),
+FilterSelectionDialog::FilterSelectionDialog( TQWidget * parent )
+ :KDialogBase( parent, "filterselection", true, i18n("Select Filters"), Ok|Cancel, Ok, true ),
wasCancelled( false )
{
TQWidget *w = new TQWidget( this );
@@ -199,8 +199,8 @@ void FilterImporterExporter::writeFiltersToConfig( const TQValueList&
}
-FilterImporterExporter::FilterImporterExporter( TQWidget* tqparent, bool popFilter )
-:mParent( tqparent), mPopFilter( popFilter )
+FilterImporterExporter::FilterImporterExporter( TQWidget* parent, bool popFilter )
+:mParent( parent), mPopFilter( popFilter )
{
}
diff --git a/kmail/filterimporterexporter.h b/kmail/filterimporterexporter.h
index 8c92e7692..0c11d34ba 100644
--- a/kmail/filterimporterexporter.h
+++ b/kmail/filterimporterexporter.h
@@ -47,7 +47,7 @@ namespace KMail
class FilterImporterExporter
{
public:
- FilterImporterExporter( TQWidget* tqparent, bool popFilter = false );
+ FilterImporterExporter( TQWidget* parent, bool popFilter = false );
virtual ~FilterImporterExporter();
/** Export the given filter rules to a file which
@@ -70,7 +70,7 @@ class FilterSelectionDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- FilterSelectionDialog( TQWidget * tqparent = 0 );
+ FilterSelectionDialog( TQWidget * parent = 0 );
virtual ~FilterSelectionDialog();
virtual void slotCancel();
diff --git a/kmail/filterlogdlg.cpp b/kmail/filterlogdlg.cpp
index c387b2e16..bd0d15d69 100644
--- a/kmail/filterlogdlg.cpp
+++ b/kmail/filterlogdlg.cpp
@@ -52,8 +52,8 @@
using namespace KMail;
-FilterLogDialog::FilterLogDialog( TQWidget * tqparent )
-: KDialogBase( tqparent, "FilterLogDlg", false, i18n( "Filter Log Viewer" ),
+FilterLogDialog::FilterLogDialog( TQWidget * parent )
+: KDialogBase( parent, "FilterLogDlg", false, i18n( "Filter Log Viewer" ),
User1|User2|Close, Close, true, KStdGuiItem::clear(), KStdGuiItem::saveAs() )
{
setWFlags( WDestructiveClose );
diff --git a/kmail/filterlogdlg.h b/kmail/filterlogdlg.h
index 927edb6e9..724c62140 100644
--- a/kmail/filterlogdlg.h
+++ b/kmail/filterlogdlg.h
@@ -52,7 +52,7 @@ namespace KMail {
public:
/** constructor */
- FilterLogDialog( TQWidget * tqparent );
+ FilterLogDialog( TQWidget * parent );
protected slots:
void slotLogEntryAdded( TQString logEntry );
diff --git a/kmail/folderIface.cpp b/kmail/folderIface.cpp
index bcd4201f7..d6dd6daae 100644
--- a/kmail/folderIface.cpp
+++ b/kmail/folderIface.cpp
@@ -136,7 +136,7 @@ FolderIface::messageRefs()
for( int i = 0; i < messageCache.size(); ++i ) {
KMMsgBase *msg = messageCache[i];
if ( msg ) {
- KMMessage *fmsg = msg->tqparent()->getMsg( msg->tqparent()->find( msg ) );
+ KMMessage *fmsg = msg->parent()->getMsg( msg->parent()->find( msg ) );
refList.append( DCOPRef( new MessageIface( fmsg ) ) );
}
}
diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp
index 3b64254c5..5ba25472e 100644
--- a/kmail/folderdiaacltab.cpp
+++ b/kmail/folderdiaacltab.cpp
@@ -83,8 +83,8 @@ static const struct {
};
-KMail::ACLEntryDialog::ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQString& caption, TQWidget* tqparent, const char* name )
- : KDialogBase( tqparent, name, true /*modal*/, caption,
+KMail::ACLEntryDialog::ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQString& caption, TQWidget* parent, const char* name )
+ : KDialogBase( parent, name, true /*modal*/, caption,
KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true /*sep*/ )
, mUserIdFormat( userIdFormat )
{
@@ -115,7 +115,7 @@ KMail::ACLEntryDialog::ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQSt
}
topLayout->setRowStretch(2, 10);
- TQLabel *noteLabel = new TQLabel( i18n( "Note: Renaming requires write permissions on the tqparent folder." ), page );
+ TQLabel *noteLabel = new TQLabel( i18n( "Note: Renaming requires write permissions on the parent folder." ), page );
topLayout->addMultiCellWidget( noteLabel, 2, 2, 0, 2 );
connect( mUserIdLineEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) );
@@ -192,7 +192,7 @@ unsigned int KMail::ACLEntryDialog::permissions() const
// class KMail::FolderDiaACLTab::ListView : public KListView
// {
// public:
-// ListView( TQWidget* tqparent, const char* name = 0 ) : KListView( tqparent, name ) {}
+// ListView( TQWidget* parent, const char* name = 0 ) : KListView( parent, name ) {}
// };
class KMail::FolderDiaACLTab::ListViewItem : public KListViewItem
@@ -313,8 +313,8 @@ void KMail::FolderDiaACLTab::ListViewItem::save( ACLList& aclList,
////
-KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* tqparent, const char* name )
- : FolderDiaTab( tqparent, name ),
+KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent, const char* name )
+ : FolderDiaTab( parent, name ),
mImapAccount( 0 ),
mUserRights( 0 ),
mUserRightsState( KMail::ACLJobs::NotFetchedYet ),
@@ -505,7 +505,7 @@ void KMail::FolderDiaACLTab::slotReceivedUserRights( KMFolder* folder )
void KMail::FolderDiaACLTab::startListing()
{
- // List ACLs of folder - or its tqparent, if creating a new folder
+ // List ACLs of folder - or its parent, if creating a new folder
mImapAccount->getACL( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(), mImapPath );
connect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )),
this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) );
@@ -754,7 +754,7 @@ void KMail::FolderDiaACLTab::slotDirectoryListingFinished(KMFolderImap* f)
KIO::Job* job = ACLJobs::multiSetACL( mImapAccount->slave(), imapURL(), mACLList );
ImapAccountBase::jobData jd;
- jd.total = 1; jd.done = 0; jd.tqparent = 0;
+ jd.total = 1; jd.done = 0; jd.parent = 0;
mImapAccount->insertJob(job, jd);
connect(job, TQT_SIGNAL(result(KIO::Job *)),
diff --git a/kmail/folderdiaacltab.h b/kmail/folderdiaacltab.h
index 855655174..901e12d1e 100644
--- a/kmail/folderdiaacltab.h
+++ b/kmail/folderdiaacltab.h
@@ -62,7 +62,7 @@ class ACLEntryDialog :public KDialogBase {
TQ_OBJECT
public:
- ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQString& caption, TQWidget* tqparent, const char* name = 0 );
+ ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQString& caption, TQWidget* parent, const char* name = 0 );
void setValues( const TQString& userId, unsigned int permissions );
@@ -90,7 +90,7 @@ class FolderDiaACLTab : public FolderDiaTab
TQ_OBJECT
public:
- FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* tqparent, const char* name = 0 );
+ FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent, const char* name = 0 );
virtual void load();
virtual bool save();
diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp
index 7c893851a..195a00b1f 100644
--- a/kmail/folderdiaquotatab.cpp
+++ b/kmail/folderdiaquotatab.cpp
@@ -50,8 +50,8 @@
using namespace KMail;
-KMail::FolderDiaQuotaTab::FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* tqparent, const char* name )
- : FolderDiaTab( tqparent, name ),
+KMail::FolderDiaQuotaTab::FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* parent, const char* name )
+ : FolderDiaTab( parent, name ),
mImapAccount( 0 ),
mDlg( dlg )
{
diff --git a/kmail/folderdiaquotatab.h b/kmail/folderdiaquotatab.h
index 570c7e82e..9d2d968db 100644
--- a/kmail/folderdiaquotatab.h
+++ b/kmail/folderdiaquotatab.h
@@ -56,7 +56,7 @@ class FolderDiaQuotaTab : public FolderDiaTab
TQ_OBJECT
public:
- FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* tqparent, const char* name = 0 );
+ FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* parent, const char* name = 0 );
virtual void load();
virtual bool save();
diff --git a/kmail/folderdiaquotatab_p.cpp b/kmail/folderdiaquotatab_p.cpp
index d8f8f44c4..859b31a67 100644
--- a/kmail/folderdiaquotatab_p.cpp
+++ b/kmail/folderdiaquotatab_p.cpp
@@ -51,8 +51,8 @@ using namespace KMail;
struct QuotaInfo;
-QuotaWidget::QuotaWidget( TQWidget* tqparent, const char* name )
- :TQWidget( tqparent, name )
+QuotaWidget::QuotaWidget( TQWidget* parent, const char* name )
+ :TQWidget( parent, name )
{
TQVBoxLayout *box = new TQVBoxLayout(this);
TQWidget *stuff = new TQWidget( this );
diff --git a/kmail/folderdiaquotatab_p.h b/kmail/folderdiaquotatab_p.h
index 776ae1d76..669e21901 100644
--- a/kmail/folderdiaquotatab_p.h
+++ b/kmail/folderdiaquotatab_p.h
@@ -47,7 +47,7 @@ class QuotaWidget : public TQWidget {
Q_OBJECT
TQ_OBJECT
public:
- QuotaWidget( TQWidget* tqparent, const char* name = 0 );
+ QuotaWidget( TQWidget* parent, const char* name = 0 );
virtual ~QuotaWidget() { }
void setQuotaInfo( const KMail::QuotaInfo& info );
diff --git a/kmail/folderjob.h b/kmail/folderjob.h
index 52778bb68..c3e54e684 100644
--- a/kmail/folderjob.h
+++ b/kmail/folderjob.h
@@ -53,21 +53,21 @@ public:
tCopyMessage, tMoveMessage, tOther /* used by subclasses */ };
/**
* Constructs a new job, operating on the message msg, of type
- * @p jt and with a tqparent folder @p folder.
+ * @p jt and with a parent folder @p folder.
*/
FolderJob( KMMessage *msg, JobType jt = tGetMessage, KMFolder *folder = 0,
TQString partSpecifier = TQString() );
/**
* Constructs a new job, operating on a message list @p msgList,
- * set @sets, JobType @p jt and with the tqparent folder @p folder.
+ * set @sets, JobType @p jt and with the parent folder @p folder.
*
*/
FolderJob( const TQPtrList& msgList, const TQString& sets,
JobType jt = tGetMessage, KMFolder *folder = 0 );
/**
* This one should ONLY be used in derived folders, when a job
- * does something internal and needs to construct an empty tqparent
+ * does something internal and needs to construct an empty parent
* FolderJob
*/
FolderJob( JobType jt );
diff --git a/kmail/folderrequester.cpp b/kmail/folderrequester.cpp
index 93472437b..23636e365 100644
--- a/kmail/folderrequester.cpp
+++ b/kmail/folderrequester.cpp
@@ -41,8 +41,8 @@
namespace KMail {
-FolderRequester::FolderRequester( TQWidget *tqparent, KMFolderTree *tree )
- : TQWidget( tqparent ), mFolder( 0 ), mFolderTree( tree ),
+FolderRequester::FolderRequester( TQWidget *parent, KMFolderTree *tree )
+ : TQWidget( parent ), mFolder( 0 ), mFolderTree( tree ),
mMustBeReadWrite( true ), mShowOutbox( true ), mShowImapFolders( true )
{
TQHBoxLayout * hlay = new TQHBoxLayout( this, 0, KDialog::spacingHint() );
diff --git a/kmail/folderrequester.h b/kmail/folderrequester.h
index a13ab6d28..4c32aaf8d 100644
--- a/kmail/folderrequester.h
+++ b/kmail/folderrequester.h
@@ -51,10 +51,10 @@ namespace KMail {
public:
/**
* Constructor
- * @param tqparent the tqparent widget
+ * @param parent the parent widget
* @param tree the KMFolderTree to get the folders
*/
- FolderRequester( TQWidget *tqparent, KMFolderTree* tree );
+ FolderRequester( TQWidget *parent, KMFolderTree* tree );
virtual ~FolderRequester();
/** Returns selected folder */
diff --git a/kmail/foldersetselector.cpp b/kmail/foldersetselector.cpp
index 8ae2618ec..c35fd0c1e 100644
--- a/kmail/foldersetselector.cpp
+++ b/kmail/foldersetselector.cpp
@@ -27,8 +27,8 @@
using namespace KMail;
-FolderSetSelector::FolderSetSelector( KMFolderTree *ft, TQWidget * tqparent )
- : KDialogBase( tqparent, "FolderSetSelector", true, TQString(), Ok|Cancel, Ok, true )
+FolderSetSelector::FolderSetSelector( KMFolderTree *ft, TQWidget * parent )
+ : KDialogBase( parent, "FolderSetSelector", true, TQString(), Ok|Cancel, Ok, true )
{
assert( ft );
diff --git a/kmail/foldersetselector.h b/kmail/foldersetselector.h
index 97cc38602..9c352fc2b 100644
--- a/kmail/foldersetselector.h
+++ b/kmail/foldersetselector.h
@@ -32,7 +32,7 @@ class FolderSetSelector : public KDialogBase
TQ_OBJECT
public:
- FolderSetSelector( KMFolderTree *ft, TQWidget *tqparent = 0 );
+ FolderSetSelector( KMFolderTree *ft, TQWidget *parent = 0 );
TQValueList selectedFolders();
void setSelectedFolders( const TQValueList &folderIds );
diff --git a/kmail/foldershortcutdialog.cpp b/kmail/foldershortcutdialog.cpp
index f9bbed20d..9095a647b 100644
--- a/kmail/foldershortcutdialog.cpp
+++ b/kmail/foldershortcutdialog.cpp
@@ -53,9 +53,9 @@ using namespace KMail;
FolderShortcutDialog::FolderShortcutDialog( KMFolder *folder,
KMMainWidget *mainwidget,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name )
-: KDialogBase( tqparent, name, true,
+: KDialogBase( parent, name, true,
i18n( "Shortcut for Folder %1" ).tqarg( folder->label() ),
KDialogBase::Ok | KDialogBase::Cancel ),
mFolder( folder ), mMainWidget( mainwidget )
diff --git a/kmail/foldershortcutdialog.h b/kmail/foldershortcutdialog.h
index da249e1a3..c3b760737 100644
--- a/kmail/foldershortcutdialog.h
+++ b/kmail/foldershortcutdialog.h
@@ -54,7 +54,7 @@ Q_OBJECT
TQ_OBJECT
public:
FolderShortcutDialog( KMFolder *folder, KMMainWidget *mw,
- TQWidget *tqparent=0, const char *name=0 );
+ TQWidget *parent=0, const char *name=0 );
~FolderShortcutDialog();
diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp
index 25fc6c0f0..63dc91fb5 100644
--- a/kmail/folderstorage.cpp
+++ b/kmail/folderstorage.cpp
@@ -301,9 +301,9 @@ void FolderStorage::emitMsgAddedSignals(int idx)
bool FolderStorage::canAddMsgNow(KMMessage* aMsg, int* aIndex_ret)
{
if (aIndex_ret) *aIndex_ret = -1;
- KMFolder *msgParent = aMsg->tqparent();
- // If the message has a tqparent and is in transfer, bail out. If it does not
- // have a tqparent we want to be able to add it even if it is in transfer.
+ KMFolder *msgParent = aMsg->parent();
+ // If the message has a parent and is in transfer, bail out. If it does not
+ // have a parent we want to be able to add it even if it is in transfer.
if (aMsg->transferInProgress() && msgParent)
return false;
if (!aMsg->isComplete() && msgParent && msgParent->folderType() == KMFolderTypeImap)
@@ -326,7 +326,7 @@ void FolderStorage::reallyAddMsg(KMMessage* aMsg)
return;
aMsg->setTransferInProgress( false );
aMsg->setComplete( true );
- KMFolder *aFolder = aMsg->tqparent();
+ KMFolder *aFolder = aMsg->parent();
int index;
ulong serNum = aMsg->getMsgSerNum();
bool undo = aMsg->enableUndo();
@@ -463,9 +463,9 @@ void FolderStorage::take(TQPtrList msgList)
{
for ( KMMessage* msg = msgList.first(); msg; msg = msgList.next() )
{
- if (msg->tqparent())
+ if (msg->parent())
{
- int idx = msg->tqparent()->find(msg);
+ int idx = msg->parent()->find(msg);
if ( idx >= 0 )
take(idx);
}
@@ -621,7 +621,7 @@ FolderJob* FolderStorage::createJob( TQPtrList& msgList, const TQStri
int FolderStorage::moveMsg(KMMessage* aMsg, int* aIndex_ret)
{
assert(aMsg != 0);
- KMFolder* msgParent = aMsg->tqparent();
+ KMFolder* msgParent = aMsg->parent();
if (msgParent)
msgParent->open("moveMsgSrc");
@@ -641,7 +641,7 @@ int FolderStorage::moveMsg(TQPtrList msglist, int* aIndex_ret)
{
KMMessage* aMsg = msglist.first();
assert(aMsg != 0);
- KMFolder* msgParent = aMsg->tqparent();
+ KMFolder* msgParent = aMsg->parent();
if (msgParent)
msgParent->open("foldermovemsg");
@@ -681,7 +681,7 @@ int FolderStorage::rename(const TQString& newName, KMFolderDir *newParent)
close("rename", true);
oldName = folder()->fileName();
- oldParent = folder()->tqparent();
+ oldParent = folder()->parent();
if (newParent)
folder()->setParent( newParent );
@@ -723,14 +723,14 @@ int FolderStorage::rename(const TQString& newName, KMFolderDir *newParent)
}
// if the folder is being moved then move its node and, if necessary, also
- // the associated subfolder directory node to the new tqparent
+ // the associated subfolder directory node to the new parent
if (newParent) {
if (oldParent->findRef( folder() ) != -1)
oldParent->take();
newParent->inSort( folder() );
if ( child ) {
- if ( child->tqparent()->findRef( child ) != -1 )
- child->tqparent()->take();
+ if ( child->parent()->findRef( child ) != -1 )
+ child->parent()->take();
newParent->inSort( child );
child->setParent( newParent );
}
@@ -898,7 +898,7 @@ void FolderStorage::msgStatusChanged(const KMMsgtqStatus oldtqStatus,
void FolderStorage::headerOfMsgChanged(const KMMsgBase* aMsg, int idx)
{
if (idx < 0)
- idx = aMsg->tqparent()->find( aMsg );
+ idx = aMsg->parent()->find( aMsg );
if (idx >= 0 )
{
diff --git a/kmail/folderstorage.h b/kmail/folderstorage.h
index 45a402820..550b45e55 100644
--- a/kmail/folderstorage.h
+++ b/kmail/folderstorage.h
@@ -84,8 +84,8 @@ class FolderStorage : public TQObject
public:
- /** Usually a tqparent is given. But in some cases there is no
- fitting tqparent object available. Then the name of the folder
+ /** Usually a parent is given. But in some cases there is no
+ fitting parent object available. Then the name of the folder
is used as the absolute path to the folder file. */
FolderStorage( KMFolder* folder, const char* name=0 );
virtual ~FolderStorage();
diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp
index 87084b7bb..0363f1fc2 100644
--- a/kmail/foldertreebase.cpp
+++ b/kmail/foldertreebase.cpp
@@ -39,8 +39,8 @@ using KPIM::MailListDrag;
using namespace KMail;
-FolderTreeBase::FolderTreeBase(KMMainWidget *mainWidget, TQWidget * tqparent, const char * name) :
- KFolderTree( tqparent, name ),
+FolderTreeBase::FolderTreeBase(KMMainWidget *mainWidget, TQWidget * parent, const char * name) :
+ KFolderTree( parent, name ),
mMainWidget( mainWidget )
{
addAcceptableDropMimetype(MailListDrag::format(), false);
@@ -212,7 +212,7 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/
fti->setFolderIsCloseToQuota( folder->storage()->isCloseToQuota() );
}
- if (fti->tqparent() && !fti->tqparent()->isOpen())
+ if (fti->parent() && !fti->parent()->isOpen())
tqrepaint = false; // we're not visible
if (tqrepaint) {
fti->setNeedsRepaint( true );
diff --git a/kmail/foldertreebase.h b/kmail/foldertreebase.h
index b2c48c705..3a1b21aad 100644
--- a/kmail/foldertreebase.h
+++ b/kmail/foldertreebase.h
@@ -31,7 +31,7 @@ class FolderTreeBase : public KFolderTree
Q_OBJECT
TQ_OBJECT
public:
- FolderTreeBase( KMMainWidget *mainWidget, TQWidget *tqparent = 0, const char *name = 0 );
+ FolderTreeBase( KMMainWidget *mainWidget, TQWidget *parent = 0, const char *name = 0 );
/** Returns the main widget that this widget is a child of. */
KMMainWidget* mainWidget() const { return mMainWidget; }
diff --git a/kmail/folderutil.cpp b/kmail/folderutil.cpp
index 6e1a2f88c..40b543be7 100644
--- a/kmail/folderutil.cpp
+++ b/kmail/folderutil.cpp
@@ -41,16 +41,16 @@ KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *parentFolder, KMFolderDi
if (anAccount->makeConnection() == ImapAccountBase::Connected) {
newFolder = kmkernel->imapFolderMgr()->createFolder( folderName, false, KMFolderTypeImap, parentDir );
if ( newFolder ) {
- TQString imapPath, tqparent;
+ TQString imapPath, parent;
if ( !namespaceName.isEmpty() ) {
// create folder with namespace
- tqparent = anAccount->addPathToNamespace( namespaceName );
- imapPath = anAccount->createImapPath( tqparent, folderName );
+ parent = anAccount->addPathToNamespace( namespaceName );
+ imapPath = anAccount->createImapPath( parent, folderName );
} else {
imapPath = anAccount->createImapPath( selectedStorage->imapPath(), folderName );
}
KMFolderImap* newStorage = static_cast( newFolder->storage() );
- selectedStorage->createFolder(folderName, tqparent); // create it on the server
+ selectedStorage->createFolder(folderName, parent); // create it on the server
newStorage->initializeFrom( selectedStorage, imapPath, TQString() );
static_cast(parentFolder->storage())->setAccount( selectedStorage->account() );
return newFolder;
@@ -82,14 +82,14 @@ KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *parentFolder, KMFolderDi
return newFolder;
}
-void KMail::FolderUtil::deleteFolder( KMFolder *folderToDelete, TQWidget *tqparent )
+void KMail::FolderUtil::deleteFolder( KMFolder *folderToDelete, TQWidget *parent )
{
if ( folderToDelete->hasAccounts() ) {
// this folder has an account, so we need to change that to the inbox
for ( AccountList::Iterator it (folderToDelete->acctList()->begin() ),
end( folderToDelete->acctList()->end() ); it != end; ++it ) {
(*it)->setFolder( kmkernel->inboxFolder() );
- KMessageBox::information(tqparent,
+ KMessageBox::information(parent,
i18n("The folder you deleted was associated with the account "
"%1 which delivered mail into it. The folder the account "
"delivers new mail into was reset to the main Inbox folder.").tqarg( (*it)->name()));
diff --git a/kmail/folderutil.h b/kmail/folderutil.h
index 255929870..fbb4d0697 100644
--- a/kmail/folderutil.h
+++ b/kmail/folderutil.h
@@ -35,9 +35,9 @@ namespace FolderUtil
/**
* Low-level function to create a subfolder for a folder of any kind.
*
- * @param parentFolder tqparent folder of the folder that should be created. Can be 0 in case of
+ * @param parentFolder parent folder of the folder that should be created. Can be 0 in case of
* local folders
- * @param parentDir tqparent folder directory, which should be the folder directory of parentFolder
+ * @param parentDir parent folder directory, which should be the folder directory of parentFolder
* @param folderName the name the newly created folder should have
* @param namespaceName for (d)IMAP folders, the namespace the new folder should be in. Can be empty.
* @param localFolderType for local folders, this determines if the folder should be MBOX or maildir
@@ -53,10 +53,10 @@ KMFolder *createSubFolder( KMFolder *parentFolder, KMFolderDir *parentDir,
* Handles all types of folders correctly, as well as folders with accounts
*
* @param folderToDelete the folder which is going to be deleted
- * @param tqparent the tqparent widget, which is used when displaying a messagebox,
+ * @param parent the parent widget, which is used when displaying a messagebox,
* which happens when removing a folder with an associated account
*/
-void deleteFolder( KMFolder *folderToDelete, TQWidget *tqparent );
+void deleteFolder( KMFolder *folderToDelete, TQWidget *parent );
}
diff --git a/kmail/folderviewtooltip.h b/kmail/folderviewtooltip.h
index 5846cd82d..8e4f56ddd 100644
--- a/kmail/folderviewtooltip.h
+++ b/kmail/folderviewtooltip.h
@@ -10,9 +10,9 @@ namespace KMail {
class FolderViewToolTip : public TQToolTip
{
public:
- FolderViewToolTip( TQListView* tqparent ) :
- TQToolTip( tqparent->viewport() ),
- mListView( tqparent ) {}
+ FolderViewToolTip( TQListView* parent ) :
+ TQToolTip( parent->viewport() ),
+ mListView( parent ) {}
protected:
void maybeTip( const TQPoint &point )
diff --git a/kmail/headeritem.cpp b/kmail/headeritem.cpp
index 7742e3ba6..81a4252cb 100644
--- a/kmail/headeritem.cpp
+++ b/kmail/headeritem.cpp
@@ -42,8 +42,8 @@
using namespace KMail;
// Constuction a new list view item with the given colors and pixmap
-HeaderItem::HeaderItem( TQListView* tqparent, int msgId, const TQString& key )
- : KListViewItem( tqparent ),
+HeaderItem::HeaderItem( TQListView* parent, int msgId, const TQString& key )
+ : KListViewItem( parent ),
mMsgId( msgId ),
mKey( key ),
mAboutToBeDeleted( false ),
@@ -52,9 +52,9 @@ HeaderItem::HeaderItem( TQListView* tqparent, int msgId, const TQString& key )
irefresh();
}
-// Constuction a new list view item with the given tqparent, colors, & pixmap
-HeaderItem::HeaderItem( TQListViewItem* tqparent, int msgId, const TQString& key )
- : KListViewItem( tqparent ),
+// Constuction a new list view item with the given parent, colors, & pixmap
+HeaderItem::HeaderItem( TQListViewItem* parent, int msgId, const TQString& key )
+ : KListViewItem( parent ),
mMsgId( msgId ),
mKey( key ),
mAboutToBeDeleted( false ),
@@ -92,7 +92,7 @@ void HeaderItem::irefresh()
return; //default to closed
// otherwise threadingPolicy == OpenUnread
- if (tqparent() && tqparent()->isOpen()) {
+ if (parent() && parent()->isOpen()) {
setOpen(true);
return;
}
@@ -103,8 +103,8 @@ void HeaderItem::irefresh()
|| mMsgBase->isImportant() || mMsgBase->isTodo() || mMsgBase->isWatched() ) {
setOpen(true);
HeaderItem * topOfThread = this;
- while(topOfThread->tqparent())
- topOfThread = (HeaderItem*)topOfThread->tqparent();
+ while(topOfThread->parent())
+ topOfThread = (HeaderItem*)topOfThread->parent();
topOfThread->setOpenRecursive(true);
}
}
@@ -198,7 +198,7 @@ TQString HeaderItem::text( int col) const
tmp = headers->mDate.dateString( mMsgBase->date() );
} else if(col == headers->paintInfo()->sizeCol
&& headers->paintInfo()->showSize) {
- if ( mMsgBase->tqparent()->folderType() == KMFolderTypeImap ) {
+ if ( mMsgBase->parent()->folderType() == KMFolderTypeImap ) {
tmp = KIO::convertSize( mMsgBase->msgSizeServer() );
} else {
tmp = KIO::convertSize( mMsgBase->msgSize() );
@@ -232,17 +232,17 @@ TQPixmap HeaderItem::pixmapMerge( PixmapList pixmaps ) const
}
TQPixmap res( width, height );
- TQBitmap tqmask( width, height, true );
+ TQBitmap mask( width, height, true );
int x = 0;
for ( PixmapList::ConstIterator it = pixmaps.begin();
it != pixmaps.end(); ++it ) {
bitBlt( &res, x, (height - (*it).height()) / 2, &(*it) );
- bitBlt( &tqmask, x, (height - (*it).height()) / 2, (*it).tqmask() );
+ bitBlt( &mask, x, (height - (*it).height()) / 2, (*it).mask() );
x += (*it).width();
}
- res.setMask( tqmask );
+ res.setMask( mask );
return res;
}
@@ -490,7 +490,7 @@ TQString HeaderItem::generate_key( KMHeaders *headers,
}
else if (column == paintInfo->sizeCol) {
TQString len;
- if ( msg->tqparent()->folderType() == KMFolderTypeImap )
+ if ( msg->parent()->folderType() == KMFolderTypeImap )
{
len = TQString::number( msg->msgSizeServer() );
} else {
@@ -603,7 +603,7 @@ int HeaderItem::compare( TQListViewItem *i, int col, bool ascending ) const
res = key( col, ascending ).compare( i->key( col, ascending ) );
} else if ( col == headers->paintInfo()->dateCol ) {
res = key( col, ascending ).compare( i->key( col, ascending ) );
- if (i->tqparent() && !ascending)
+ if (i->parent() && !ascending)
res = -res;
} else if ( col == headers->paintInfo()->subCol ||
col == headers->paintInfo()->senderCol ||
diff --git a/kmail/headeritem.h b/kmail/headeritem.h
index c4a9a9309..2142cf71b 100644
--- a/kmail/headeritem.h
+++ b/kmail/headeritem.h
@@ -63,14 +63,14 @@ public:
mImperfectlyThreaded (true), mSubjThreadingList(0) { }
~SortCacheItem() { if(mUnsortedChildren) free(mUnsortedChildren); }
- /** The tqparent node of the item in the threading hierarchy. 0 if the item
+ /** The parent node of the item in the threading hierarchy. 0 if the item
* is at top level, which is the default. Can only be set by parents. */
- SortCacheItem *tqparent() const { return mParent; }
+ SortCacheItem *parent() const { return mParent; }
/**
* Returs whether the item is so far imperfectly threaded.
* If an item is imperfectly threaded (by References or subject, not by
* In-Reply-To) it will be reevalutated when a new mail comes in. It could be
- * the perfect tqparent. */
+ * the perfect parent. */
bool isImperfectlyThreaded() const
{ return mImperfectlyThreaded; }
/** Set whether the item is currently imperfectly threaded (by References
@@ -130,7 +130,7 @@ public:
void setOffset(int x) { mSortOffset = x; }
void updateSortFile( FILE *sortStream, KMFolder *folder,
- bool waiting_for_tqparent = false,
+ bool waiting_for_parent = false,
bool update_discovered_count = false);
/** Set the list of mails with a certain subject that this item is on.
@@ -163,8 +163,8 @@ private:
class HeaderItem : public KListViewItem
{
public:
- HeaderItem( TQListView* tqparent, int msgId, const TQString& key = TQString() );
- HeaderItem( TQListViewItem* tqparent, int msgId, const TQString& key = TQString() );
+ HeaderItem( TQListView* parent, int msgId, const TQString& key = TQString() );
+ HeaderItem( TQListViewItem* parent, int msgId, const TQString& key = TQString() );
~HeaderItem ();
/** Set the message id of this item, which is the offset/index in the folder
diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp
index 605e86f81..c576cc461 100644
--- a/kmail/headerlistquicksearch.cpp
+++ b/kmail/headerlistquicksearch.cpp
@@ -47,11 +47,11 @@
namespace KMail {
-HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *tqparent,
+HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent,
KListView *listView,
KActionCollection *actionCollection,
const char *name )
- : KListViewSearchLine(tqparent, listView, name), mStatusCombo(0), mtqStatus(0), statusList()
+ : KListViewSearchLine(parent, listView, name), mStatusCombo(0), mtqStatus(0), statusList()
{
KAction *resetQuickSearch = new KAction( i18n( "Reset Quick Search" ),
TQApplication::reverseLayout()
@@ -61,14 +61,14 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *tqparent,
TQT_SLOT( reset() ),
actionCollection,
"reset_quicksearch" );
- resetQuickSearch->plug( tqparent );
+ resetQuickSearch->plug( parent );
resetQuickSearch->setWhatsThis( i18n( "Reset Quick Search\n"
"Resets the quick search so that "
"all messages are shown again." ) );
- TQLabel *label = new TQLabel( i18n("Stat&us:"), tqparent, "kde toolbar widget" );
+ TQLabel *label = new TQLabel( i18n("Stat&us:"), parent, "kde toolbar widget" );
- mStatusCombo = new TQComboBox( tqparent, "quick search status combo box" );
+ mStatusCombo = new TQComboBox( parent, "quick search status combo box" );
mStatusCombo->setSizeLimit( 12 );
mStatusCombo->insertItem( SmallIcon( "run" ), i18n("Any tqStatus") );
@@ -89,7 +89,7 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *tqparent,
label->setBuddy( mStatusCombo );
- KToolBarButton * btn = new KToolBarButton( "mail_find", 0, tqparent,
+ KToolBarButton * btn = new KToolBarButton( "mail_find", 0, parent,
0, i18n( "Open Full Search" ) );
connect( btn, TQT_SIGNAL( clicked() ), TQT_SIGNAL( requestFullSearch() ) );
diff --git a/kmail/headerlistquicksearch.h b/kmail/headerlistquicksearch.h
index df326a0ae..e0589c7d6 100644
--- a/kmail/headerlistquicksearch.h
+++ b/kmail/headerlistquicksearch.h
@@ -47,7 +47,7 @@ class HeaderListQuickSearch : public KListViewSearchLine
Q_OBJECT
TQ_OBJECT
public:
- HeaderListQuickSearch( TQWidget *tqparent,
+ HeaderListQuickSearch( TQWidget *parent,
KListView *listView,
KActionCollection *actionCollection,
const char *name = 0 );
diff --git a/kmail/htmlstatusbar.cpp b/kmail/htmlstatusbar.cpp
index 371a48d11..79af65979 100644
--- a/kmail/htmlstatusbar.cpp
+++ b/kmail/htmlstatusbar.cpp
@@ -48,8 +48,8 @@
#include
#include
-KMail::HtmlStatusBar::HtmlStatusBar( TQWidget * tqparent, const char * name, WFlags f )
- : TQLabel( tqparent, name, f ),
+KMail::HtmlStatusBar::HtmlStatusBar( TQWidget * parent, const char * name, WFlags f )
+ : TQLabel( parent, name, f ),
mMode( Normal )
{
tqsetAlignment( AlignHCenter|AlignTop );
diff --git a/kmail/htmlstatusbar.h b/kmail/htmlstatusbar.h
index c23193fa9..20954b82a 100644
--- a/kmail/htmlstatusbar.h
+++ b/kmail/htmlstatusbar.h
@@ -62,7 +62,7 @@ namespace KMail {
Q_OBJECT
TQ_OBJECT
public:
- HtmlStatusBar( TQWidget * tqparent=0, const char * name=0, WFlags f=0 );
+ HtmlStatusBar( TQWidget * parent=0, const char * name=0, WFlags f=0 );
virtual ~HtmlStatusBar();
enum Mode {
diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp
index ca8fa8dca..ec0559fc0 100644
--- a/kmail/identitydialog.cpp
+++ b/kmail/identitydialog.cpp
@@ -89,9 +89,9 @@ using namespace KPIM;
namespace KMail {
- IdentityDialog::IdentityDialog( TQWidget * tqparent, const char * name )
+ IdentityDialog::IdentityDialog( TQWidget * parent, const char * name )
: KDialogBase( Plain, i18n("Edit Identity"), Ok|Cancel|Help, Ok,
- tqparent, name )
+ parent, name )
{
// tmp. vars:
TQWidget * tab;
diff --git a/kmail/identitydialog.h b/kmail/identitydialog.h
index 82bca1c43..61716983f 100644
--- a/kmail/identitydialog.h
+++ b/kmail/identitydialog.h
@@ -63,7 +63,7 @@ namespace KMail {
Q_OBJECT
TQ_OBJECT
public:
- IdentityDialog( TQWidget * tqparent=0, const char * name = 0 );
+ IdentityDialog( TQWidget * parent=0, const char * name = 0 );
virtual ~IdentityDialog();
void setIdentity( /*_not_ const*/ KPIM::Identity & ident );
diff --git a/kmail/identitylistview.cpp b/kmail/identitylistview.cpp
index 695c8da7b..5ce6f38c8 100644
--- a/kmail/identitylistview.cpp
+++ b/kmail/identitylistview.cpp
@@ -52,13 +52,13 @@ namespace KMail {
//
//
- IdentityListViewItem::IdentityListViewItem( IdentityListView * tqparent, const KPIM::Identity & ident )
- : KListViewItem( tqparent ), mUOID( ident.uoid() ) {
+ IdentityListViewItem::IdentityListViewItem( IdentityListView * parent, const KPIM::Identity & ident )
+ : KListViewItem( parent ), mUOID( ident.uoid() ) {
init( ident );
}
- IdentityListViewItem::IdentityListViewItem( IdentityListView * tqparent, TQListViewItem * after, const KPIM::Identity & ident )
- : KListViewItem( tqparent, after ), mUOID( ident.uoid() ) {
+ IdentityListViewItem::IdentityListViewItem( IdentityListView * parent, TQListViewItem * after, const KPIM::Identity & ident )
+ : KListViewItem( parent, after ), mUOID( ident.uoid() ) {
init( ident );
}
@@ -95,8 +95,8 @@ namespace KMail {
//
//
- IdentityListView::IdentityListView( TQWidget * tqparent, const char * name )
- : KListView( tqparent, name )
+ IdentityListView::IdentityListView( TQWidget * parent, const char * name )
+ : KListView( parent, name )
{
setFullWidth( true );
setDragEnabled( true );
diff --git a/kmail/identitylistview.h b/kmail/identitylistview.h
index b2c48418e..31b80a77d 100644
--- a/kmail/identitylistview.h
+++ b/kmail/identitylistview.h
@@ -47,9 +47,9 @@ namespace KMail {
**/
class IdentityListViewItem : public KListViewItem {
public:
- IdentityListViewItem( IdentityListView * tqparent,
+ IdentityListViewItem( IdentityListView * parent,
const KPIM::Identity & ident );
- IdentityListViewItem( IdentityListView * tqparent, TQListViewItem * after,
+ IdentityListViewItem( IdentityListView * parent, TQListViewItem * after,
const KPIM::Identity & ident );
uint uoid() const { return mUOID; }
@@ -70,7 +70,7 @@ namespace KMail {
Q_OBJECT
TQ_OBJECT
public:
- IdentityListView( TQWidget * tqparent=0, const char * name=0 );
+ IdentityListView( TQWidget * parent=0, const char * name=0 );
virtual ~IdentityListView() {}
public slots:
diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp
index a06163799..977090dd2 100644
--- a/kmail/imapaccountbase.cpp
+++ b/kmail/imapaccountbase.cpp
@@ -79,8 +79,8 @@ namespace KMail {
//
//
- ImapAccountBase::ImapAccountBase( AccountManager * tqparent, const TQString & name, uint id )
- : NetworkAccount( tqparent, name, id ),
+ ImapAccountBase::ImapAccountBase( AccountManager * parent, const TQString & name, uint id )
+ : NetworkAccount( parent, name, id ),
mIdleTimer( 0, "mIdleTimer" ),
mNoopTimer( 0, "mNoopTimer" ),
mTotal( 0 ),
@@ -412,19 +412,19 @@ namespace KMail {
}
//-----------------------------------------------------------------------------
- // TODO imapPath can be removed once tqparent can be a KMFolderImapBase or whatever
- void ImapAccountBase::getUserRights( KMFolder* tqparent, const TQString& imapPath )
+ // TODO imapPath can be removed once parent can be a KMFolderImapBase or whatever
+ void ImapAccountBase::getUserRights( KMFolder* parent, const TQString& imapPath )
{
// There isn't much point in asking the server about a user's rights on his own inbox,
// it might not be the effective permissions (at least with Cyrus, one can admin his own inbox,
// even after a SETACL that removes the admin permissions. Other imap servers apparently
// don't even allow removing one's own admin permission, so this code won't hurt either).
if ( imapPath == "/INBOX/" ) {
- if ( tqparent->folderType() == KMFolderTypeImap )
- static_cast( tqparent->storage() )->setUserRights( ACLJobs::All, ACLJobs::Ok );
- else if ( tqparent->folderType() == KMFolderTypeCachedImap )
- static_cast( tqparent->storage() )->setUserRights( ACLJobs::All, ACLJobs::Ok );
- emit receivedUserRights( tqparent ); // warning, you need to connect first to get that one
+ if ( parent->folderType() == KMFolderTypeImap )
+ static_cast( parent->storage() )->setUserRights( ACLJobs::All, ACLJobs::Ok );
+ else if ( parent->folderType() == KMFolderTypeCachedImap )
+ static_cast( parent->storage() )->setUserRights( ACLJobs::All, ACLJobs::Ok );
+ emit receivedUserRights( parent ); // warning, you need to connect first to get that one
return;
}
@@ -433,7 +433,7 @@ namespace KMail {
ACLJobs::GetUserRightsJob* job = ACLJobs::getUserRights( mSlave, url );
- jobData jd( url.url(), tqparent );
+ jobData jd( url.url(), parent );
jd.cancellable = true;
insertJob(job, jd);
@@ -447,7 +447,7 @@ namespace KMail {
JobIterator it = findJob( job );
if ( it == jobsEnd() ) return;
- KMFolder* folder = (*it).tqparent;
+ KMFolder* folder = (*it).parent;
if ( job->error() ) {
if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION ) // that's when the imap server doesn't support ACLs
mACLSupport = false;
@@ -471,13 +471,13 @@ namespace KMail {
}
//-----------------------------------------------------------------------------
- void ImapAccountBase::getACL( KMFolder* tqparent, const TQString& imapPath )
+ void ImapAccountBase::getACL( KMFolder* parent, const TQString& imapPath )
{
KURL url = getUrl();
url.setPath(imapPath);
ACLJobs::GetACLJob* job = ACLJobs::getACL( mSlave, url );
- jobData jd( url.url(), tqparent );
+ jobData jd( url.url(), parent );
jd.cancellable = true;
insertJob(job, jd);
@@ -491,21 +491,21 @@ namespace KMail {
JobIterator it = findJob( job );
if ( it == jobsEnd() ) return;
- KMFolder* folder = (*it).tqparent;
+ KMFolder* folder = (*it).parent;
emit receivedACL( folder, job, job->entries() );
if (mSlave) removeJob(job);
}
//-----------------------------------------------------------------------------
- // Do not remove imapPath, FolderDiaQuotaTab needs to call this with tqparent==0.
- void ImapAccountBase::getStorageQuotaInfo( KMFolder* tqparent, const TQString& imapPath )
+ // Do not remove imapPath, FolderDiaQuotaTab needs to call this with parent==0.
+ void ImapAccountBase::getStorageQuotaInfo( KMFolder* parent, const TQString& imapPath )
{
if ( !mSlave ) return;
KURL url = getUrl();
url.setPath(imapPath);
QuotaJobs::GetStorageQuotaJob* job = QuotaJobs::getStorageQuota( mSlave, url );
- jobData jd( url.url(), tqparent );
+ jobData jd( url.url(), parent );
jd.cancellable = true;
insertJob(job, jd);
@@ -521,7 +521,7 @@ namespace KMail {
if ( job->error() && job->error() == KIO::ERR_UNSUPPORTED_ACTION )
setHasNoQuotaSupport();
- KMFolder* folder = (*it).tqparent; // can be 0
+ KMFolder* folder = (*it).parent; // can be 0
emit receivedStorageQuotaInfo( folder, job, job->storageQuotaInfo() );
if (mSlave) removeJob(job);
}
@@ -900,7 +900,7 @@ namespace KMail {
TQString quotaAsString( i18n("No detailed quota information available.") );
bool readOnly = false;
if (it != mapJobData.end()) {
- const KMFolder * const folder = (*it).tqparent;
+ const KMFolder * const folder = (*it).parent;
if( !folder ) return _error;
const KMFolderCachedImap * const imap = dynamic_cast( folder->storage() );
if ( imap ) {
@@ -1109,7 +1109,7 @@ namespace KMail {
// more than 50% of the parts have to be loaded anyway so it is faster
// to load the message completely
kdDebug(5006) << "Falling back to normal mode" << endl;
- FolderJob *job = msg->tqparent()->createJob(
+ FolderJob *job = msg->parent()->createJob(
msg, FolderJob::tGetMessage, 0, "TEXT" );
job->start();
return;
@@ -1123,14 +1123,14 @@ namespace KMail {
if ( part->loadHeaders() )
{
kdDebug(5006) << "load HEADER" << endl;
- FolderJob *job = msg->tqparent()->createJob(
+ FolderJob *job = msg->parent()->createJob(
msg, FolderJob::tGetMessage, 0, part->partSpecifier()+".MIME" );
job->start();
}
if ( part->loadPart() )
{
kdDebug(5006) << "load Part" << endl;
- FolderJob *job = msg->tqparent()->createJob(
+ FolderJob *job = msg->parent()->createJob(
msg, FolderJob::tGetMessage, 0, part->partSpecifier() );
job->start();
}
@@ -1139,7 +1139,7 @@ namespace KMail {
//-----------------------------------------------------------------------------
void ImapAccountBase::constructParts( TQDataStream & stream, int count, KMMessagePart* parentKMPart,
- DwBodyPart * tqparent, const DwMessage * dwmsg )
+ DwBodyPart * parent, const DwMessage * dwmsg )
{
int tqchildren;
for (int i = 0; i < count; i++)
@@ -1152,12 +1152,12 @@ namespace KMail {
<< " of type " << part->originalContentTypeStr() << endl;
DwBodyPart *dwpart = mCurrentMsg->createDWBodyPart( part );
- if ( tqparent )
+ if ( parent )
{
- // add to tqparent body
- tqparent->Body().AddBodyPart( dwpart );
+ // add to parent body
+ parent->Body().AddBodyPart( dwpart );
dwpart->Parse();
-// kdDebug(5006) << "constructed dwpart " << dwpart << ",dwmsg " << dwmsg << ",tqparent " << tqparent
+// kdDebug(5006) << "constructed dwpart " << dwpart << ",dwmsg " << dwmsg << ",parent " << parent
// << ",dwparts msg " << dwpart->Body().Message() <<",id "<ObjectId() << endl;
} else if ( part->partSpecifier() != "0" &&
!part->partSpecifier().endsWith(".HEADER") )
@@ -1165,7 +1165,7 @@ namespace KMail {
// add to message
dwmsg->Body().AddBodyPart( dwpart );
dwpart->Parse();
-// kdDebug(5006) << "constructed dwpart " << dwpart << ",dwmsg " << dwmsg << ",tqparent " << tqparent
+// kdDebug(5006) << "constructed dwpart " << dwpart << ",dwmsg " << dwmsg << ",parent " << parent
// << ",dwparts msg " << dwpart->Body().Message() <<",id "<ObjectId() << endl;
} else
dwpart = 0;
@@ -1175,20 +1175,20 @@ namespace KMail {
if (tqchildren > 0)
{
- DwBodyPart* newtqparent = dwpart;
+ DwBodyPart* newparent = dwpart;
const DwMessage* newmsg = dwmsg;
if ( part->originalContentTypeStr() == "MESSAGE/RFC822" && dwpart &&
dwpart->Body().Message() )
{
// set the encapsulated message as the new message
- newtqparent = 0;
+ newparent = 0;
newmsg = dwpart->Body().Message();
}
KMMessagePart* newParentKMPart = part;
- if ( part->partSpecifier().endsWith(".HEADER") ) // we don't want headers as tqparent
+ if ( part->partSpecifier().endsWith(".HEADER") ) // we don't want headers as parent
newParentKMPart = parentKMPart;
- constructParts( stream, tqchildren, newParentKMPart, newtqparent, newmsg );
+ constructParts( stream, tqchildren, newParentKMPart, newparent, newmsg );
}
}
}
@@ -1246,16 +1246,16 @@ namespace KMail {
ImapAccountBase::JobIterator it = findJob(job);
if ( it == jobsEnd() ) return;
int errorCode = job->error();
- KMFolder * const tqparent = (*it).tqparent;
+ KMFolder * const parent = (*it).parent;
const TQString path = (*it).path;
if (errorCode && errorCode != KIO::ERR_CANNOT_OPEN_FOR_WRITING)
{
bool cont = handleJobError( job, i18n( "Error while uploading status of messages to server: " ) + '\n' );
- emit imapStatusChanged( tqparent, path, cont );
+ emit imapStatusChanged( parent, path, cont );
}
else
{
- emit imapStatusChanged( tqparent, path, true );
+ emit imapStatusChanged( parent, path, true );
removeJob(it);
}
}
@@ -1370,11 +1370,11 @@ namespace KMail {
}
//------------------------------------------------------------------------------
- TQString ImapAccountBase::createImapPath( const TQString& tqparent,
+ TQString ImapAccountBase::createImapPath( const TQString& parent,
const TQString& folderName )
{
- kdDebug(5006) << "createImapPath tqparent="<folderType() == KMFolderTypeImap ) {
- path = static_cast( tqparent )->imapPath();
- } else if ( tqparent->folderType() == KMFolderTypeCachedImap ) {
- path = static_cast( tqparent )->imapPath();
+ if ( parent->folderType() == KMFolderTypeImap ) {
+ path = static_cast( parent )->imapPath();
+ } else if ( parent->folderType() == KMFolderTypeCachedImap ) {
+ path = static_cast( parent )->imapPath();
} else {
// error
return path;
diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h
index c533171df..533be4839 100644
--- a/kmail/imapaccountbase.h
+++ b/kmail/imapaccountbase.h
@@ -60,7 +60,7 @@ namespace KMail {
Q_OBJECT
TQ_OBJECT
protected:
- ImapAccountBase( AccountManager * tqparent, const TQString & name, uint id );
+ ImapAccountBase( AccountManager * parent, const TQString & name, uint id );
public:
virtual ~ImapAccountBase();
@@ -142,13 +142,13 @@ namespace KMail {
struct jobData
{
// Needed by TQMap, don't use
- jobData() : url(TQString()), tqparent(0), current(0), total(1), done(0), offset(0), progressItem(0),
+ jobData() : url(TQString()), parent(0), current(0), total(1), done(0), offset(0), progressItem(0),
onlySubscribed(false), quiet(false), cancellable(false) {}
// Real constructor
- jobData( const TQString& _url, KMFolder *_tqparent = 0,
+ jobData( const TQString& _url, KMFolder *_parent = 0,
int _total = 1, int _done = 0, bool _quiet = false,
bool _cancelable = false )
- : url(_url), tqparent(_tqparent), current(0), total(_total), done(_done), offset(0),
+ : url(_url), parent(_parent), current(0), total(_total), done(_done), offset(0),
progressItem(0), quiet(_quiet), cancellable(_cancelable) {}
TQString path;
@@ -157,7 +157,7 @@ namespace KMail {
TQByteArray data;
TQCString cdata;
TQStringList items;
- KMFolder *tqparent, *current;
+ KMFolder *parent, *current;
TQPtrList msgList;
int total, done, offset;
KPIM::ProgressItem *progressItem;
@@ -401,16 +401,16 @@ namespace KMail {
return mCapabilities.contains( capa ); }
/**
- * Create an IMAP path for a tqparent folder and a foldername
+ * Create an IMAP path for a parent folder and a foldername
* Parent and folder are separated with the delimiter of the account
* The path starts and ends with '/'
*/
- TQString createImapPath( FolderStorage* tqparent, const TQString& folderName );
+ TQString createImapPath( FolderStorage* parent, const TQString& folderName );
/**
- * Create an IMAP path for a tqparent imapPath and a folderName
+ * Create an IMAP path for a parent imapPath and a folderName
*/
- TQString createImapPath( const TQString& tqparent, const TQString& folderName );
+ TQString createImapPath( const TQString& parent, const TQString& folderName );
public slots:
@@ -511,7 +511,7 @@ namespace KMail {
* Build KMMessageParts and DwBodyParts from the bodystructure-stream
*/
void constructParts( TQDataStream & stream, int count, KMMessagePart* parentKMPart,
- DwBodyPart * tqparent, const DwMessage * dwmsg );
+ DwBodyPart * parent, const DwMessage * dwmsg );
/** Migrate the prefix */
void migratePrefix();
diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp
index c25b29097..3ddb93f39 100644
--- a/kmail/imapjob.cpp
+++ b/kmail/imapjob.cpp
@@ -86,11 +86,11 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
if (folder) {
folder->open("imapjobdest");
}
- KMFolder *msg_tqparent = msg->tqparent();
- if (msg_tqparent) {
- msg_tqparent->open("imapjobsrc");
+ KMFolder *msg_parent = msg->parent();
+ if (msg_parent) {
+ msg_parent->open("imapjobsrc");
}
- mSrcFolder = msg_tqparent;
+ mSrcFolder = msg_parent;
// If there is a destination folder, this is a copy, move or put to an
// imap folder, use its account for keeping track of the job. Otherwise,
// this is a get job and the src folder is an imap one. Use its account
@@ -99,8 +99,8 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
if (folder) {
account = folder->account();
} else {
- if ( msg_tqparent && msg_tqparent->storage() )
- account = static_cast(msg_tqparent->storage())->account();
+ if ( msg_parent && msg_parent->storage() )
+ account = static_cast(msg_parent->storage())->account();
}
if ( !account ||
account->makeConnection() == ImapAccountBase::Error ) {
@@ -125,7 +125,7 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
TQString flags = KMFolderImap::statusToFlags( curMsg->status(), folder->permanentFlags() );
url.setPath( folder->imapPath() + ";SECTION=" + flags );
ImapAccountBase::jobData jd;
- jd.tqparent = 0; jd.offset = 0; jd.done = 0;
+ jd.parent = 0; jd.offset = 0; jd.done = 0;
jd.total = ( curMsg->msgSizeServer() > 0 ) ?
curMsg->msgSizeServer() : curMsg->msgSize();
jd.msgList.append( curMsg );
@@ -175,10 +175,10 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
KURL url = account->getUrl();
KURL destUrl = account->getUrl();
destUrl.setPath(folder->imapPath());
- KMFolderImap *imapDestFolder = static_cast(msg_tqparent->storage());
+ KMFolderImap *imapDestFolder = static_cast(msg_parent->storage());
url.setPath( imapDestFolder->imapPath() + ";UID=" + sets );
ImapAccountBase::jobData jd;
- jd.tqparent = 0; jd.offset = 0;
+ jd.parent = 0; jd.offset = 0;
jd.total = 1; jd.done = 0;
jd.msgList = msgList;
@@ -191,7 +191,7 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
"ImapJobCopyMove"+ProgressManager::getUniqueID(),
i18n("Server operation"),
i18n("Source folder: %1 - Destination folder: %2")
- .tqarg( TQStyleSheet::escape( msg_tqparent->prettyURL() ),
+ .tqarg( TQStyleSheet::escape( msg_parent->prettyURL() ),
TQStyleSheet::escape( mDestFolder->prettyURL() ) ),
true,
account->useSSL() || account->useTLS() );
@@ -285,7 +285,7 @@ void ImapJob::slotGetNextMessage()
KURL url = account->getUrl();
TQString path = msgParent->imapPath() + ";UID=" + TQString::number(msg->UID());
ImapAccountBase::jobData jd;
- jd.tqparent = 0; jd.offset = 0;
+ jd.parent = 0; jd.offset = 0;
jd.total = 1; jd.done = 0;
jd.msgList.append( msg );
if ( !mPartSpecifier.isEmpty() )
@@ -347,15 +347,15 @@ void ImapJob::slotGetNextMessage()
void ImapJob::slotGetMessageResult( KIO::Job * job )
{
KMMessage *msg = mMsgList.first();
- if (!msg || !msg->tqparent() || !job) {
+ if (!msg || !msg->parent() || !job) {
emit messageRetrieved( 0 );
deleteLater();
return;
}
- KMFolderImap* tqparent = static_cast(msg->storage());
+ KMFolderImap* parent = static_cast(msg->storage());
if (msg->transferInProgress())
msg->setTransferInProgress( false );
- KMAcctImap *account = tqparent->account();
+ KMAcctImap *account = parent->account();
if ( !account ) {
emit messageRetrieved( 0 );
deleteLater();
@@ -397,10 +397,10 @@ void ImapJob::slotGetMessageResult( KIO::Job * job )
// During the construction of the message from the byteArray it does
// not have a uid. Therefore we have to make sure that no connected
// slots are called, since they would operate on uid == 0.
- msg->tqparent()->storage()->blockSignals( true );
+ msg->parent()->storage()->blockSignals( true );
msg->fromByteArray( (*it).data );
// now let others react
- msg->tqparent()->storage()->blockSignals( false );
+ msg->parent()->storage()->blockSignals( false );
if ( size > 0 && msg->msgSizeServer() == 0 ) {
msg->setMsgSizeServer(size);
}
@@ -447,9 +447,9 @@ void ImapJob::slotGetMessageResult( KIO::Job * job )
/* we got an answer but not data
* this means that the msg is not on the server anymore so delete it */
emit messageRetrieved( 0 );
- tqparent->ignoreJobsForMessage( msg );
- int idx = tqparent->find( msg );
- if (idx != -1) tqparent->removeMsg( idx, true );
+ parent->ignoreJobsForMessage( msg );
+ int idx = parent->find( msg );
+ if (idx != -1) parent->removeMsg( idx, true );
// the removeMsg will unGet the message, which will delete all
// jobs, including this one
return;
@@ -464,14 +464,14 @@ void ImapJob::slotGetMessageResult( KIO::Job * job )
void ImapJob::slotGetBodyStructureResult( KIO::Job * job )
{
KMMessage *msg = mMsgList.first();
- if (!msg || !msg->tqparent() || !job) {
+ if (!msg || !msg->parent() || !job) {
deleteLater();
return;
}
- KMFolderImap* tqparent = static_cast(msg->storage());
+ KMFolderImap* parent = static_cast(msg->storage());
if (msg->transferInProgress())
msg->setTransferInProgress( false );
- KMAcctImap *account = tqparent->account();
+ KMAcctImap *account = parent->account();
if ( !account ) {
deleteLater();
return;
@@ -678,9 +678,9 @@ void ImapJob::execute()
}
//-----------------------------------------------------------------------------
-void ImapJob::setParentFolder( const KMFolderImap* tqparent )
+void ImapJob::setParentFolder( const KMFolderImap* parent )
{
- mParentFolder = const_cast( tqparent );
+ mParentFolder = const_cast( parent );
}
//-----------------------------------------------------------------------------
@@ -690,13 +690,13 @@ void ImapJob::slotProcessedSize(KIO::Job * job, KIO::filesize_t processed)
if (!msg || !job) {
return;
}
- KMFolderImap* tqparent = 0;
- if ( msg->tqparent() && msg->tqparent()->folderType() == KMFolderTypeImap )
- tqparent = static_cast(msg->tqparent()->storage());
+ KMFolderImap* parent = 0;
+ if ( msg->parent() && msg->parent()->folderType() == KMFolderTypeImap )
+ parent = static_cast(msg->parent()->storage());
else if (mDestFolder) // put
- tqparent = static_cast(mDestFolder->storage());
- if (!tqparent) return;
- KMAcctImap *account = tqparent->account();
+ parent = static_cast(mDestFolder->storage());
+ if (!parent) return;
+ KMAcctImap *account = parent->account();
if ( !account ) return;
ImapAccountBase::JobIterator it = account->findJob( job );
if ( it == account->jobsEnd() ) return;
diff --git a/kmail/imapjob.h b/kmail/imapjob.h
index 76174b5f3..04438eb64 100644
--- a/kmail/imapjob.h
+++ b/kmail/imapjob.h
@@ -64,7 +64,7 @@ public:
JobType jt = tGetMessage, KMFolderImap *folder = 0 );
virtual ~ImapJob();
- void setParentFolder( const KMFolderImap* tqparent );
+ void setParentFolder( const KMFolderImap* parent );
KPIM::ProgressItem* parentProgressItem() const { return mParentProgressItem; }
void setParentProgressItem( KPIM::ProgressItem *p ) { mParentProgressItem = p; }
diff --git a/kmail/importarchivedialog.cpp b/kmail/importarchivedialog.cpp
index e820f1139..eeea23d78 100644
--- a/kmail/importarchivedialog.cpp
+++ b/kmail/importarchivedialog.cpp
@@ -32,11 +32,11 @@
using namespace KMail;
-ImportArchiveDialog::ImportArchiveDialog( TQWidget *tqparent, TQt::WidgetFlags flags )
- : KDialogBase( tqparent, "import_archive_dialog", false, i18n( "Import Archive" ),
+ImportArchiveDialog::ImportArchiveDialog( TQWidget *parent, TQt::WidgetFlags flags )
+ : KDialogBase( parent, "import_archive_dialog", false, i18n( "Import Archive" ),
KDialogBase::Ok | KDialogBase::Cancel,
KDialogBase::Ok, true ),
- mParentWidget( tqparent )
+ mParentWidget( parent )
{
setWFlags( flags );
TQWidget *mainWidget = new TQWidget( this );
diff --git a/kmail/importarchivedialog.h b/kmail/importarchivedialog.h
index f8c15bab4..c5b8a227e 100644
--- a/kmail/importarchivedialog.h
+++ b/kmail/importarchivedialog.h
@@ -36,7 +36,7 @@ class ImportArchiveDialog : public KDialogBase
public:
- ImportArchiveDialog( TQWidget *tqparent, TQt::WidgetFlags flags );
+ ImportArchiveDialog( TQWidget *parent, TQt::WidgetFlags flags );
void setFolder( KMFolder *defaultFolder );
protected slots:
diff --git a/kmail/importjob.cpp b/kmail/importjob.cpp
index fc41a46ba..96ea86b5e 100644
--- a/kmail/importjob.cpp
+++ b/kmail/importjob.cpp
@@ -106,12 +106,12 @@ void KMail::ImportJob::abort( const TQString &errorMessage )
deleteLater();
}
-KMFolder * KMail::ImportJob::createSubFolder( KMFolder *tqparent, const TQString &folderName, mode_t permissions )
+KMFolder * KMail::ImportJob::createSubFolder( KMFolder *parent, const TQString &folderName, mode_t permissions )
{
- KMFolder *newFolder = FolderUtil::createSubFolder( tqparent, tqparent->child(), folderName, TQString(),
+ KMFolder *newFolder = FolderUtil::createSubFolder( parent, parent->child(), folderName, TQString(),
KMFolderTypeMaildir );
if ( !newFolder ) {
- abort( i18n( "Unable to create subfolder for folder '%1'." ).tqarg( tqparent->name() ) );
+ abort( i18n( "Unable to create subfolder for folder '%1'." ).tqarg( parent->name() ) );
return 0;
}
else {
@@ -131,7 +131,7 @@ void KMail::ImportJob::enqueueMessages( const KArchiveDirectory *dir, KMFolder *
const KArchiveDirectory *messageDir = dynamic_cast( dir->entry( "cur" ) );
if ( messageDir ) {
Messages messagesToQueue;
- messagesToQueue.tqparent = folder;
+ messagesToQueue.parent = folder;
const TQStringList entries = messageDir->entries();
for ( uint i = 0; i < entries.size(); i++ ) {
const KArchiveEntry *entry = messageDir->entry( entries[i] );
@@ -199,7 +199,7 @@ void KMail::ImportJob::importNextMessage()
return;
}
- KMFolder *folder = messages.tqparent;
+ KMFolder *folder = messages.parent;
if ( folder != mCurrentFolder ) {
kdDebug(5006) << "importNextMessage(): Processed all messages in the current folder of the queue." << endl;
if ( mCurrentFolder ) {
@@ -308,7 +308,7 @@ void KMail::ImportJob::importNextDirectory()
}
Folder folder = mQueuedDirectories.first();
- KMFolder *currentFolder = folder.tqparent;
+ KMFolder *currentFolder = folder.parent;
mQueuedDirectories.pop_front();
kdDebug(5006) << "importNextDirectory(): Working on directory " << folder.archiveDir->name() << endl;
@@ -343,7 +343,7 @@ void KMail::ImportJob::importNextDirectory()
Folder newFolder;
newFolder.archiveDir = dir;
- newFolder.tqparent = subFolder;
+ newFolder.parent = subFolder;
kdDebug(5006) << "Enqueueing directory " << entry->name() << endl;
mQueuedDirectories.push_back( newFolder );
}
@@ -388,7 +388,7 @@ void KMail::ImportJob::start()
Folder nextFolder;
nextFolder.archiveDir = mArchive->directory();
- nextFolder.tqparent = mRootFolder;
+ nextFolder.parent = mRootFolder;
mQueuedDirectories.push_back( nextFolder );
importNextDirectory();
}
diff --git a/kmail/importjob.h b/kmail/importjob.h
index d0f4fe488..74d1d9f5b 100644
--- a/kmail/importjob.h
+++ b/kmail/importjob.h
@@ -72,13 +72,13 @@ class ImportJob : public TQObject
struct Folder
{
- KMFolder *tqparent;
+ KMFolder *parent;
const KArchiveDirectory *archiveDir;
};
struct Messages
{
- KMFolder *tqparent;
+ KMFolder *parent;
TQPtrList files;
};
@@ -86,7 +86,7 @@ class ImportJob : public TQObject
void abort( const TQString &errorMessage );
void queueFolders();
void importNextDirectory();
- KMFolder* createSubFolder( KMFolder *tqparent, const TQString &folderName, mode_t permissions );
+ KMFolder* createSubFolder( KMFolder *parent, const TQString &folderName, mode_t permissions );
KMFolder* getOrCreateSubFolder( KMFolder *parentFolder, const TQString &subFolderName,
mode_t subFolderPermissions );
void enqueueMessages( const KArchiveDirectory *dir, KMFolder *folder );
@@ -102,11 +102,11 @@ class ImportJob : public TQObject
KURL mArchiveFile;
int mNumberOfImportedMessages;
- // List of archive folders with their corresponding KMail tqparent folder that are awaiting
+ // List of archive folders with their corresponding KMail parent folder that are awaiting
// processing
TQValueList mQueuedDirectories;
- // List of list of messages and their tqparent folders which are awaiting processing
+ // List of list of messages and their parent folders which are awaiting processing
TQValueList mQueuedMessages;
// The folder to which we are currently importing messages
diff --git a/kmail/index.cpp b/kmail/index.cpp
index a71d27e9c..5604003d4 100644
--- a/kmail/index.cpp
+++ b/kmail/index.cpp
@@ -77,8 +77,8 @@ std::vector TQValueListToVector( const TQValueList& input ) {
}
#endif
-KMMsgIndex::KMMsgIndex( TQObject* tqparent ):
- TQObject( tqparent, "index" ),
+KMMsgIndex::KMMsgIndex( TQObject* parent ):
+ TQObject( parent, "index" ),
mState( s_idle ),
#ifdef HAVE_INDEXLIB
mLockFile( std::string( static_cast( TQFile::encodeName( defaultPath() ) + "/lock" ) ) ),
@@ -152,8 +152,8 @@ KMMsgIndex::~KMMsgIndex() {
}
bool KMMsgIndex::isIndexable( KMFolder* folder ) const {
- if ( !folder || !folder->tqparent() ) return false;
- const KMFolderMgr* manager = folder->tqparent()->manager();
+ if ( !folder || !folder->parent() ) return false;
+ const KMFolderMgr* manager = folder->parent()->manager();
return manager == kmkernel->folderMgr() || manager == kmkernel->dimapFolderMgr();
}
diff --git a/kmail/index.h b/kmail/index.h
index f24dc47b9..bd7749448 100644
--- a/kmail/index.h
+++ b/kmail/index.h
@@ -53,7 +53,7 @@ class KMMsgIndex : public TQObject {
Q_OBJECT
TQ_OBJECT
public:
- explicit KMMsgIndex( TQObject* tqparent );
+ explicit KMMsgIndex( TQObject* parent );
~KMMsgIndex();
public:
diff --git a/kmail/interfaces/bodyparturlhandler.h b/kmail/interfaces/bodyparturlhandler.h
index 01f64adbe..78d566c1f 100644
--- a/kmail/interfaces/bodyparturlhandler.h
+++ b/kmail/interfaces/bodyparturlhandler.h
@@ -81,7 +81,7 @@ namespace KMail {
/** Called when RMB-clicking on a link in the reader. Should
show a context menu at the specified point with the
- specified widget as tqparent.
+ specified widget as parent.
@return true if the right-click was handled by this handler,
false otherwise.
diff --git a/kmail/interfaces/urlhandler.h b/kmail/interfaces/urlhandler.h
index 702efa415..1eb0e365f 100644
--- a/kmail/interfaces/urlhandler.h
+++ b/kmail/interfaces/urlhandler.h
@@ -94,7 +94,7 @@ namespace KMail {
/** Called when RMB-clicking on a link in the reader. Should show
a context menu at the specified point with the specified
- widget as tqparent.
+ widget as parent.
@return true if the right-click was handled by this
URLHandler, false otherwise.
diff --git a/kmail/jobscheduler.cpp b/kmail/jobscheduler.cpp
index caf4759f8..d5374fe42 100644
--- a/kmail/jobscheduler.cpp
+++ b/kmail/jobscheduler.cpp
@@ -34,8 +34,8 @@
using namespace KMail;
-JobScheduler::JobScheduler( TQObject* tqparent, const char* name )
- : TQObject( tqparent, name ), mTimer( this, "mTimer" ),
+JobScheduler::JobScheduler( TQObject* parent, const char* name )
+ : TQObject( parent, name ), mTimer( this, "mTimer" ),
mPendingImmediateTasks( 0 ),
mCurrentTask( 0 ), mCurrentJob( 0 )
{
@@ -109,7 +109,7 @@ void JobScheduler::notifyOpeningFolder( KMFolder* folder )
} else {
// Jobs scheduled from here should always be cancellable.
// One exception though, is when ExpireJob does its final KMMoveCommand.
- // Then that command shouldn't kill its own tqparent job just because it opens a folder...
+ // Then that command shouldn't kill its own parent job just because it opens a folder...
if ( mCurrentJob->isCancellable() )
interruptCurrentTask();
}
diff --git a/kmail/jobscheduler.h b/kmail/jobscheduler.h
index c35121ddd..c0feed34f 100644
--- a/kmail/jobscheduler.h
+++ b/kmail/jobscheduler.h
@@ -98,7 +98,7 @@ class JobScheduler : public TQObject
Q_OBJECT
TQ_OBJECT
public:
- JobScheduler( TQObject* tqparent, const char* name = 0 );
+ JobScheduler( TQObject* parent, const char* name = 0 );
~JobScheduler();
/// Register a task to be done for a given folder
diff --git a/kmail/kcm_kmail.cpp b/kmail/kcm_kmail.cpp
index 6cb283746..3ba43637d 100644
--- a/kmail/kcm_kmail.cpp
+++ b/kmail/kcm_kmail.cpp
@@ -31,55 +31,55 @@
//----------------------------
extern "C"
{
- KDE_EXPORT KCModule *create_kmail_config_misc( TQWidget *tqparent, const char * )
+ KDE_EXPORT KCModule *create_kmail_config_misc( TQWidget *parent, const char * )
{
- MiscPage *page = new MiscPage( tqparent, "kcmkmail_config_misc" );
+ MiscPage *page = new MiscPage( parent, "kcmkmail_config_misc" );
return page;
}
}
extern "C"
{
- KDE_EXPORT KCModule *create_kmail_config_appearance( TQWidget *tqparent, const char * )
+ KDE_EXPORT KCModule *create_kmail_config_appearance( TQWidget *parent, const char * )
{
AppearancePage *page =
- new AppearancePage( tqparent, "kcmkmail_config_appearance" );
+ new AppearancePage( parent, "kcmkmail_config_appearance" );
return page;
}
}
extern "C"
{
- KDE_EXPORT KCModule *create_kmail_config_composer( TQWidget *tqparent, const char * )
+ KDE_EXPORT KCModule *create_kmail_config_composer( TQWidget *parent, const char * )
{
- ComposerPage *page = new ComposerPage( tqparent, "kcmkmail_config_composer" );
+ ComposerPage *page = new ComposerPage( parent, "kcmkmail_config_composer" );
return page;
}
}
extern "C"
{
- KDE_EXPORT KCModule *create_kmail_config_identity( TQWidget *tqparent, const char * )
+ KDE_EXPORT KCModule *create_kmail_config_identity( TQWidget *parent, const char * )
{
- IdentityPage *page = new IdentityPage( tqparent, "kcmkmail_config_identity" );
+ IdentityPage *page = new IdentityPage( parent, "kcmkmail_config_identity" );
return page;
}
}
extern "C"
{
- KDE_EXPORT KCModule *create_kmail_config_accounts( TQWidget *tqparent, const char * )
+ KDE_EXPORT KCModule *create_kmail_config_accounts( TQWidget *parent, const char * )
{
- AccountsPage *page = new AccountsPage( tqparent, "kcmkmail_config_accounts" );
+ AccountsPage *page = new AccountsPage( parent, "kcmkmail_config_accounts" );
return page;
}
}
extern "C"
{
- KDE_EXPORT KCModule *create_kmail_config_security( TQWidget *tqparent, const char * )
+ KDE_EXPORT KCModule *create_kmail_config_security( TQWidget *parent, const char * )
{
- SecurityPage *page = new SecurityPage( tqparent, "kcmkmail_config_security" );
+ SecurityPage *page = new SecurityPage( parent, "kcmkmail_config_security" );
return page;
}
}
diff --git a/kmail/khtmlparthtmlwriter.cpp b/kmail/khtmlparthtmlwriter.cpp
index 174c2c3a2..2b53e6094 100644
--- a/kmail/khtmlparthtmlwriter.cpp
+++ b/kmail/khtmlparthtmlwriter.cpp
@@ -47,8 +47,8 @@
namespace KMail {
KHtmlPartHtmlWriter::KHtmlPartHtmlWriter( KHTMLPart * part,
- TQObject * tqparent, const char * name )
- : TQObject( tqparent, name ), HtmlWriter(),
+ TQObject * parent, const char * name )
+ : TQObject( parent, name ), HtmlWriter(),
mHtmlPart( part ), mHtmlTimer( 0, "mHtmlTimer" ), mState( Ended )
{
assert( part );
diff --git a/kmail/khtmlparthtmlwriter.h b/kmail/khtmlparthtmlwriter.h
index 3db102f78..7a551584d 100644
--- a/kmail/khtmlparthtmlwriter.h
+++ b/kmail/khtmlparthtmlwriter.h
@@ -50,7 +50,7 @@ namespace KMail {
// Key is Content-Id, value is URL
typedef TQMap EmbeddedPartMap;
KHtmlPartHtmlWriter( KHTMLPart * part,
- TQObject * tqparent=0, const char * name = 0 );
+ TQObject * parent=0, const char * name = 0 );
virtual ~KHtmlPartHtmlWriter();
void begin( const TQString & cssDefs );
diff --git a/kmail/klistboxdialog.cpp b/kmail/klistboxdialog.cpp
index 530ffaf45..7027edd6d 100644
--- a/kmail/klistboxdialog.cpp
+++ b/kmail/klistboxdialog.cpp
@@ -11,10 +11,10 @@
KListBoxDialog::KListBoxDialog( TQString& _selectedString,
const TQString& caption,
const TQString& labelText,
- TQWidget* tqparent,
+ TQWidget* parent,
const char* name,
bool modal )
- : KDialogBase( tqparent, name, modal, caption, Ok|Cancel, Ok, true ),
+ : KDialogBase( parent, name, modal, caption, Ok|Cancel, Ok, true ),
selectedString( _selectedString )
{
diff --git a/kmail/klistboxdialog.h b/kmail/klistboxdialog.h
index cf155075f..efb73caf7 100644
--- a/kmail/klistboxdialog.h
+++ b/kmail/klistboxdialog.h
@@ -15,7 +15,7 @@ public:
KListBoxDialog( TQString& _selectedString,
const TQString& caption,
const TQString& labelText,
- TQWidget* tqparent = 0,
+ TQWidget* parent = 0,
const char* name = 0,
bool modal = true );
~KListBoxDialog();
diff --git a/kmail/klistviewindexedsearchline.cpp b/kmail/klistviewindexedsearchline.cpp
index f556c07dc..9f0e26356 100644
--- a/kmail/klistviewindexedsearchline.cpp
+++ b/kmail/klistviewindexedsearchline.cpp
@@ -38,8 +38,8 @@
using KMail::HeaderListQuickSearch;
-KListViewIndexedSearchLine::KListViewIndexedSearchLine( TQWidget* tqparent, KListView* listView, KActionCollection* actionCollection, const char* name ):
- HeaderListQuickSearch( tqparent, listView, actionCollection, name ),
+KListViewIndexedSearchLine::KListViewIndexedSearchLine( TQWidget* parent, KListView* listView, KActionCollection* actionCollection, const char* name ):
+ HeaderListQuickSearch( parent, listView, actionCollection, name ),
mFiltering( false )
{
}
diff --git a/kmail/klistviewindexedsearchline.h b/kmail/klistviewindexedsearchline.h
index f8aaf176a..6cf00bc18 100644
--- a/kmail/klistviewindexedsearchline.h
+++ b/kmail/klistviewindexedsearchline.h
@@ -53,7 +53,7 @@ class KDEUI_EXPORT KListViewIndexedSearchLine: public KMail::HeaderListQuickSear
public:
- explicit KListViewIndexedSearchLine(TQWidget *tqparent, KListView *listView, KActionCollection* action, const char *name = 0);
+ explicit KListViewIndexedSearchLine(TQWidget *parent, KListView *listView, KActionCollection* action, const char *name = 0);
~KListViewIndexedSearchLine();
public slots:
diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp
index 20105acd8..7cadcba97 100644
--- a/kmail/kmaccount.cpp
+++ b/kmail/kmaccount.cpp
@@ -42,8 +42,8 @@ using KMail::FolderJob;
#include "kmaccount.moc"
//-----------------------------------------------------------------------------
-KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *tqparent)
- : TQObject(tqparent), mPrecommand(precommand)
+KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *parent)
+ : TQObject(parent), mPrecommand(precommand)
{
BroadcastStatus::instance()->seStatusMsg(
i18n("Executing precommand %1").tqarg(precommand ));
@@ -220,9 +220,9 @@ bool KMAccount::processNewMsg(KMMessage* aMsg)
assert(aMsg != 0);
// Save this one for readding
- KMFolderCachedImap* tqparent = 0;
+ KMFolderCachedImap* parent = 0;
if( type() == "cachedimap" )
- tqparent = static_cast( aMsg->storage() );
+ parent = static_cast( aMsg->storage() );
// checks whether we should send delivery receipts
// and sends them.
@@ -258,7 +258,7 @@ if( fileD0.open( IO_WriteOnly ) ) {
else if (processResult == 1)
{
if( type() == "cachedimap" )
- ; // already done by caller: tqparent->addMsgInternal( aMsg, false );
+ ; // already done by caller: parent->addMsgInternal( aMsg, false );
else {
// TODO: Perhaps it would be best, if this if was handled by a virtual
// method, so the if( !dimap ) above could die?
@@ -287,11 +287,11 @@ if( fileD0.open( IO_WriteOnly ) ) {
// Count number of new messages for each folder
TQString folderId;
if ( processResult == 1 ) {
- folderId = ( type() == "cachedimap" ) ? tqparent->folder()->idString()
+ folderId = ( type() == "cachedimap" ) ? parent->folder()->idString()
: mFolder->idString();
}
else {
- folderId = aMsg->tqparent()->idString();
+ folderId = aMsg->parent()->idString();
}
addToNewInFolder( folderId, 1 );
diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h
index 86e2f6956..43f3aca3a 100644
--- a/kmail/kmaccount.h
+++ b/kmail/kmaccount.h
@@ -55,7 +55,7 @@ class KMPrecommand : public TQObject
TQ_OBJECT
public:
- KMPrecommand(const TQString &precommand, TQObject *tqparent = 0);
+ KMPrecommand(const TQString &precommand, TQObject *parent = 0);
virtual ~KMPrecommand();
bool start();
diff --git a/kmail/kmacctcachedimap.cpp b/kmail/kmacctcachedimap.cpp
index 76339dd65..9066941c6 100644
--- a/kmail/kmacctcachedimap.cpp
+++ b/kmail/kmacctcachedimap.cpp
@@ -134,8 +134,8 @@ TQValueList KMAcctCachedImap::killAllJobsInternal( bool dis
TQValueList folderList;
TQMap::Iterator it = mapJobData.begin();
for (; it != mapJobData.end(); ++it) {
- if ((*it).tqparent)
- folderList << static_cast((*it).tqparent->storage());
+ if ((*it).parent)
+ folderList << static_cast((*it).parent->storage());
// Kill the job - except if it's the one that already died and is calling us
if ( !it.key()->error() && mSlave ) {
it.key()->kill();
@@ -163,8 +163,8 @@ void KMAcctCachedImap::cancelMailCheck()
TQValueList folderList;
TQMap::Iterator it = mapJobData.begin();
for (; it != mapJobData.end(); ++it) {
- if ( (*it).cancellable && (*it).tqparent )
- folderList << static_cast((*it).tqparent->storage());
+ if ( (*it).cancellable && (*it).parent )
+ folderList << static_cast((*it).parent->storage());
}
// Kill jobs
ImapAccountBase::cancelMailCheck();
diff --git a/kmail/kmacctfolder.h b/kmail/kmacctfolder.h
index 488142a9b..97dca0d75 100644
--- a/kmail/kmacctfolder.h
+++ b/kmail/kmacctfolder.h
@@ -48,7 +48,7 @@ public:
void clearAccountList();
private:
- KMAcctFolder( KMFolderDir* tqparent, const TQString& name,
+ KMAcctFolder( KMFolderDir* parent, const TQString& name,
KMFolderType aFolderType );
};
diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp
index d889b65b2..fe74bc80a 100644
--- a/kmail/kmacctimap.cpp
+++ b/kmail/kmacctimap.cpp
@@ -153,10 +153,10 @@ void KMAcctImap::killAllJobs( bool disconnectSlave )
msg->setTransferInProgress( false );
}
}
- if ((*it).tqparent)
+ if ((*it).parent)
{
// clear folder state
- KMFolderImap *fld = static_cast((*it).tqparent->storage());
+ KMFolderImap *fld = static_cast((*it).parent->storage());
fld->setCheckingValidity(false);
fld->quiet(false);
fld->setContentState(KMFolderImap::imapNoInformation);
@@ -222,7 +222,7 @@ void KMAcctImap::ignoreJobsForFolder( KMFolder* folder )
{
ImapJob *job = it.current();
++it;
- if ( !job->msgList().isEmpty() && job->msgList().first()->tqparent() == folder )
+ if ( !job->msgList().isEmpty() && job->msgList().first()->parent() == folder )
{
job->kill();
}
@@ -237,8 +237,8 @@ void KMAcctImap::removeSlaveJobsForFolder( KMFolder* folder )
while ( it != mapJobData.end() ) {
TQMap::Iterator i = it;
it++;
- if ( (*i).tqparent ) {
- if ( (*i).tqparent == folder ) {
+ if ( (*i).parent ) {
+ if ( (*i).parent == folder ) {
mapJobData.remove(i);
}
}
@@ -252,8 +252,8 @@ void KMAcctImap::cancelMailCheck()
TQValueList folderList;
TQMap::Iterator it = mapJobData.begin();
for (; it != mapJobData.end(); ++it) {
- if ( (*it).cancellable && (*it).tqparent ) {
- folderList << static_cast((*it).tqparent->storage());
+ if ( (*it).cancellable && (*it).parent ) {
+ folderList << static_cast((*it).parent->storage());
}
}
// Kill jobs
@@ -607,11 +607,11 @@ int KMAcctImap::slotFilterMsg( KMMessage *msg )
kmkernel->emergencyExit( i18n("Unable to process messages: " ) + TQString::fromLocal8Bit(strerror(errno)));
return 2;
}
- if (msg->tqparent()) { // unGet this msg
+ if (msg->parent()) { // unGet this msg
int idx = -1;
KMFolder * p = 0;
KMMsgDict::instance()->getLocation( msg, &p, &idx );
- assert( p == msg->tqparent() ); assert( idx >= 0 );
+ assert( p == msg->parent() ); assert( idx >= 0 );
p->unGetMsg( idx );
}
diff --git a/kmail/kmacctseldlg.cpp b/kmail/kmacctseldlg.cpp
index caa2a2150..44df37c61 100644
--- a/kmail/kmacctseldlg.cpp
+++ b/kmail/kmacctseldlg.cpp
@@ -32,8 +32,8 @@
#include "kmacctseldlg.moc"
-KMAcctSelDlg::KMAcctSelDlg( TQWidget *tqparent, const char *name, bool modal )
- : KDialogBase( tqparent, name, modal, i18n("Add Account"), Ok|Cancel, Ok )
+KMAcctSelDlg::KMAcctSelDlg( TQWidget *parent, const char *name, bool modal )
+ : KDialogBase( parent, name, modal, i18n("Add Account"), Ok|Cancel, Ok )
{
TQFrame *page = makeMainWidget();
TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
diff --git a/kmail/kmacctseldlg.h b/kmail/kmacctseldlg.h
index 62a0012b3..1430fe15d 100644
--- a/kmail/kmacctseldlg.h
+++ b/kmail/kmacctseldlg.h
@@ -33,7 +33,7 @@ class KMAcctSelDlg: public KDialogBase
TQ_OBJECT
public:
- KMAcctSelDlg( TQWidget *tqparent=0, const char *name=0, bool modal=true );
+ KMAcctSelDlg( TQWidget *parent=0, const char *name=0, bool modal=true );
/**
* Returns selected button from the account selection group:
diff --git a/kmail/kmail.kcfg b/kmail/kmail.kcfg
index 8054b9d82..11f0ede47 100644
--- a/kmail/kmail.kcfg
+++ b/kmail/kmail.kcfg
@@ -97,7 +97,7 @@
-
+ false
@@ -257,7 +257,7 @@
- <p>This chooses the tqparent of the IMAP resource folders.</p><p>By default, the Kolab server sets the IMAP inbox to be the tqparent.</p>
+ <p>This chooses the parent of the IMAP resource folders.</p><p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>inbox
diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp
index 63a6df14e..f14a6faa7 100644
--- a/kmail/kmail_part.cpp
+++ b/kmail/kmail_part.cpp
@@ -61,8 +61,8 @@ typedef KParts::GenericFactory< KMailPart > KMailFactory;
K_EXPORT_COMPONENT_FACTORY( libkmailpart, KMailFactory )
KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
- TQObject *tqparent, const char *name, const TQStringList &) :
- DCOPObject("KMailIface"), KParts::ReadOnlyPart(tqparent, name),
+ TQObject *parent, const char *name, const TQStringList &) :
+ DCOPObject("KMailIface"), KParts::ReadOnlyPart(parent, name),
mParentWidget( parentWidget )
{
kdDebug(5006) << "KMailPart()" << endl;
@@ -237,8 +237,8 @@ TQWidget* KMailPart::parentWidget() const
}
-KMailStatusBarExtension::KMailStatusBarExtension( KMailPart *tqparent )
- : KParts::StatusBarExtension( tqparent ), mParent( tqparent )
+KMailStatusBarExtension::KMailStatusBarExtension( KMailPart *parent )
+ : KParts::StatusBarExtension( parent ), mParent( parent )
{
}
diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h
index d47041cc2..ff80c19bd 100644
--- a/kmail/kmail_part.h
+++ b/kmail/kmail_part.h
@@ -55,7 +55,7 @@ class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPar
TQ_OBJECT
public:
KMailPart(TQWidget *parentWidget, const char *widgetName,
- TQObject *tqparent, const char *name, const TQStringList &);
+ TQObject *parent, const char *name, const TQStringList &);
virtual ~KMailPart();
TQWidget* parentWidget() const;
@@ -89,7 +89,7 @@ class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPar
class KMailStatusBarExtension : public KParts::StatusBarExtension
{
public:
- KMailStatusBarExtension( KMailPart *tqparent );
+ KMailStatusBarExtension( KMailPart *parent );
KMainWindow *mainWindow() const;
diff --git a/kmail/kmailicalIface.h b/kmail/kmailicalIface.h
index cd4ef29c9..bc92d39a4 100644
--- a/kmail/kmailicalIface.h
+++ b/kmail/kmailicalIface.h
@@ -115,11 +115,11 @@ k_dcop:
/**
* Trigger the creation of a new resource folder with name @param resource
- * under tqparent @param.
+ * under parent @param.
* @return success or failure
*/
virtual bool addSubresource( const TQString& resource,
- const TQString& tqparent,
+ const TQString& parent,
const TQString& contentsType ) = 0;
/**
* Trigger the deletion of a new resource folder with id @param resource.
diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp
index 82084b134..1376932e0 100644
--- a/kmail/kmailicalifaceimpl.cpp
+++ b/kmail/kmailicalifaceimpl.cpp
@@ -611,12 +611,12 @@ void KMailICalIfaceImpl::slotMessageRetrieved( KMMessage* msg )
{
if( !msg ) return;
- KMFolder *tqparent = msg->tqparent();
- Q_ASSERT( tqparent );
+ KMFolder *parent = msg->parent();
+ Q_ASSERT( parent );
TQ_UINT32 sernum = msg->getMsgSerNum();
// do we have an accumulator for this folder?
- Accumulator *ac = mAccumulators.find( tqparent->location() );
+ Accumulator *ac = mAccumulators.find( parent->location() );
if( ac ) {
TQString s;
if ( !vPartFoundAndDecoded( msg, s ) ) return;
@@ -634,7 +634,7 @@ void KMailICalIfaceImpl::slotMessageRetrieved( KMMessage* msg )
} else {
/* We are not accumulating for this folder, so this one was added
* by KMail. Do your thang. */
- slotIncidenceAdded( msg->tqparent(), msg->getMsgSerNum() );
+ slotIncidenceAdded( msg->parent(), msg->getMsgSerNum() );
}
if ( mTheUnGetMes.contains( sernum ) ) {
@@ -687,10 +687,10 @@ static TQString subresourceLabelForPresentation( const KMFolder * folder )
}
// Another special case is our own folders, under the imap INBOX, make
// those prettier too
- const KMFolder *tqparent = folder;
- while ( tqparent->tqparent() && tqparent->tqparent()->owner() ) {
- tqparent = tqparent->tqparent()->owner();
- if ( tqparent->isSystemFolder() ) {
+ const KMFolder *parent = folder;
+ while ( parent->parent() && parent->parent()->owner() ) {
+ parent = parent->parent()->owner();
+ if ( parent->isSystemFolder() ) {
TQStringList remainder(parts);
remainder.pop_front();
remainder.pop_front();
@@ -1139,7 +1139,7 @@ void KMailICalIfaceImpl::slotIncidenceAdded( KMFolder* folder,
// go get the rest of it, then try again
// TODO: Till, port me
if ( unget ) mTheUnGetMes.insert( msg->getMsgSerNum(), true );
- FolderJob *job = msg->tqparent()->createJob( msg );
+ FolderJob *job = msg->parent()->createJob( msg );
connect( job, TQT_SIGNAL( messageRetrieved( KMMessage* ) ),
this, TQT_SLOT( slotMessageRetrieved( KMMessage* ) ) );
job->start();
@@ -1385,8 +1385,8 @@ void KMailICalIfaceImpl::deleteMsg( KMMessage *msg )
{
if( !msg ) return;
// Commands are now delayed; can't use that anymore, we need immediate deletion
- //( new KMDeleteMsgCommand( msg->tqparent(), msg ) )->start();
- KMFolder *srcFolder = msg->tqparent();
+ //( new KMDeleteMsgCommand( msg->parent(), msg ) )->start();
+ KMFolder *srcFolder = msg->parent();
int idx = srcFolder->find(msg);
assert(idx != -1);
// kill existing jobs since we are about to delete the message
@@ -1704,7 +1704,7 @@ void KMailICalIfaceImpl::readConfig()
const bool hideFolders = GlobalSettings::self()->hideGroupwareFolders();
TQString parentName = GlobalSettings::self()->theIMAPResourceFolderParent();
- // Find the folder tqparent
+ // Find the folder parent
KMFolderDir* folderParentDir;
KMFolderType folderType;
KMFolder* folderParent = kmkernel->findFolderById( parentName );
@@ -1738,7 +1738,7 @@ void KMailICalIfaceImpl::readConfig()
KMAcctCachedImap::GroupwareType groupwareType = dynamic_cast( folderParent->storage() )->account()->groupwareType();
if ( groupwareType == KMAcctCachedImap::GroupwareKolab ) {
- // Make sure the folder tqparent has the subdirs
+ // Make sure the folder parent has the subdirs
// Globally there are 3 cases: nothing found, some stuff found by type/name heuristics, or everything found OK
bool noneFound = true;
bool mustFix = false; // true when at least one was found by heuristics
@@ -2287,13 +2287,13 @@ bool KMailICalIfaceImpl::isResourceQuiet() const
bool KMailICalIfaceImpl::addSubresource( const TQString& resource,
- const TQString& tqparent,
+ const TQString& parent,
const TQString& contentsType )
{
- kdDebug(5006) << "Adding subresource to tqparent: " << tqparent << " with name: " << resource << endl;
+ kdDebug(5006) << "Adding subresource to parent: " << parent << " with name: " << resource << endl;
kdDebug(5006) << "contents type: " << contentsType << endl;
- KMFolder *folder = findResourceFolder( tqparent );
- KMFolderDir *parentFolderDir = !tqparent.isEmpty() && folder ? folder->createChildFolder(): mFolderParentDir;
+ KMFolder *folder = findResourceFolder( parent );
+ KMFolderDir *parentFolderDir = !parent.isEmpty() && folder ? folder->createChildFolder(): mFolderParentDir;
if ( !parentFolderDir || parentFolderDir->hasNamedFolder( resource ) ) return false;
TQString msg;
@@ -2359,10 +2359,10 @@ void KMailICalIfaceImpl::syncFolder(KMFolder * folder) const
KMFolderCachedImap *dimapFolder = dynamic_cast( folder->storage() );
if ( !dimapFolder )
return;
- // check if the folder exists already, otherwise sync its tqparent as well to create it
+ // check if the folder exists already, otherwise sync its parent as well to create it
if ( dimapFolder->imapPath().isEmpty() ) {
- if ( folder->tqparent() && folder->tqparent()->owner() )
- syncFolder( folder->tqparent()->owner() );
+ if ( folder->parent() && folder->parent()->owner() )
+ syncFolder( folder->parent()->owner() );
else
return;
}
diff --git a/kmail/kmailicalifaceimpl.h b/kmail/kmailicalifaceimpl.h
index 3cec23c62..90765ed73 100644
--- a/kmail/kmailicalifaceimpl.h
+++ b/kmail/kmailicalifaceimpl.h
@@ -136,7 +136,7 @@ public:
bool removeSubresource( const TQString& );
bool addSubresource( const TQString& resource,
- const TQString& tqparent,
+ const TQString& parent,
const TQString& contentsType );
// tell KOrganizer about messages to be deleted
diff --git a/kmail/kmatmlistview.cpp b/kmail/kmatmlistview.cpp
index 7a507c3f1..d1300f840 100644
--- a/kmail/kmatmlistview.cpp
+++ b/kmail/kmatmlistview.cpp
@@ -9,9 +9,9 @@
#include
#include
-KMAtmListViewItem::KMAtmListViewItem( TQListView *tqparent )
+KMAtmListViewItem::KMAtmListViewItem( TQListView *parent )
: TQObject(),
- TQListViewItem( tqparent )
+ TQListViewItem( parent )
{
mCBCompress = new TQCheckBox( listView()->viewport() );
mCBEncrypt = new TQCheckBox( listView()->viewport() );
diff --git a/kmail/kmatmlistview.h b/kmail/kmatmlistview.h
index 72ae6e25b..f69ea96ae 100644
--- a/kmail/kmatmlistview.h
+++ b/kmail/kmatmlistview.h
@@ -18,7 +18,7 @@ class KMAtmListViewItem : public TQObject, public TQListViewItem
TQ_OBJECT
public:
- KMAtmListViewItem( TQListView *tqparent );
+ KMAtmListViewItem( TQListView *parent );
virtual ~KMAtmListViewItem();
//A custom compare function is needed because the size column is
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index bdd700bf8..5990a4873 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -156,28 +156,28 @@ private:
};
-KMCommand::KMCommand( TQWidget *tqparent )
+KMCommand::KMCommand( TQWidget *parent )
: mProgressDialog( 0 ), mResult( Undefined ), mDeletesItself( false ),
- mEmitsCompletedItself( false ), mParent( tqparent )
+ mEmitsCompletedItself( false ), mParent( parent )
{
}
-KMCommand::KMCommand( TQWidget *tqparent, const TQPtrList &msgList )
+KMCommand::KMCommand( TQWidget *parent, const TQPtrList &msgList )
: mProgressDialog( 0 ), mResult( Undefined ), mDeletesItself( false ),
- mEmitsCompletedItself( false ), mParent( tqparent ), mMsgList( msgList )
+ mEmitsCompletedItself( false ), mParent( parent ), mMsgList( msgList )
{
}
-KMCommand::KMCommand( TQWidget *tqparent, KMMsgBase *msgBase )
+KMCommand::KMCommand( TQWidget *parent, KMMsgBase *msgBase )
: mProgressDialog( 0 ), mResult( Undefined ), mDeletesItself( false ),
- mEmitsCompletedItself( false ), mParent( tqparent )
+ mEmitsCompletedItself( false ), mParent( parent )
{
mMsgList.append( msgBase );
}
-KMCommand::KMCommand( TQWidget *tqparent, KMMessage *msg )
+KMCommand::KMCommand( TQWidget *parent, KMMessage *msg )
: mProgressDialog( 0 ), mResult( Undefined ), mDeletesItself( false ),
- mEmitsCompletedItself( false ), mParent( tqparent )
+ mEmitsCompletedItself( false ), mParent( parent )
{
if (msg)
mMsgList.append( &msg->toMsgBase() );
@@ -236,7 +236,7 @@ void KMCommand::slotStart()
if ((mMsgList.count() == 1) &&
(mMsgList.getFirst()->isMessage()) &&
- (mMsgList.getFirst()->tqparent() == 0))
+ (mMsgList.getFirst()->parent() == 0))
{
// Special case of operating on message that isn't in a folder
mRetrievedMsgs.append((KMMessage*)mMsgList.getFirst());
@@ -246,11 +246,11 @@ void KMCommand::slotStart()
for ( KMMsgBase *mb = mMsgList.first(); mb; mb = mMsgList.next() ) {
if ( mb ) {
- if ( !mb->tqparent() ) {
+ if ( !mb->parent() ) {
emit messagesTransfered( Failed );
return;
} else {
- keepFolderOpen( mb->tqparent() );
+ keepFolderOpen( mb->parent() );
}
}
}
@@ -271,7 +271,7 @@ void KMCommand::slotPostTransfer( KMCommand::Result result )
while ( (msg = it.current()) != 0 )
{
++it;
- if (msg->tqparent())
+ if (msg->parent())
msg->setTransferInProgress(false);
}
kmkernel->filterMgr()->deref();
@@ -315,27 +315,27 @@ void KMCommand::transferSelectedMsgs()
thisMsg = static_cast(mb);
else
{
- KMFolder *folder = mb->tqparent();
+ KMFolder *folder = mb->parent();
int idx = folder->find(mb);
if (idx < 0) continue;
thisMsg = folder->getMsg(idx);
}
if (!thisMsg) continue;
if ( thisMsg->transferInProgress() &&
- thisMsg->tqparent()->folderType() == KMFolderTypeImap )
+ thisMsg->parent()->folderType() == KMFolderTypeImap )
{
thisMsg->setTransferInProgress( false, true );
- thisMsg->tqparent()->ignoreJobsForMessage( thisMsg );
+ thisMsg->parent()->ignoreJobsForMessage( thisMsg );
}
- if ( thisMsg->tqparent() && !thisMsg->isComplete() &&
+ if ( thisMsg->parent() && !thisMsg->isComplete() &&
( !mProgressDialog || !mProgressDialog->wasCancelled() ) )
{
kdDebug(5006)<<"### INCOMPLETE\n";
// the message needs to be transferred first
complete = false;
KMCommand::mCountJobs++;
- FolderJob *job = thisMsg->tqparent()->createJob(thisMsg);
+ FolderJob *job = thisMsg->parent()->createJob(thisMsg);
job->setCancellable( false );
totalSize += thisMsg->msgSizeServer();
// emitted when the message was transferred successfully
@@ -436,7 +436,7 @@ void KMCommand::slotTransferCancelled()
KMMessage* msg;
while ( (msg = it.current()) != 0 )
{
- KMFolder *folder = msg->tqparent();
+ KMFolder *folder = msg->parent();
++it;
if (!folder)
continue;
@@ -465,8 +465,8 @@ KMCommand::Result KMMailtoComposeCommand::execute()
KMMessage *msg = new KMMessage;
uint id = 0;
- if ( mMessage && mMessage->tqparent() )
- id = mMessage->tqparent()->identity();
+ if ( mMessage && mMessage->parent() )
+ id = mMessage->parent()->identity();
msg->initHeader(id);
msg->setCharset("utf-8");
@@ -481,9 +481,9 @@ KMCommand::Result KMMailtoComposeCommand::execute()
}
-KMMailtoReplyCommand::KMMailtoReplyCommand( TQWidget *tqparent,
+KMMailtoReplyCommand::KMMailtoReplyCommand( TQWidget *parent,
const KURL &url, KMMessage *msg, const TQString &selection )
- :KMCommand( tqparent, msg ), mUrl( url ), mSelection( selection )
+ :KMCommand( parent, msg ), mUrl( url ), mSelection( selection )
{
}
@@ -506,9 +506,9 @@ KMCommand::Result KMMailtoReplyCommand::execute()
}
-KMMailtoForwardCommand::KMMailtoForwardCommand( TQWidget *tqparent,
+KMMailtoForwardCommand::KMMailtoForwardCommand( TQWidget *parent,
const KURL &url, KMMessage *msg )
- :KMCommand( tqparent, msg ), mUrl( url )
+ :KMCommand( parent, msg ), mUrl( url )
{
}
@@ -530,8 +530,8 @@ KMCommand::Result KMMailtoForwardCommand::execute()
}
-KMAddBookmarksCommand::KMAddBookmarksCommand( const KURL &url, TQWidget *tqparent )
- : KMCommand( tqparent ), mUrl( url )
+KMAddBookmarksCommand::KMAddBookmarksCommand( const KURL &url, TQWidget *parent )
+ : KMCommand( parent ), mUrl( url )
{
}
@@ -550,8 +550,8 @@ KMCommand::Result KMAddBookmarksCommand::execute()
}
KMMailtoAddAddrBookCommand::KMMailtoAddAddrBookCommand( const KURL &url,
- TQWidget *tqparent )
- : KMCommand( tqparent ), mUrl( url )
+ TQWidget *parent )
+ : KMCommand( parent ), mUrl( url )
{
}
@@ -565,8 +565,8 @@ KMCommand::Result KMMailtoAddAddrBookCommand::execute()
KMMailtoOpenAddrBookCommand::KMMailtoOpenAddrBookCommand( const KURL &url,
- TQWidget *tqparent )
- : KMCommand( tqparent ), mUrl( url )
+ TQWidget *parent )
+ : KMCommand( parent ), mUrl( url )
{
}
@@ -623,8 +623,8 @@ KMCommand::Result KMUrlOpenCommand::execute()
}
-KMUrlSaveCommand::KMUrlSaveCommand( const KURL &url, TQWidget *tqparent )
- : KMCommand( tqparent ), mUrl( url )
+KMUrlSaveCommand::KMUrlSaveCommand( const KURL &url, TQWidget *parent )
+ : KMCommand( parent ), mUrl( url )
{
}
@@ -664,45 +664,45 @@ void KMUrlSaveCommand::slotUrlSaveResult( KIO::Job *job )
}
-KMEditMsgCommand::KMEditMsgCommand( TQWidget *tqparent, KMMessage *msg )
- :KMCommand( tqparent, msg )
+KMEditMsgCommand::KMEditMsgCommand( TQWidget *parent, KMMessage *msg )
+ :KMCommand( parent, msg )
{
}
KMCommand::Result KMEditMsgCommand::execute()
{
KMMessage *msg = retrievedMessage();
- if ( !msg || !msg->tqparent() ||
- ( !kmkernel->folderIsDraftOrOutbox( msg->tqparent() ) &&
- !kmkernel->folderIsTemplates( msg->tqparent() ) ) )
+ if ( !msg || !msg->parent() ||
+ ( !kmkernel->folderIsDraftOrOutbox( msg->parent() ) &&
+ !kmkernel->folderIsTemplates( msg->parent() ) ) )
return Failed;
- // Remember the old tqparent, we need it a bit further down to be able
+ // Remember the old parent, we need it a bit further down to be able
// to put the unchanged messsage back in the original folder if the nth
// edit is discarded, for n > 1.
- KMFolder *tqparent = msg->tqparent();
- if ( tqparent )
- tqparent->take( tqparent->find( msg ) );
+ KMFolder *parent = msg->parent();
+ if ( parent )
+ parent->take( parent->find( msg ) );
KMail::Composer * win = KMail::makeComposer();
msg->setTransferInProgress(false); // From here on on, the composer owns the message.
win->setMsg(msg, false, true);
- win->setFolder( tqparent );
+ win->setFolder( parent );
win->show();
return OK;
}
-KMUseTemplateCommand::KMUseTemplateCommand( TQWidget *tqparent, KMMessage *msg )
- :KMCommand( tqparent, msg )
+KMUseTemplateCommand::KMUseTemplateCommand( TQWidget *parent, KMMessage *msg )
+ :KMCommand( parent, msg )
{
}
KMCommand::Result KMUseTemplateCommand::execute()
{
KMMessage *msg = retrievedMessage();
- if ( !msg || !msg->tqparent() ||
- !kmkernel->folderIsTemplates( msg->tqparent() ) )
+ if ( !msg || !msg->parent() ||
+ !kmkernel->folderIsTemplates( msg->parent() ) )
return Failed;
// Take a copy of the original message, which remains unchanged.
@@ -721,9 +721,9 @@ KMCommand::Result KMUseTemplateCommand::execute()
return OK;
}
-KMShowMsgSrcCommand::KMShowMsgSrcCommand( TQWidget *tqparent,
+KMShowMsgSrcCommand::KMShowMsgSrcCommand( TQWidget *parent,
KMMessage *msg, bool fixedFont )
- :KMCommand( tqparent, msg ), mFixedFont( fixedFont )
+ :KMCommand( parent, msg ), mFixedFont( fixedFont )
{
// remember complete state
mMsgWasComplete = msg->isComplete();
@@ -782,8 +782,8 @@ static KURL subjectToUrl( const TQString & subject )
return KFileDialog::getSaveURL( cleanSubject, filter );
}
-KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *tqparent, KMMessage * msg )
- : KMCommand( tqparent ),
+KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *parent, KMMessage * msg )
+ : KMCommand( parent ),
mMsgListIndex( 0 ),
mStandAloneMessage( 0 ),
mOffset( 0 ),
@@ -797,8 +797,8 @@ KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *tqparent, KMMessage * msg )
// from an .eml file.
if ( msg->getMsgSerNum() != 0 ) {
mMsgList.append( msg->getMsgSerNum() );
- if ( msg->tqparent() ) {
- msg->tqparent()->open( "kmsavemsgcommand" );
+ if ( msg->parent() ) {
+ msg->parent()->open( "kmsavemsgcommand" );
}
} else {
mStandAloneMessage = msg;
@@ -806,9 +806,9 @@ KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *tqparent, KMMessage * msg )
mUrl = subjectToUrl( msg->cleanSubject() );
}
-KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *tqparent,
+KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *parent,
const TQPtrList &msgList )
- : KMCommand( tqparent ),
+ : KMCommand( parent ),
mMsgListIndex( 0 ),
mStandAloneMessage( 0 ),
mOffset( 0 ),
@@ -826,8 +826,8 @@ KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *tqparent,
while ( it.current() ) {
mMsgList.append( (*it)->getMsgSerNum() );
mTotalSize += (*it)->msgSize();
- if ((*it)->tqparent() != 0)
- (*it)->tqparent()->open("kmcommand");
+ if ((*it)->parent() != 0)
+ (*it)->parent()->open("kmcommand");
++it;
}
mMsgListIndex = 0;
@@ -895,8 +895,8 @@ void KMSaveMsgCommand::slotSaveDataReq()
slotMessageRetrievedForSaving( msg );
} else {
// retrieve Message first
- if ( msg->tqparent() && !msg->isComplete() ) {
- FolderJob *job = msg->tqparent()->createJob( msg );
+ if ( msg->parent() && !msg->isComplete() ) {
+ FolderJob *job = msg->parent()->createJob( msg );
job->setCancellable( false );
connect(job, TQT_SIGNAL( messageRetrieved( KMMessage* ) ),
this, TQT_SLOT( slotMessageRetrievedForSaving( KMMessage* ) ) );
@@ -944,12 +944,12 @@ void KMSaveMsgCommand::slotMessageRetrievedForSaving(KMMessage *msg)
}
++mMsgListIndex;
// Get rid of the message.
- if ( msg && msg->tqparent() && msg->getMsgSerNum() &&
+ if ( msg && msg->parent() && msg->getMsgSerNum() &&
mUngetMsgs.contains( msg ) ) {
int idx = -1;
KMFolder * p = 0;
KMMsgDict::instance()->getLocation( msg, &p, &idx );
- assert( p == msg->tqparent() ); assert( idx >= 0 );
+ assert( p == msg->parent() ); assert( idx >= 0 );
p->unGetMsg( idx );
p->close("kmcommand");
}
@@ -993,9 +993,9 @@ void KMSaveMsgCommand::slotSaveResult(KIO::Job *job)
//-----------------------------------------------------------------------------
-KMOpenMsgCommand::KMOpenMsgCommand( TQWidget *tqparent, const KURL & url,
+KMOpenMsgCommand::KMOpenMsgCommand( TQWidget *parent, const KURL & url,
const TQString & encoding )
- : KMCommand( tqparent ),
+ : KMCommand( parent ),
mUrl( url ),
mEncoding( encoding )
{
@@ -1102,9 +1102,9 @@ void KMOpenMsgCommand::slotResult( KIO::Job *job )
//TODO: ReplyTo, NoQuoteReplyTo, ReplyList, ReplyToAll, ReplyAuthor
// are all similar and should be factored
-KMReplyToCommand::KMReplyToCommand( TQWidget *tqparent, KMMessage *msg,
+KMReplyToCommand::KMReplyToCommand( TQWidget *parent, KMMessage *msg,
const TQString &selection )
- : KMCommand( tqparent, msg ), mSelection( selection )
+ : KMCommand( parent, msg ), mSelection( selection )
{
}
@@ -1125,9 +1125,9 @@ KMCommand::Result KMReplyToCommand::execute()
}
-KMNoQuoteReplyToCommand::KMNoQuoteReplyToCommand( TQWidget *tqparent,
+KMNoQuoteReplyToCommand::KMNoQuoteReplyToCommand( TQWidget *parent,
KMMessage *msg )
- : KMCommand( tqparent, msg )
+ : KMCommand( parent, msg )
{
}
@@ -1148,9 +1148,9 @@ KMCommand::Result KMNoQuoteReplyToCommand::execute()
}
-KMReplyListCommand::KMReplyListCommand( TQWidget *tqparent,
+KMReplyListCommand::KMReplyListCommand( TQWidget *parent,
KMMessage *msg, const TQString &selection )
- : KMCommand( tqparent, msg ), mSelection( selection )
+ : KMCommand( parent, msg ), mSelection( selection )
{
}
@@ -1171,9 +1171,9 @@ KMCommand::Result KMReplyListCommand::execute()
}
-KMReplyToAllCommand::KMReplyToAllCommand( TQWidget *tqparent,
+KMReplyToAllCommand::KMReplyToAllCommand( TQWidget *parent,
KMMessage *msg, const TQString &selection )
- :KMCommand( tqparent, msg ), mSelection( selection )
+ :KMCommand( parent, msg ), mSelection( selection )
{
}
@@ -1194,9 +1194,9 @@ KMCommand::Result KMReplyToAllCommand::execute()
}
-KMReplyAuthorCommand::KMReplyAuthorCommand( TQWidget *tqparent, KMMessage *msg,
+KMReplyAuthorCommand::KMReplyAuthorCommand( TQWidget *parent, KMMessage *msg,
const TQString &selection )
- : KMCommand( tqparent, msg ), mSelection( selection )
+ : KMCommand( parent, msg ), mSelection( selection )
{
}
@@ -1217,16 +1217,16 @@ KMCommand::Result KMReplyAuthorCommand::execute()
}
-KMForwardInlineCommand::KMForwardInlineCommand( TQWidget *tqparent,
+KMForwardInlineCommand::KMForwardInlineCommand( TQWidget *parent,
const TQPtrList &msgList, uint identity )
- : KMCommand( tqparent, msgList ),
+ : KMCommand( parent, msgList ),
mIdentity( identity )
{
}
-KMForwardInlineCommand::KMForwardInlineCommand( TQWidget *tqparent,
+KMForwardInlineCommand::KMForwardInlineCommand( TQWidget *parent,
KMMessage *msg, uint identity )
- : KMCommand( tqparent, msg ),
+ : KMCommand( parent, msg ),
mIdentity( identity )
{
}
@@ -1290,16 +1290,16 @@ KMCommand::Result KMForwardInlineCommand::execute()
}
-KMForwardAttachedCommand::KMForwardAttachedCommand( TQWidget *tqparent,
+KMForwardAttachedCommand::KMForwardAttachedCommand( TQWidget *parent,
const TQPtrList &msgList, uint identity, KMail::Composer *win )
- : KMCommand( tqparent, msgList ), mIdentity( identity ),
+ : KMCommand( parent, msgList ), mIdentity( identity ),
mWin( TQGuardedPtr( win ))
{
}
-KMForwardAttachedCommand::KMForwardAttachedCommand( TQWidget *tqparent,
+KMForwardAttachedCommand::KMForwardAttachedCommand( TQWidget *parent,
KMMessage * msg, uint identity, KMail::Composer *win )
- : KMCommand( tqparent, msg ), mIdentity( identity ),
+ : KMCommand( parent, msg ), mIdentity( identity ),
mWin( TQGuardedPtr< KMail::Composer >( win ))
{
}
@@ -1353,16 +1353,16 @@ KMCommand::Result KMForwardAttachedCommand::execute()
}
-KMForwardDigestCommand::KMForwardDigestCommand( TQWidget *tqparent,
+KMForwardDigestCommand::KMForwardDigestCommand( TQWidget *parent,
const TQPtrList &msgList, uint identity, KMail::Composer *win )
- : KMCommand( tqparent, msgList ), mIdentity( identity ),
+ : KMCommand( parent, msgList ), mIdentity( identity ),
mWin( TQGuardedPtr( win ))
{
}
-KMForwardDigestCommand::KMForwardDigestCommand( TQWidget *tqparent,
+KMForwardDigestCommand::KMForwardDigestCommand( TQWidget *parent,
KMMessage * msg, uint identity, KMail::Composer *win )
- : KMCommand( tqparent, msg ), mIdentity( identity ),
+ : KMCommand( parent, msg ), mIdentity( identity ),
mWin( TQGuardedPtr< KMail::Composer >( win ))
{
}
@@ -1440,9 +1440,9 @@ KMCommand::Result KMForwardDigestCommand::execute()
return OK;
}
-KMRedirectCommand::KMRedirectCommand( TQWidget *tqparent,
+KMRedirectCommand::KMRedirectCommand( TQWidget *parent,
KMMessage *msg )
- : KMCommand( tqparent, msg )
+ : KMCommand( parent, msg )
{
}
@@ -1470,10 +1470,10 @@ KMCommand::Result KMRedirectCommand::execute()
}
-KMCustomReplyToCommand::KMCustomReplyToCommand( TQWidget *tqparent, KMMessage *msg,
+KMCustomReplyToCommand::KMCustomReplyToCommand( TQWidget *parent, KMMessage *msg,
const TQString &selection,
const TQString &tmpl )
- : KMCommand( tqparent, msg ), mSelection( selection ), mTemplate( tmpl )
+ : KMCommand( parent, msg ), mSelection( selection ), mTemplate( tmpl )
{
}
@@ -1495,10 +1495,10 @@ KMCommand::Result KMCustomReplyToCommand::execute()
}
-KMCustomReplyAllToCommand::KMCustomReplyAllToCommand( TQWidget *tqparent, KMMessage *msg,
+KMCustomReplyAllToCommand::KMCustomReplyAllToCommand( TQWidget *parent, KMMessage *msg,
const TQString &selection,
const TQString &tmpl )
- : KMCommand( tqparent, msg ), mSelection( selection ), mTemplate( tmpl )
+ : KMCommand( parent, msg ), mSelection( selection ), mTemplate( tmpl )
{
}
@@ -1520,16 +1520,16 @@ KMCommand::Result KMCustomReplyAllToCommand::execute()
}
-KMCustomForwardCommand::KMCustomForwardCommand( TQWidget *tqparent,
+KMCustomForwardCommand::KMCustomForwardCommand( TQWidget *parent,
const TQPtrList &msgList, uint identity, const TQString &tmpl )
- : KMCommand( tqparent, msgList ),
+ : KMCommand( parent, msgList ),
mIdentity( identity ), mTemplate( tmpl )
{
}
-KMCustomForwardCommand::KMCustomForwardCommand( TQWidget *tqparent,
+KMCustomForwardCommand::KMCustomForwardCommand( TQWidget *parent,
KMMessage *msg, uint identity, const TQString &tmpl )
- : KMCommand( tqparent, msg ),
+ : KMCommand( parent, msg ),
mIdentity( identity ), mTemplate( tmpl )
{
}
@@ -1593,12 +1593,12 @@ KMCommand::Result KMCustomForwardCommand::execute()
}
-KMPrintCommand::KMPrintCommand( TQWidget *tqparent, KMMessage *msg,
+KMPrintCommand::KMPrintCommand( TQWidget *parent, KMMessage *msg,
const KMail::HeaderStyle *headerStyle,
const KMail::HeaderStrategy *headerStrategy,
bool htmlOverride, bool htmlLoadExtOverride,
bool useFixedFont, const TQString & encoding )
- : KMCommand( tqparent, msg ),
+ : KMCommand( parent, msg ),
mHeaderStyle( headerStyle ), mHeaderStrategy( headerStrategy ),
mHtmlOverride( htmlOverride ),
mHtmlLoadExtOverride( htmlLoadExtOverride ),
@@ -1653,7 +1653,7 @@ KMCommand::Result KMSeStatusCommand::execute()
bool parentqStatus = false;
// Toggle actions on threads toggle the whole thread
- // depending on the state of the tqparent.
+ // depending on the state of the parent.
if (mToggle) {
KMMsgBase *msg;
KMMsgDict::instance()->getLocation( *mSerNums.begin(), &folder, &idx );
@@ -1712,10 +1712,10 @@ KMCommand::Result KMFilterCommand::execute()
}
-KMFilterActionCommand::KMFilterActionCommand( TQWidget *tqparent,
+KMFilterActionCommand::KMFilterActionCommand( TQWidget *parent,
const TQPtrList &msgList,
KMFilter *filter )
- : KMCommand( tqparent, msgList ), mFilter( filter )
+ : KMCommand( parent, msgList ), mFilter( filter )
{
TQPtrListIterator it(msgList);
while ( it.current() ) {
@@ -1821,9 +1821,9 @@ void FolderShortcutCommand::setAction( KAction* action )
mAction = action;
}
-KMMailingListFilterCommand::KMMailingListFilterCommand( TQWidget *tqparent,
+KMMailingListFilterCommand::KMMailingListFilterCommand( TQWidget *parent,
KMMessage *msg )
- : KMCommand( tqparent, msg )
+ : KMCommand( parent, msg )
{
}
@@ -1984,7 +1984,7 @@ KMCommand::Result KMCopyCommand::execute()
for (msgBase = mMsgList.first(); msgBase; msgBase = mMsgList.next() )
{
- KMFolder *srcFolder = msgBase->tqparent();
+ KMFolder *srcFolder = msgBase->parent();
if (( isMessage = msgBase->isMessage() ))
{
msg = static_cast(msgBase);
@@ -2020,7 +2020,7 @@ KMCommand::Result KMCopyCommand::execute()
if (srcFolder && !newMsg->isComplete())
{
// imap => others
- newMsg->setParent(msg->tqparent());
+ newMsg->setParent(msg->parent());
FolderJob *job = srcFolder->createJob(newMsg);
job->setCancellable( false );
mPendingJobs << job;
@@ -2473,19 +2473,19 @@ KMCommand::Result KMUrlClickedCommand::execute()
return OK;
}
-KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *tqparent, KMMessage *msg )
- : KMCommand( tqparent, msg ), mImplicitAttachments( true ), mEncoded( false )
+KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *parent, KMMessage *msg )
+ : KMCommand( parent, msg ), mImplicitAttachments( true ), mEncoded( false )
{
}
-KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *tqparent, const TQPtrList& msgs )
- : KMCommand( tqparent, msgs ), mImplicitAttachments( true ), mEncoded( false )
+KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *parent, const TQPtrList& msgs )
+ : KMCommand( parent, msgs ), mImplicitAttachments( true ), mEncoded( false )
{
}
-KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *tqparent, TQPtrList& attachments,
+KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *parent, TQPtrList& attachments,
KMMessage *msg, bool encoded )
- : KMCommand( tqparent ), mImplicitAttachments( false ), mEncoded( encoded )
+ : KMCommand( parent ), mImplicitAttachments( false ), mEncoded( encoded )
{
for ( TQPtrListIterator it( attachments ); it.current(); ++it ) {
mAttachmentMap.insert( it.current(), msg );
@@ -2759,7 +2759,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node,
}
// #79685 by default use the umask the user defined, but let it be configurable
- if ( GlobalSettings::self()->disregardUtqmask() )
+ if ( GlobalSettings::self()->disregardUmask() )
fchmod( file.handle(), S_IRUSR | S_IWUSR );
ds.setDevice( &file );
@@ -2814,7 +2814,7 @@ void KMLoadPartsCommand::slotStart()
!it.key()->msgPart().partSpecifier().isEmpty() ) {
// incomplete part, so retrieve it first
++mNeedsRetrieval;
- KMFolder* curFolder = it.data()->tqparent();
+ KMFolder* curFolder = it.data()->parent();
if ( curFolder ) {
FolderJob *job =
curFolder->createJob( it.data(), FolderJob::tGetMessage,
@@ -2824,7 +2824,7 @@ void KMLoadPartsCommand::slotStart()
this, TQT_SLOT(slotPartRetrieved(KMMessage*, TQString)) );
job->start();
} else
- kdWarning(5006) << "KMLoadPartsCommand - msg has no tqparent" << endl;
+ kdWarning(5006) << "KMLoadPartsCommand - msg has no parent" << endl;
}
}
if ( mNeedsRetrieval == 0 )
@@ -2860,9 +2860,9 @@ KMCommand::Result KMLoadPartsCommand::execute()
return OK;
}
-KMResendMessageCommand::KMResendMessageCommand( TQWidget *tqparent,
+KMResendMessageCommand::KMResendMessageCommand( TQWidget *parent,
KMMessage *msg )
- :KMCommand( tqparent, msg )
+ :KMCommand( parent, msg )
{
}
@@ -2892,8 +2892,8 @@ KMCommand::Result KMResendMessageCommand::execute()
return OK;
}
-KMMailingListCommand::KMMailingListCommand( TQWidget *tqparent, KMFolder *folder )
- : KMCommand( tqparent ), mFolder( folder )
+KMMailingListCommand::KMMailingListCommand( TQWidget *parent, KMFolder *folder )
+ : KMCommand( parent ), mFolder( folder )
{
}
@@ -2931,8 +2931,8 @@ void KMMailingListCommand::commandCompleted( KMCommand *command )
deleteLater();
}
-KMMailingListPostCommand::KMMailingListPostCommand( TQWidget *tqparent, KMFolder *folder )
- : KMMailingListCommand( tqparent, folder )
+KMMailingListPostCommand::KMMailingListPostCommand( TQWidget *parent, KMFolder *folder )
+ : KMMailingListCommand( parent, folder )
{
}
KURL::List KMMailingListPostCommand::urls() const
@@ -2940,8 +2940,8 @@ KURL::List KMMailingListPostCommand::urls() const
return mFolder->mailingList().postURLS();
}
-KMMailingListSubscribeCommand::KMMailingListSubscribeCommand( TQWidget *tqparent, KMFolder *folder )
- : KMMailingListCommand( tqparent, folder )
+KMMailingListSubscribeCommand::KMMailingListSubscribeCommand( TQWidget *parent, KMFolder *folder )
+ : KMMailingListCommand( parent, folder )
{
}
KURL::List KMMailingListSubscribeCommand::urls() const
@@ -2949,8 +2949,8 @@ KURL::List KMMailingListSubscribeCommand::urls() const
return mFolder->mailingList().subscribeURLS();
}
-KMMailingListUnsubscribeCommand::KMMailingListUnsubscribeCommand( TQWidget *tqparent, KMFolder *folder )
- : KMMailingListCommand( tqparent, folder )
+KMMailingListUnsubscribeCommand::KMMailingListUnsubscribeCommand( TQWidget *parent, KMFolder *folder )
+ : KMMailingListCommand( parent, folder )
{
}
KURL::List KMMailingListUnsubscribeCommand::urls() const
@@ -2958,8 +2958,8 @@ KURL::List KMMailingListUnsubscribeCommand::urls() const
return mFolder->mailingList().unsubscribeURLS();
}
-KMMailingListArchivesCommand::KMMailingListArchivesCommand( TQWidget *tqparent, KMFolder *folder )
- : KMMailingListCommand( tqparent, folder )
+KMMailingListArchivesCommand::KMMailingListArchivesCommand( TQWidget *parent, KMFolder *folder )
+ : KMMailingListCommand( parent, folder )
{
}
KURL::List KMMailingListArchivesCommand::urls() const
@@ -2967,8 +2967,8 @@ KURL::List KMMailingListArchivesCommand::urls() const
return mFolder->mailingList().archiveURLS();
}
-KMMailingListHelpCommand::KMMailingListHelpCommand( TQWidget *tqparent, KMFolder *folder )
- : KMMailingListCommand( tqparent, folder )
+KMMailingListHelpCommand::KMMailingListHelpCommand( TQWidget *parent, KMFolder *folder )
+ : KMMailingListCommand( parent, folder )
{
}
KURL::List KMMailingListHelpCommand::urls() const
@@ -3022,8 +3022,8 @@ KMCommand::Result KMIMChatCommand::execute()
KMHandleAttachmentCommand::KMHandleAttachmentCommand( partNode* node,
KMMessage* msg, int atmId, const TQString& atmName,
- AttachmentAction action, KService::Ptr offer, TQWidget* tqparent )
-: KMCommand( tqparent ), mNode( node ), mMsg( msg ), mAtmId( atmId ), mAtmName( atmName ),
+ AttachmentAction action, KService::Ptr offer, TQWidget* parent )
+: KMCommand( parent ), mNode( node ), mMsg( msg ), mAtmId( atmId ), mAtmName( atmName ),
mAction( action ), mOffer( offer ), mJob( 0 )
{
}
@@ -3349,15 +3349,15 @@ void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusUploadResult( KIO::Job
}
-AttachmentModifyCommand::AttachmentModifyCommand(partNode * node, KMMessage * msg, TQWidget * tqparent) :
- KMCommand( tqparent, msg ),
+AttachmentModifyCommand::AttachmentModifyCommand(partNode * node, KMMessage * msg, TQWidget * parent) :
+ KMCommand( parent, msg ),
mPartIndex( node->nodeId() ),
mSernum( 0 )
{
}
-AttachmentModifyCommand::AttachmentModifyCommand( int nodeId, KMMessage *msg, TQWidget *tqparent )
- : KMCommand( tqparent, msg ),
+AttachmentModifyCommand::AttachmentModifyCommand( int nodeId, KMMessage *msg, TQWidget *parent )
+ : KMCommand( parent, msg ),
mPartIndex( nodeId ),
mSernum( 0 )
{
@@ -3374,7 +3374,7 @@ KMCommand::Result AttachmentModifyCommand::execute()
return Failed;
mSernum = msg->getMsgSerNum();
- mFolder = msg->tqparent();
+ mFolder = msg->parent();
if ( !mFolder || !mFolder->storage() )
return Failed;
@@ -3427,14 +3427,14 @@ void AttachmentModifyCommand::messageDeleteResult(KMCommand * cmd)
deleteLater();
}
-KMDeleteAttachmentCommand::KMDeleteAttachmentCommand(partNode * node, KMMessage * msg, TQWidget * tqparent) :
- AttachmentModifyCommand( node, msg, tqparent )
+KMDeleteAttachmentCommand::KMDeleteAttachmentCommand(partNode * node, KMMessage * msg, TQWidget * parent) :
+ AttachmentModifyCommand( node, msg, parent )
{
kdDebug(5006) << k_funcinfo << endl;
}
-KMDeleteAttachmentCommand::KMDeleteAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *tqparent )
- : AttachmentModifyCommand( nodeId, msg, tqparent )
+KMDeleteAttachmentCommand::KMDeleteAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *parent )
+ : AttachmentModifyCommand( nodeId, msg, parent )
{
kdDebug(5006) << k_funcinfo << endl;
}
@@ -3459,15 +3459,15 @@ KMCommand::Result KMDeleteAttachmentCommand::doAttachmentModify()
}
-KMEditAttachmentCommand::KMEditAttachmentCommand(partNode * node, KMMessage * msg, TQWidget * tqparent) :
- AttachmentModifyCommand( node, msg, tqparent )
+KMEditAttachmentCommand::KMEditAttachmentCommand(partNode * node, KMMessage * msg, TQWidget * parent) :
+ AttachmentModifyCommand( node, msg, parent )
{
kdDebug(5006) << k_funcinfo << endl;
mTempFile.setAutoDelete( true );
}
-KMEditAttachmentCommand::KMEditAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *tqparent )
- : AttachmentModifyCommand( nodeId, msg, tqparent )
+KMEditAttachmentCommand::KMEditAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *parent )
+ : AttachmentModifyCommand( nodeId, msg, parent )
{
kdDebug(5006) << k_funcinfo << endl;
mTempFile.setAutoDelete( true );
@@ -3549,8 +3549,8 @@ void KMEditAttachmentCommand::editDone(KMail::EditorWatcher * watcher)
}
-CreateTodoCommand::CreateTodoCommand(TQWidget * tqparent, KMMessage * msg)
- : KMCommand( tqparent, msg )
+CreateTodoCommand::CreateTodoCommand(TQWidget * parent, KMMessage * msg)
+ : KMCommand( parent, msg )
{
}
diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h
index 8ebe68b15..4bc86ec05 100644
--- a/kmail/kmcommands.h
+++ b/kmail/kmcommands.h
@@ -58,13 +58,13 @@ public:
enum Result { Undefined, OK, Canceled, Failed };
// Trival constructor, don't retrieve any messages
- KMCommand( TQWidget *tqparent = 0 );
+ KMCommand( TQWidget *parent = 0 );
// Retrieve all messages in msgList when start is called.
- KMCommand( TQWidget *tqparent, const TQPtrList &msgList );
+ KMCommand( TQWidget *parent, const TQPtrList &msgList );
// Retrieve the single message msgBase when start is called.
- KMCommand( TQWidget *tqparent, KMMsgBase *msgBase );
+ KMCommand( TQWidget *parent, KMMsgBase *msgBase );
// Retrieve the single message msgBase when start is called.
- KMCommand( TQWidget *tqparent, KMMessage *message );
+ KMCommand( TQWidget *parent, KMMessage *message );
virtual ~KMCommand();
/** These folders will be closed by the dtor, handy, if you need to keep
@@ -98,7 +98,7 @@ protected:
const TQPtrList retrievedMsgs() const;
// Returns the single message retrieved
KMMessage *retrievedMessage() const;
- // Returns the tqparent widget
+ // Returns the parent widget
TQWidget *parentWidget() const;
bool deletesItself() { return mDeletesItself; }
@@ -183,7 +183,7 @@ class KDE_EXPORT KMMailtoReplyCommand : public KMCommand
TQ_OBJECT
public:
- KMMailtoReplyCommand( TQWidget *tqparent, const KURL &url,
+ KMMailtoReplyCommand( TQWidget *parent, const KURL &url,
KMMessage *msg, const TQString &selection );
private:
@@ -199,7 +199,7 @@ class KDE_EXPORT KMMailtoForwardCommand : public KMCommand
TQ_OBJECT
public:
- KMMailtoForwardCommand( TQWidget *tqparent, const KURL &url,
+ KMMailtoForwardCommand( TQWidget *parent, const KURL &url,
KMMessage *msg );
private:
@@ -214,7 +214,7 @@ class KDE_EXPORT KMMailtoAddAddrBookCommand : public KMCommand
TQ_OBJECT
public:
- KMMailtoAddAddrBookCommand( const KURL &url, TQWidget *tqparent );
+ KMMailtoAddAddrBookCommand( const KURL &url, TQWidget *parent );
private:
virtual Result execute();
@@ -228,7 +228,7 @@ class KDE_EXPORT KMAddBookmarksCommand : public KMCommand
TQ_OBJECT
public:
- KMAddBookmarksCommand( const KURL &url, TQWidget *tqparent );
+ KMAddBookmarksCommand( const KURL &url, TQWidget *parent );
private:
virtual Result execute();
@@ -243,7 +243,7 @@ class KDE_EXPORT KMMailtoOpenAddrBookCommand : public KMCommand
TQ_OBJECT
public:
- KMMailtoOpenAddrBookCommand( const KURL &url, TQWidget *tqparent );
+ KMMailtoOpenAddrBookCommand( const KURL &url, TQWidget *parent );
private:
virtual Result execute();
@@ -287,7 +287,7 @@ class KDE_EXPORT KMUrlSaveCommand : public KMCommand
TQ_OBJECT
public:
- KMUrlSaveCommand( const KURL &url, TQWidget *tqparent );
+ KMUrlSaveCommand( const KURL &url, TQWidget *parent );
private slots:
void slotUrlSaveResult( KIO::Job *job );
@@ -304,7 +304,7 @@ class KDE_EXPORT KMEditMsgCommand : public KMCommand
TQ_OBJECT
public:
- KMEditMsgCommand( TQWidget *tqparent, KMMessage *msg );
+ KMEditMsgCommand( TQWidget *parent, KMMessage *msg );
private:
virtual Result execute();
@@ -316,7 +316,7 @@ class KDE_EXPORT KMUseTemplateCommand : public KMCommand
TQ_OBJECT
public:
- KMUseTemplateCommand( TQWidget *tqparent, KMMessage *msg );
+ KMUseTemplateCommand( TQWidget *parent, KMMessage *msg );
private:
virtual Result execute();
@@ -328,7 +328,7 @@ class KDE_EXPORT KMShowMsgSrcCommand : public KMCommand
TQ_OBJECT
public:
- KMShowMsgSrcCommand( TQWidget *tqparent, KMMessage *msg,
+ KMShowMsgSrcCommand( TQWidget *parent, KMMessage *msg,
bool fixedFont );
virtual Result execute();
@@ -343,8 +343,8 @@ class KDE_EXPORT KMSaveMsgCommand : public KMCommand
TQ_OBJECT
public:
- KMSaveMsgCommand( TQWidget *tqparent, const TQPtrList &msgList );
- KMSaveMsgCommand( TQWidget *tqparent, KMMessage * msg );
+ KMSaveMsgCommand( TQWidget *parent, const TQPtrList &msgList );
+ KMSaveMsgCommand( TQWidget *parent, KMMessage * msg );
KURL url();
private:
@@ -375,7 +375,7 @@ class KDE_EXPORT KMOpenMsgCommand : public KMCommand
TQ_OBJECT
public:
- KMOpenMsgCommand( TQWidget *tqparent, const KURL & url = KURL(),
+ KMOpenMsgCommand( TQWidget *parent, const KURL & url = KURL(),
const TQString & encoding = TQString() );
private:
@@ -399,24 +399,24 @@ class KDE_EXPORT KMSaveAttachmentsCommand : public KMCommand
TQ_OBJECT
public:
/** Use this to save all attachments of the given message.
- @param tqparent The tqparent widget of the command used for message boxes.
+ @param parent The parent widget of the command used for message boxes.
@param msg The message of which the attachments should be saved.
*/
- KMSaveAttachmentsCommand( TQWidget *tqparent, KMMessage *msg );
+ KMSaveAttachmentsCommand( TQWidget *parent, KMMessage *msg );
/** Use this to save all attachments of the given messages.
- @param tqparent The tqparent widget of the command used for message boxes.
+ @param parent The parent widget of the command used for message boxes.
@param msgs The messages of which the attachments should be saved.
*/
- KMSaveAttachmentsCommand( TQWidget *tqparent, const TQPtrList& msgs );
+ KMSaveAttachmentsCommand( TQWidget *parent, const TQPtrList& msgs );
/** Use this to save the specified attachments of the given message.
- @param tqparent The tqparent widget of the command used for message
+ @param parent The parent widget of the command used for message
boxes.
@param attachments The attachments that should be saved.
@param msg The message that the attachments belong to.
@param encoded True if the transport encoding should not be removed
when the attachment is saved.
*/
- KMSaveAttachmentsCommand( TQWidget *tqparent, TQPtrList &attachments,
+ KMSaveAttachmentsCommand( TQWidget *parent, TQPtrList &attachments,
KMMessage *msg, bool encoded = false );
private slots:
@@ -438,7 +438,7 @@ class KDE_EXPORT KMReplyToCommand : public KMCommand
TQ_OBJECT
public:
- KMReplyToCommand( TQWidget *tqparent, KMMessage *msg,
+ KMReplyToCommand( TQWidget *parent, KMMessage *msg,
const TQString &selection = TQString() );
private:
@@ -454,7 +454,7 @@ class KDE_EXPORT KMNoQuoteReplyToCommand : public KMCommand
TQ_OBJECT
public:
- KMNoQuoteReplyToCommand( TQWidget *tqparent, KMMessage *msg );
+ KMNoQuoteReplyToCommand( TQWidget *parent, KMMessage *msg );
private:
virtual Result execute();
@@ -466,7 +466,7 @@ class KMReplyListCommand : public KMCommand
TQ_OBJECT
public:
- KMReplyListCommand( TQWidget *tqparent, KMMessage *msg,
+ KMReplyListCommand( TQWidget *parent, KMMessage *msg,
const TQString &selection = TQString() );
private:
@@ -482,7 +482,7 @@ class KDE_EXPORT KMReplyToAllCommand : public KMCommand
TQ_OBJECT
public:
- KMReplyToAllCommand( TQWidget *tqparent, KMMessage *msg,
+ KMReplyToAllCommand( TQWidget *parent, KMMessage *msg,
const TQString &selection = TQString() );
private:
@@ -498,7 +498,7 @@ class KDE_EXPORT KMReplyAuthorCommand : public KMCommand
TQ_OBJECT
public:
- KMReplyAuthorCommand( TQWidget *tqparent, KMMessage *msg,
+ KMReplyAuthorCommand( TQWidget *parent, KMMessage *msg,
const TQString &selection = TQString() );
private:
@@ -514,9 +514,9 @@ class KDE_EXPORT KMForwardInlineCommand : public KMCommand
TQ_OBJECT
public:
- KMForwardInlineCommand( TQWidget *tqparent, const TQPtrList &msgList,
+ KMForwardInlineCommand( TQWidget *parent, const TQPtrList &msgList,
uint identity = 0 );
- KMForwardInlineCommand( TQWidget *tqparent, KMMessage * msg,
+ KMForwardInlineCommand( TQWidget *parent, KMMessage * msg,
uint identity = 0 );
private:
@@ -532,9 +532,9 @@ class KDE_EXPORT KMForwardAttachedCommand : public KMCommand
TQ_OBJECT
public:
- KMForwardAttachedCommand( TQWidget *tqparent, const TQPtrList &msgList,
+ KMForwardAttachedCommand( TQWidget *parent, const TQPtrList &msgList,
uint identity = 0, KMail::Composer *win = 0 );
- KMForwardAttachedCommand( TQWidget *tqparent, KMMessage * msg,
+ KMForwardAttachedCommand( TQWidget *parent, KMMessage * msg,
uint identity = 0, KMail::Composer *win = 0 );
private:
@@ -550,9 +550,9 @@ class KDE_EXPORT KMForwardDigestCommand : public KMCommand
TQ_OBJECT
public:
- KMForwardDigestCommand( TQWidget *tqparent, const TQPtrList &msgList,
+ KMForwardDigestCommand( TQWidget *parent, const TQPtrList &msgList,
uint identity = 0, KMail::Composer *win = 0 );
- KMForwardDigestCommand( TQWidget *tqparent, KMMessage * msg,
+ KMForwardDigestCommand( TQWidget *parent, KMMessage * msg,
uint identity = 0, KMail::Composer *win = 0 );
private:
@@ -568,7 +568,7 @@ class KDE_EXPORT KMRedirectCommand : public KMCommand
TQ_OBJECT
public:
- KMRedirectCommand( TQWidget *tqparent, KMMessage *msg );
+ KMRedirectCommand( TQWidget *parent, KMMessage *msg );
private:
virtual Result execute();
@@ -580,7 +580,7 @@ class KDE_EXPORT KMCustomReplyToCommand : public KMCommand
TQ_OBJECT
public:
- KMCustomReplyToCommand( TQWidget *tqparent, KMMessage *msg,
+ KMCustomReplyToCommand( TQWidget *parent, KMMessage *msg,
const TQString &selection,
const TQString &tmpl );
@@ -598,7 +598,7 @@ class KDE_EXPORT KMCustomReplyAllToCommand : public KMCommand
TQ_OBJECT
public:
- KMCustomReplyAllToCommand( TQWidget *tqparent, KMMessage *msg,
+ KMCustomReplyAllToCommand( TQWidget *parent, KMMessage *msg,
const TQString &selection,
const TQString &tmpl );
@@ -616,9 +616,9 @@ class KDE_EXPORT KMCustomForwardCommand : public KMCommand
TQ_OBJECT
public:
- KMCustomForwardCommand( TQWidget *tqparent, const TQPtrList &msgList,
+ KMCustomForwardCommand( TQWidget *parent, const TQPtrList &msgList,
uint identity, const TQString &tmpl );
- KMCustomForwardCommand( TQWidget *tqparent, KMMessage * msg,
+ KMCustomForwardCommand( TQWidget *parent, KMMessage * msg,
uint identity, const TQString &tmpl );
private:
@@ -634,7 +634,7 @@ class KDE_EXPORT KMPrintCommand : public KMCommand
TQ_OBJECT
public:
- KMPrintCommand( TQWidget *tqparent, KMMessage *msg,
+ KMPrintCommand( TQWidget *parent, KMMessage *msg,
const KMail::HeaderStyle *headerStyle = 0,
const KMail::HeaderStrategy *headerStrategy = 0,
bool htmlOverride = false,
@@ -697,7 +697,7 @@ class KDE_EXPORT KMFilterActionCommand : public KMCommand
TQ_OBJECT
public:
- KMFilterActionCommand( TQWidget *tqparent,
+ KMFilterActionCommand( TQWidget *parent,
const TQPtrList &msgList,
KMFilter *filter );
@@ -755,7 +755,7 @@ class KDE_EXPORT KMMailingListFilterCommand : public KMCommand
TQ_OBJECT
public:
- KMMailingListFilterCommand( TQWidget *tqparent, KMMessage *msg );
+ KMMailingListFilterCommand( TQWidget *parent, KMMessage *msg );
private:
virtual Result execute();
@@ -910,7 +910,7 @@ class KDE_EXPORT KMResendMessageCommand : public KMCommand
TQ_OBJECT
public:
- KMResendMessageCommand( TQWidget *tqparent, KMMessage *msg=0 );
+ KMResendMessageCommand( TQWidget *parent, KMMessage *msg=0 );
private:
virtual Result execute();
@@ -921,7 +921,7 @@ class KDE_EXPORT KMMailingListCommand : public KMCommand
Q_OBJECT
TQ_OBJECT
public:
- KMMailingListCommand( TQWidget *tqparent, KMFolder *folder );
+ KMMailingListCommand( TQWidget *parent, KMFolder *folder );
private:
virtual Result execute();
private slots:
@@ -937,7 +937,7 @@ class KDE_EXPORT KMMailingListPostCommand : public KMMailingListCommand
Q_OBJECT
TQ_OBJECT
public:
- KMMailingListPostCommand( TQWidget *tqparent, KMFolder *folder );
+ KMMailingListPostCommand( TQWidget *parent, KMFolder *folder );
protected:
virtual KURL::List urls() const;
};
@@ -947,7 +947,7 @@ class KDE_EXPORT KMMailingListSubscribeCommand : public KMMailingListCommand
Q_OBJECT
TQ_OBJECT
public:
- KMMailingListSubscribeCommand( TQWidget *tqparent, KMFolder *folder );
+ KMMailingListSubscribeCommand( TQWidget *parent, KMFolder *folder );
protected:
virtual KURL::List urls() const;
};
@@ -957,7 +957,7 @@ class KDE_EXPORT KMMailingListUnsubscribeCommand : public KMMailingListCommand
Q_OBJECT
TQ_OBJECT
public:
- KMMailingListUnsubscribeCommand( TQWidget *tqparent, KMFolder *folder );
+ KMMailingListUnsubscribeCommand( TQWidget *parent, KMFolder *folder );
protected:
virtual KURL::List urls() const;
};
@@ -967,7 +967,7 @@ class KDE_EXPORT KMMailingListArchivesCommand : public KMMailingListCommand
Q_OBJECT
TQ_OBJECT
public:
- KMMailingListArchivesCommand( TQWidget *tqparent, KMFolder *folder );
+ KMMailingListArchivesCommand( TQWidget *parent, KMFolder *folder );
protected:
virtual KURL::List urls() const;
};
@@ -977,7 +977,7 @@ class KDE_EXPORT KMMailingListHelpCommand : public KMMailingListCommand
Q_OBJECT
TQ_OBJECT
public:
- KMMailingListHelpCommand( TQWidget *tqparent, KMFolder *folder );
+ KMMailingListHelpCommand( TQWidget *parent, KMFolder *folder );
protected:
virtual KURL::List urls() const;
};
@@ -1029,7 +1029,7 @@ public:
* @param offer specify a KService that should handle the "open" action, 0 otherwise
*/
KMHandleAttachmentCommand( partNode* node, KMMessage* msg, int atmId,
- const TQString& atmName, AttachmentAction action, KService::Ptr offer, TQWidget* tqparent );
+ const TQString& atmName, AttachmentAction action, KService::Ptr offer, TQWidget* parent );
signals:
@@ -1095,8 +1095,8 @@ class KDE_EXPORT AttachmentModifyCommand : public KMCommand
Q_OBJECT
TQ_OBJECT
public:
- AttachmentModifyCommand( partNode *node, KMMessage *msg, TQWidget *tqparent );
- AttachmentModifyCommand( int nodeId, KMMessage *msg, TQWidget *tqparent );
+ AttachmentModifyCommand( partNode *node, KMMessage *msg, TQWidget *parent );
+ AttachmentModifyCommand( int nodeId, KMMessage *msg, TQWidget *parent );
~AttachmentModifyCommand();
protected:
@@ -1123,8 +1123,8 @@ class KDE_EXPORT KMDeleteAttachmentCommand : public AttachmentModifyCommand
Q_OBJECT
TQ_OBJECT
public:
- KMDeleteAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *tqparent );
- KMDeleteAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *tqparent );
+ KMDeleteAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *parent );
+ KMDeleteAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *parent );
~KMDeleteAttachmentCommand();
protected:
@@ -1137,8 +1137,8 @@ class KDE_EXPORT KMEditAttachmentCommand : public AttachmentModifyCommand
Q_OBJECT
TQ_OBJECT
public:
- KMEditAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *tqparent );
- KMEditAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *tqparent );
+ KMEditAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *parent );
+ KMEditAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *parent );
~KMEditAttachmentCommand();
protected:
@@ -1156,7 +1156,7 @@ class KDE_EXPORT CreateTodoCommand : public KMCommand
Q_OBJECT
TQ_OBJECT
public:
- CreateTodoCommand( TQWidget *tqparent, KMMessage *msg );
+ CreateTodoCommand( TQWidget *parent, KMMessage *msg );
private:
Result execute();
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index 45daa0c36..2e0906396 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -971,7 +971,7 @@ int KMComposeWin::calcColumnWidth(int which, long allShowing, int width)
void KMComposeWin::rethinkFields(bool fromSlot)
{
//This sucks even more but again no ids. sorry (sven)
- int tqmask, row, numRows;
+ int mask, row, numRows;
long showHeaders;
if (mShowHeaders < 0)
@@ -979,8 +979,8 @@ void KMComposeWin::rethinkFields(bool fromSlot)
else
showHeaders = mShowHeaders;
- for (tqmask=1,mNumHeaders=0; tqmask<=showHeaders; tqmask<<=1)
- if ((showHeaders&tqmask) != 0) mNumHeaders++;
+ for (mask=1,mNumHeaders=0; mask<=showHeaders; mask<<=1)
+ if ((showHeaders&mask) != 0) mNumHeaders++;
numRows = mNumHeaders + 1;
@@ -4091,7 +4091,7 @@ void KMComposeWin::slotContinuePrint( bool rc )
}
//----------------------------------------------------------------------------
-bool KMComposeWin::validateAddresses( TQWidget * tqparent, const TQString & addresses )
+bool KMComposeWin::validateAddresses( TQWidget * parent, const TQString & addresses )
{
TQString brokenAddress;
KPIM::EmailParseResult errorCode = KMMessage::isValidEmailAddressList( KMMessage::expandAliases( addresses ), brokenAddress );
@@ -4099,7 +4099,7 @@ bool KMComposeWin::validateAddresses( TQWidget * tqparent, const TQString & addr
TQString errorMsg( "