diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
commit | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (patch) | |
tree | 5f52a9eada2e9f3654fc327d7c14dfef570a6ecb /kaddressbook/editors | |
parent | 2ee4bf4fd5eff93b2fbef0ff8e8063edffc5da5c (diff) | |
download | tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.tar.gz tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.zip |
Initial conversion of kdepim to TQt
This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK. Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kaddressbook/editors')
-rw-r--r-- | kaddressbook/editors/cryptowidget.cpp | 8 | ||||
-rw-r--r-- | kaddressbook/editors/cryptowidget.h | 11 | ||||
-rw-r--r-- | kaddressbook/editors/imaddressbase.ui | 18 | ||||
-rw-r--r-- | kaddressbook/editors/imaddresswidget.cpp | 12 | ||||
-rw-r--r-- | kaddressbook/editors/imaddresswidget.h | 9 | ||||
-rw-r--r-- | kaddressbook/editors/imeditorbase.ui | 4 | ||||
-rw-r--r-- | kaddressbook/editors/imeditorwidget.cpp | 24 | ||||
-rw-r--r-- | kaddressbook/editors/imeditorwidget.h | 9 |
8 files changed, 49 insertions, 46 deletions
diff --git a/kaddressbook/editors/cryptowidget.cpp b/kaddressbook/editors/cryptowidget.cpp index 45a5efbaf..a4d8b8bb0 100644 --- a/kaddressbook/editors/cryptowidget.cpp +++ b/kaddressbook/editors/cryptowidget.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <config.h> @@ -68,8 +68,8 @@ TQString CryptoWidgetFactory::pageIdentifier() const return "crypto"; } -CryptoWidget::CryptoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : KAB::ContactEditorWidget( ab, parent, name ), mReadOnly( false ) +CryptoWidget::CryptoWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + : KAB::ContactEditorWidget( ab, tqparent, 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 8037a4a49..12f3ba992 100644 --- a/kaddressbook/editors/cryptowidget.h +++ b/kaddressbook/editors/cryptowidget.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef CRYPTOWIDGET_H @@ -36,9 +36,10 @@ class TQCheckBox; class CryptoWidget : public KAB::ContactEditorWidget { Q_OBJECT + TQ_OBJECT public: - CryptoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + CryptoWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); ~CryptoWidget(); void loadContact( KABC::Addressee *addr ); @@ -59,9 +60,9 @@ class CryptoWidgetFactory : public KAB::ContactEditorWidgetFactory { public: CryptoWidgetFactory(); - KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) { - return new CryptoWidget( ab, parent, name ); + return new CryptoWidget( ab, tqparent, name ); } TQString pageTitle() const; diff --git a/kaddressbook/editors/imaddressbase.ui b/kaddressbook/editors/imaddressbase.ui index 2f608a083..0a096f6ff 100644 --- a/kaddressbook/editors/imaddressbase.ui +++ b/kaddressbook/editors/imaddressbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>IMAddressBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>IMAddressBase</cstring> </property> @@ -27,12 +27,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>cmbProtocol</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>labelProtocol</cstring> </property> @@ -43,12 +43,12 @@ <cstring>cmbProtocol</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>edtAddress</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>labelAddress</cstring> </property> @@ -59,7 +59,7 @@ <cstring>edtAddress</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>labelNetwork</cstring> </property> @@ -70,7 +70,7 @@ <cstring>edtNetwork</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>edtNetwork</cstring> </property> @@ -81,9 +81,9 @@ <tabstop>cmbProtocol</tabstop> <tabstop>edtAddress</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>slotProtocolChanged( const QString & )</slot> <slot>slotProtocolChanged()</slot> -</slots> +</Q_SLOTS> <tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaddressbook/editors/imaddresswidget.cpp b/kaddressbook/editors/imaddresswidget.cpp index 097b092c0..1d64c5b98 100644 --- a/kaddressbook/editors/imaddresswidget.cpp +++ b/kaddressbook/editors/imaddresswidget.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqcheckbox.h> #include <tqcombobox.h> @@ -33,18 +33,18 @@ #include "imaddresswidget.h" -IMAddressWidget::IMAddressWidget( TQWidget *parent, TQValueList<KPluginInfo *> protocols ) - : IMAddressBase( parent ) +IMAddressWidget::IMAddressWidget( TQWidget *tqparent, TQValueList<KPluginInfo *> protocols ) + : IMAddressBase( tqparent ) { mProtocols = protocols; populateProtocols(); init(); } -IMAddressWidget::IMAddressWidget( TQWidget *parent, TQValueList<KPluginInfo *> protocols, +IMAddressWidget::IMAddressWidget( TQWidget *tqparent, TQValueList<KPluginInfo *> protocols, KPluginInfo *protocol, const TQString& address, const IMContext& context ) - : IMAddressBase( parent ) + : IMAddressBase( tqparent ) { Q_UNUSED( context ); diff --git a/kaddressbook/editors/imaddresswidget.h b/kaddressbook/editors/imaddresswidget.h index 11ee5f454..3cec21cfd 100644 --- a/kaddressbook/editors/imaddresswidget.h +++ b/kaddressbook/editors/imaddresswidget.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef IMADDRESSWIDGET_H #define IMADDRESSWIDGET_H @@ -42,10 +42,11 @@ class KPluginInfo; class IMAddressWidget : public IMAddressBase { Q_OBJECT + TQ_OBJECT public: - IMAddressWidget( TQWidget *parent, TQValueList<KPluginInfo *> protocols); - IMAddressWidget( TQWidget *parent, TQValueList<KPluginInfo *> protocols, + IMAddressWidget( TQWidget *tqparent, TQValueList<KPluginInfo *> protocols); + IMAddressWidget( TQWidget *tqparent, TQValueList<KPluginInfo *> protocols, KPluginInfo *protocol, const TQString& address, const IMContext& context = Any ); diff --git a/kaddressbook/editors/imeditorbase.ui b/kaddressbook/editors/imeditorbase.ui index 3c8e36010..bbc266370 100644 --- a/kaddressbook/editors/imeditorbase.ui +++ b/kaddressbook/editors/imeditorbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>IMEditorBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>IMEditorBase</cstring> </property> @@ -44,7 +44,7 @@ </size> </property> </spacer> - <widget class="QPushButton" row="3" column="1"> + <widget class="TQPushButton" row="3" column="1"> <property name="name"> <cstring>btnSetStandard</cstring> </property> diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp index 30c3ca981..3e306a03b 100644 --- a/kaddressbook/editors/imeditorwidget.cpp +++ b/kaddressbook/editors/imeditorwidget.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqlistview.h> @@ -43,9 +43,9 @@ #include "imeditorwidget.h" -IMAddressLVI::IMAddressLVI( KListView *parent, KPluginInfo *protocol, +IMAddressLVI::IMAddressLVI( KListView *tqparent, KPluginInfo *protocol, const TQString &address, const IMContext &context ) - : KListViewItem( parent ) + : KListViewItem( tqparent ) { setProtocol( protocol ); setAddress( address ); @@ -140,8 +140,8 @@ void IMAddressLVI::activate() /*===========================================================================*/ -IMEditorWidget::IMEditorWidget( TQWidget *parent, const TQString &preferredIM, const char *name ) - : KDialogBase( parent, name, false, i18n( "Edit Instant Messenging Address" ), +IMEditorWidget::IMEditorWidget( TQWidget *tqparent, const TQString &preferredIM, const char *name ) + : KDialogBase( tqparent, name, false, i18n( "Edit Instant Messenging Address" ), Help | Ok | Cancel, Ok, false ), mReadOnly( false ) { @@ -351,7 +351,7 @@ void IMEditorWidget::slotAdd() mPreferred = addressWid->address(); } - if ( mChangedProtocols.find( addressWid->protocol() ) == mChangedProtocols.end() ) + if ( mChangedProtocols.tqfind( addressWid->protocol() ) == mChangedProtocols.end() ) mChangedProtocols.append( addressWid->protocol() ); mWidget->lvAddresses->sort(); @@ -388,7 +388,7 @@ void IMEditorWidget::slotEdit() } // the entry for the protocol of the current address has changed - if ( mChangedProtocols.find( current->protocol() ) == mChangedProtocols.end() ) { + if ( mChangedProtocols.tqfind( current->protocol() ) == mChangedProtocols.end() ) { mChangedProtocols.append( current->protocol() ); } // update protocol - has another protocol gained an address? @@ -396,7 +396,7 @@ void IMEditorWidget::slotEdit() modified = true; // this proto is losing an entry current->setProtocol( addressWid->protocol() ); - if ( mChangedProtocols.find( current->protocol() ) == mChangedProtocols.end() ) + if ( mChangedProtocols.tqfind( current->protocol() ) == mChangedProtocols.end() ) mChangedProtocols.append( current->protocol() ); } @@ -431,7 +431,7 @@ void IMEditorWidget::slotDelete() while( it.current() ) { if ( it.current()->isSelected() ) { IMAddressLVI * current = static_cast<IMAddressLVI*>( *it ); - if ( mChangedProtocols.find( current->protocol() ) == mChangedProtocols.end() ) + if ( mChangedProtocols.tqfind( current->protocol() ) == mChangedProtocols.end() ) mChangedProtocols.append( current->protocol() ); if ( current->preferred() ) @@ -477,12 +477,12 @@ KPluginInfo * IMEditorWidget::protocolFromString( const TQString &fieldValue ) c void IMEditorWidget::splitField( const TQString &str, TQString &app, TQString &name, TQString &value ) { - int colon = str.find( ':' ); + int colon = str.tqfind( ':' ); if ( colon != -1 ) { TQString tmp = str.left( colon ); value = str.mid( colon + 1 ); - int dash = tmp.find( '-' ); + int dash = tmp.tqfind( '-' ); if ( dash != -1 ) { app = tmp.left( dash ); name = tmp.mid( dash + 1 ); diff --git a/kaddressbook/editors/imeditorwidget.h b/kaddressbook/editors/imeditorwidget.h index 25fd9804d..f1f2708db 100644 --- a/kaddressbook/editors/imeditorwidget.h +++ b/kaddressbook/editors/imeditorwidget.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef IMEDITORWIDGET_H @@ -49,9 +49,10 @@ enum IMContext { Any, Home, Work }; class IMEditorWidget : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - IMEditorWidget( TQWidget *parent, const TQString &preferredIM, const char *name = 0 ); + IMEditorWidget( TQWidget *tqparent, const TQString &preferredIM, const char *name = 0 ); ~IMEditorWidget() {}; void loadContact( KABC::Addressee *addr ); @@ -99,7 +100,7 @@ class IMEditorWidget : public KDialogBase class IMAddressLVI : public KListViewItem { public: - IMAddressLVI( KListView *parent, KPluginInfo * protocol, + IMAddressLVI( KListView *tqparent, KPluginInfo * protocol, const TQString &address, const IMContext &context = Any ); void setAddress( const TQString &address ); |