diff options
Diffstat (limited to 'korn')
71 files changed, 433 insertions, 406 deletions
diff --git a/korn/ChangeLog b/korn/ChangeLog index d22d617a..d759fb3f 100644 --- a/korn/ChangeLog +++ b/korn/ChangeLog @@ -14,7 +14,7 @@ * Converted C-style casts to C++-style, and checked retvals of dynamic_casts. Currently only assert() used, but that's better than crashing. - * Fixed layout of polldlg. + * Fixed tqlayout of polldlg. * Split 'General' cfg widget into two, 'View' and 'Commands' * Added some keyboard accelerators. * Still need to connect config stuff up properly... @@ -27,8 +27,8 @@ 1999-06-23 Cristian Tibirna <ctibirna@total.net> * temporarily take care of korn (with Taj's blessing) - * fix most of the layouts (/me being too stupid to fix Taj's nice - custom layout classes, I switched completely to pure QLayouts) + * fix most of the tqlayouts (/me being too stupid to fix Taj's nice + custom tqlayout classes, I switched completely to pure QLayouts) * fixed most of the i18n * made FileDialogs start with the current path by default (instead no path, used before) diff --git a/korn/account_input.cpp b/korn/account_input.cpp index feafbe86..e10f6659 100644 --- a/korn/account_input.cpp +++ b/korn/account_input.cpp @@ -44,11 +44,11 @@ TQString AccountInput::configName() const return *_configName; } -TextInput::TextInput( TQWidget *parent, const TQString& title, Type type, const TQString& defaul, const TQString& configName ) +TextInput::TextInput( TQWidget *tqparent, const TQString& title, Type type, const TQString& defaul, const TQString& configName ) : AccountInput( configName ) { - _left = new TQLabel( title, parent, "label" ); - _right = new KLineEdit( "", parent, "edit" ); + _left = new TQLabel( title, tqparent, "label" ); + _right = new KLineEdit( "", tqparent, "edit" ); switch( type ) { case text: @@ -60,11 +60,11 @@ TextInput::TextInput( TQWidget *parent, const TQString& title, Type type, const setValue( defaul ); } -TextInput::TextInput( TQWidget *parent, const TQString& title, int min, int max, const TQString& defaul, const TQString& configName ) +TextInput::TextInput( TQWidget *tqparent, const TQString& title, int min, int max, const TQString& defaul, const TQString& configName ) : AccountInput( configName ) { - _left = new TQLabel( title, parent, "label" ); - _right = new KLineEdit( "", parent, "edit" ); + _left = new TQLabel( title, tqparent, "label" ); + _right = new KLineEdit( "", tqparent, "edit" ); _right->setValidator( new TQIntValidator( min, max, _right, "validator" ) ); setValue( defaul ); } @@ -85,11 +85,11 @@ void TextInput::setValue( const TQString& value ) return _right->setText( value ); } -URLInput::URLInput( TQWidget *parent, const TQString& title, const TQString& defaul, const TQString& configName ) +URLInput::URLInput( TQWidget *tqparent, const TQString& title, const TQString& defaul, const TQString& configName ) : AccountInput( configName ) { - _left = new TQLabel( title, parent, "label" ); - _right = new KURLRequester( "", parent, "kurledit" ); + _left = new TQLabel( title, tqparent, "label" ); + _right = new KURLRequester( "", tqparent, "kurledit" ); setValue( defaul ); } @@ -109,13 +109,13 @@ void URLInput::setValue( const TQString& value ) _right->setURL( value ); } -ComboInput::ComboInput( TQWidget *parent, const TQString& title, const TQMap<TQString, TQString>& list, +ComboInput::ComboInput( TQWidget *tqparent, const TQString& title, const TQMap<TQString, TQString>& list, const TQString& defaul, const TQString& configName ) : AccountInput( configName ) , _list( new TQMap< TQString, TQString >( list ) ) { - _left = new TQLabel( title, parent, "label" ); - _right = new TQComboBox( false, parent, "combo" ); + _left = new TQLabel( title, tqparent, "label" ); + _right = new TQComboBox( false, tqparent, "combo" ); _right->insertStringList( TQStringList( _list->values() ) ); setValue( defaul ); } @@ -142,10 +142,10 @@ void ComboInput::setValue( const TQString& value ) _right->setCurrentItem( -1 ); } -CheckboxInput::CheckboxInput( TQWidget *parent, const TQString& title, const TQString& defaul, const TQString& configName ) +CheckboxInput::CheckboxInput( TQWidget *tqparent, const TQString& title, const TQString& defaul, const TQString& configName ) : AccountInput( configName ) { - _right = new TQCheckBox( title, parent, "checkbox" ); + _right = new TQCheckBox( title, tqparent, "checkbox" ); setValue( defaul ); } diff --git a/korn/account_input.h b/korn/account_input.h index 43e68047..8cff757c 100644 --- a/korn/account_input.h +++ b/korn/account_input.h @@ -33,7 +33,7 @@ class TQCheckBox; #include <tqmap.h> /** - * This classe tqcontains methods to use in the creation of the protocol configuration box. + * This classe contains methods to use in the creation of the protocol configuration box. * The subclasses of this classes define the methods. */ class AccountInput @@ -106,24 +106,24 @@ public: /** * Constructor * - * @param parent The parent widget + * @param tqparent The tqparent widget * @param title The title that appears on the screen * @param type The type of TextEdit which is used * @param defaul The default value of this object * @param configName The name it has in the configuration box. */ - TextInput( TQWidget *parent, const TQString& title, Type type, const TQString& defaul, const TQString& configName ); + TextInput( TQWidget *tqparent, const TQString& title, Type type, const TQString& defaul, const TQString& configName ); /** * Constructor. Use this one if you want to ensure a number is inserted. * - * @param parent The parent widget + * @param tqparent The tqparent widget * @param title The title that appears on the screen * @param min The minimum value that can be inserted * @param max The maximum value that can be inserted * @param defaul The default value of this object * @param configName The name it has in the configuration box. */ - TextInput( TQWidget *parent, const TQString& title, int min, int max, const TQString& defaul, const TQString& configName ); + TextInput( TQWidget *tqparent, const TQString& title, int min, int max, const TQString& defaul, const TQString& configName ); /** * Destructor */ @@ -163,12 +163,12 @@ class URLInput : public AccountInput public: /** * Constructor - * @param parent The parent of this object + * @param tqparent The tqparent of this object * @param title The title of the label next to the URL. * @param defaul The default value * @param configName The name of the configuration entry */ - URLInput( TQWidget *parent, const TQString& title, const TQString& defaul, const TQString& configName ); + URLInput( TQWidget *tqparent, const TQString& title, const TQString& defaul, const TQString& configName ); /** * Destructor */ @@ -210,14 +210,14 @@ public: /** * Constructor * - * @param parent The parent of the widgets which are created + * @param tqparent The tqparent of the widgets which are created * @param title The title next to the combo box * @param list A mapping which maps a value in the configuration to a (translated) entry in the * combo box. * @param default The default value of the combo box. * @param configName The name in which the option is saved. */ - ComboInput( TQWidget *parent, const TQString& title, const TQMap<TQString,TQString>& list, + ComboInput( TQWidget *tqparent, const TQString& title, const TQMap<TQString,TQString>& list, const TQString& defaul, const TQString& configName ); /** * Destructor @@ -264,12 +264,12 @@ public: /** * Constructor * - * @param parent The parent for the objects which are created + * @param tqparent The tqparent for the objects which are created * @param title The title of the checkbox * @param defaul The default value ("true" for checked, "false" otherwise") * @param configName The name of the configuration entry of this object */ - CheckboxInput( TQWidget *parent, const TQString& title, const TQString& defaul, const TQString& configName ); + CheckboxInput( TQWidget *tqparent, const TQString& title, const TQString& defaul, const TQString& configName ); /** * Destructor */ diff --git a/korn/accountmanager.cpp b/korn/accountmanager.cpp index a791c53d..9c2d3fd4 100644 --- a/korn/accountmanager.cpp +++ b/korn/accountmanager.cpp @@ -34,8 +34,8 @@ KornSubjectsDlg* AccountManager::_subjectsDlg = 0; -AccountManager::AccountManager( TQObject * parent, const char * name ) - : TQObject( parent, name ), +AccountManager::AccountManager( TQObject * tqparent, const char * name ) + : TQObject( tqparent, name ), _kioList( new TQPtrList< KMailDrop > ), _dcopList( new TQPtrList< DCOPDrop > ), _dropInfo( new TQMap< KMailDrop*, Dropinfo* > ) @@ -241,7 +241,7 @@ void AccountManager::playSound( const TQString& file ) void AccountManager::slotChanged( int count, KMailDrop* mailDrop ) { - Dropinfo *info = _dropInfo->find( mailDrop ).data(); + Dropinfo *info = _dropInfo->tqfind( mailDrop ).data(); info->newMessages = count > info->msgnr || ( count == info->msgnr && info->newMessages ); if( count > info->msgnr ) diff --git a/korn/accountmanager.h b/korn/accountmanager.h index 5d0f3293..27c4cd07 100644 --- a/korn/accountmanager.h +++ b/korn/accountmanager.h @@ -38,13 +38,14 @@ template< class T, class W > class TQMap; * This class reads the config and makes the accounts, * and it communicate with the boxes. */ -class AccountManager : public QObject +class AccountManager : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Constructor, parameters are directed to TQObject. */ - AccountManager( TQObject * parent = 0, const char * name = 0 ); + AccountManager( TQObject * tqparent = 0, const char * name = 0 ); /** * Destructor diff --git a/korn/boxcontainer.cpp b/korn/boxcontainer.cpp index 934a47c5..e8649d13 100644 --- a/korn/boxcontainer.cpp +++ b/korn/boxcontainer.cpp @@ -24,8 +24,8 @@ #include <tqptrlist.h> -BoxContainer::BoxContainer( TQObject * parent, const char * name ) - : TQObject( parent, name ), +BoxContainer::BoxContainer( TQObject * tqparent, const char * name ) + : TQObject( tqparent, name ), _items( new TQPtrList< BoxContainerItem > ) { _items->setAutoDelete( true ); diff --git a/korn/boxcontainer.h b/korn/boxcontainer.h index ec054318..33e1c63d 100644 --- a/korn/boxcontainer.h +++ b/korn/boxcontainer.h @@ -31,16 +31,17 @@ class KConfig; * This class is the base for all BoxContainers. A BoxContainer is a place * where BoxContainerItems can be placed. BoxContainerItems are the boxes you see. */ -class BoxContainer : public QObject +class BoxContainer : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Constructor: everything is passed to TQObject. * - * @param parent The parent of this object + * @param tqparent The tqparent of this object * @param name The name of this object */ - BoxContainer( TQObject *parent = 0, const char * name = 0 ); + BoxContainer( TQObject *tqparent = 0, const char * name = 0 ); /** * Destructor */ diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp index c4976f23..c357fd4f 100644 --- a/korn/boxcontaineritem.cpp +++ b/korn/boxcontaineritem.cpp @@ -47,8 +47,8 @@ #include <tqtooltip.h> #include <tqvbox.h> -BoxContainerItem::BoxContainerItem( TQObject * parent, const char * name ) - : AccountManager( parent, name ), +BoxContainerItem::BoxContainerItem( TQObject * tqparent, const char * name ) + : AccountManager( tqparent, name ), DCOPObject(), _command( new TQString ) { @@ -168,14 +168,14 @@ void BoxContainerItem::runCommand( const TQString& cmd ) process->start(); } -void BoxContainerItem::mouseButtonPressed( Qt::ButtonState state ) +void BoxContainerItem::mouseButtonPressed( TQt::ButtonState state ) { int button; - if( state & Qt::LeftButton ) + if( state & TQt::LeftButton ) button = 0; - else if( state & Qt::RightButton ) + else if( state & TQt::RightButton ) button = 2; - else if( state & Qt::MidButton ) + else if( state & TQt::MidButton ) button = 1; else return; //Invalid mouse button @@ -211,10 +211,10 @@ void BoxContainerItem::fillKPopupMenu( KPopupMenu* popupMenu, KActionCollection* KStdAction::aboutApp( this, TQT_SLOT( about() ), actions )->plug( popupMenu ); } -void BoxContainerItem::showPassivePopup( TQWidget* parent, TQPtrList< KornMailSubject >* list, int total, +void BoxContainerItem::showPassivePopup( TQWidget* tqparent, TQPtrList< KornMailSubject >* list, int total, const TQString &accountName, bool date ) { - KPassivePopup *popup = new KPassivePopup( parent, "Passive popup" ); + KPassivePopup *popup = new KPassivePopup( tqparent, "Passive popup" ); TQVBox *mainvtqlayout = popup->standardView( i18n( "KOrn - %1/%2 (total: %3)" ).arg( objId() ).arg( accountName ) .arg( total ), "", TQPixmap(), 0 ); @@ -288,7 +288,7 @@ void BoxContainerItem::drawLabel( TQLabel *label, const int count, const bool ne if( hasBg ) { label->setPixmap( calcComplexPixmap( pixmap, *_fgColour[ index ], _fonts[ index ], count ) ); - label->setBackgroundMode( Qt::FixedColor ); + label->setBackgroundMode( TQt::FixedColor ); label->setPaletteBackgroundColor( *_bgColour[ index ] ); } else { @@ -299,11 +299,11 @@ void BoxContainerItem::drawLabel( TQLabel *label, const int count, const bool ne if( hasBg ) { - label->setBackgroundMode( Qt::FixedColor ); + label->setBackgroundMode( TQt::FixedColor ); label->setPaletteBackgroundColor( *_bgColour[ index ] ); } else { - label->setBackgroundMode( Qt::X11ParentRelative ); + label->setBackgroundMode( TQt::X11ParentRelative ); } if( hasIcon ) @@ -316,7 +316,7 @@ void BoxContainerItem::drawLabel( TQLabel *label, const int count, const bool ne if( _fonts[ index ] ) label->setFont( *_fonts[ index ] ); label->setPaletteForegroundColor( *_fgColour[ index ] ); - label->tqsetAlignment( Qt::AlignHCenter | Qt::AlignVCenter ); + label->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); label->setText( TQString::number( count ) ); } @@ -333,17 +333,17 @@ TQPixmap BoxContainerItem::calcComplexPixmap( const TQPixmap &icon, const TQColo TQPixmap numberPixmap( icon.size() ); TQImage iconImage( icon.convertToImage() ); TQImage numberImage; - QRgb *rgbline; + TQRgb *rgbline; TQPainter p; //Make a transparent number; first make a white number on a black background. //This pixmap also is the base alpha-channel, the foreground colour is added later. - numberPixmap.fill( Qt::black ); + numberPixmap.fill( TQt::black ); p.begin( &numberPixmap, false ); - p.setPen( Qt::white ); + p.setPen( TQt::white ); if( font ) p.setFont( *font ); - p.drawText( icon.rect(), Qt::AlignCenter, TQString::number( count ) ); + p.drawText( icon.rect(), TQt::AlignCenter, TQString::number( count ) ); p.end(); //Convert to image and add the alpha channel. @@ -353,7 +353,7 @@ TQPixmap BoxContainerItem::calcComplexPixmap( const TQPixmap &icon, const TQColo numberImage.setAlphaBuffer( true ); //Enable alpha channel for( int xx = 0; xx < numberImage.height(); ++xx ) { - rgbline = (QRgb*)numberImage.scanLine( xx ); + rgbline = (TQRgb*)numberImage.scanLine( xx ); for( int yy = 0; yy < numberImage.width(); ++yy ) { @@ -371,7 +371,7 @@ TQPixmap BoxContainerItem::calcComplexPixmap( const TQPixmap &icon, const TQColo void BoxContainerItem::setAnimIcon( TQLabel* label, const TQString& anim ) { - label->tqsetAlignment( Qt::AlignHCenter | Qt::AlignVCenter ); + label->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); label->setMovie( TQMovie( anim ) ); label->show(); } diff --git a/korn/boxcontaineritem.h b/korn/boxcontaineritem.h index 06c02993..5393852a 100644 --- a/korn/boxcontaineritem.h +++ b/korn/boxcontaineritem.h @@ -41,19 +41,21 @@ class TQString; * @author Mart Kelder <mart.kde@hccnet.nl> */ class BoxContainerItem : public AccountManager, public DCOPObject -{ Q_OBJECT +{ + Q_OBJECT +// TQ_OBJECT K_DCOP public: /** - * Standaard QObject-constuctor + * Standaard TQObject-constuctor * This constructor implements the default arguments for any TQObject. * Note that is does not give a name to DCOPObject; that name * is set in the readConfig-function. - * @param parent The parent of this object, See Object::QObject - * @param name The name of this object, See TQObject::QObject + * @param tqparent The tqparent of this object, See Object::TQObject + * @param name The name of this object, See TQObject::TQObject * @see BoxContainerItem::readConfig */ - BoxContainerItem( TQObject * parent = 0, const char * name = 0 ); + BoxContainerItem( TQObject * tqparent = 0, const char * name = 0 ); /** * The default destructor. This only removes _command-pointer. @@ -68,7 +70,7 @@ public: /** * This function reads the config. It stores the readed values in the class. * It also sets the DCOPObject-name. - * @param config The KConfigGroup-object which tqcontains the configuration of this box. + * @param config The KConfigGroup-object which contains the configuration of this box. * @param index The index of the box used in the config-file */ virtual void readConfig( KConfig* config, const int index ); @@ -105,14 +107,14 @@ public slots: * This functions should be called if a mouse-button has been pressed. * This handles the connected events of it. * - * @param button The button that was pressed, See Qt::ButtonState + * @param button The button that was pressed, See TQt::ButtonState */ - void mouseButtonPressed( Qt::ButtonState button ); + void mouseButtonPressed( TQt::ButtonState button ); protected: /** * This function filles a KPopupMenu-reference. The target is * to set in all implementations the same KPopupMenu-content. - * Because some implementations (DockedItem) got a KPopupMenu + * Because some implementations (TQt::DockedItem) got a KPopupMenu * by itself, this only changes a KPopupMenu instance. * @param menu The menu to be changed. * @param actions The actions to which the items should be added. @@ -122,13 +124,13 @@ protected: /** * This displays the passive popup. * - * @param parent The Winget of the visual widget + * @param tqparent The Winget of the visual widget * @param list List with the first (five) subjects * @param total The total numbers of unread mail * @param accountName The name of the account it belongs to * @param date Should the date be displayed? */ - void showPassivePopup( TQWidget* parent, TQPtrList< KornMailSubject >* list, int total, const TQString& accountName, bool date ); + void showPassivePopup( TQWidget* tqparent, TQPtrList< KornMailSubject >* list, int total, const TQString& accountName, bool date ); //this functions should be reimplemented /** diff --git a/korn/dcopdrop.cpp b/korn/dcopdrop.cpp index 7eb8d2a0..03c0db43 100644 --- a/korn/dcopdrop.cpp +++ b/korn/dcopdrop.cpp @@ -78,7 +78,7 @@ bool DCOPDrop::readConfigGroup( const TQMap< TQString, TQString > &map, const Pr //The mapping MUST contain dcopname. kdDebug() << "mapping is niet compleet" << endl; - this->setDCOPName( *map.find( "dcopname" ) ); + this->setDCOPName( *map.tqfind( "dcopname" ) ); return true; } diff --git a/korn/dcopdrop.h b/korn/dcopdrop.h index c14953f0..c6558d98 100644 --- a/korn/dcopdrop.h +++ b/korn/dcopdrop.h @@ -39,6 +39,7 @@ class TQString; */ class DCOPDrop : public KMailDrop { Q_OBJECT + TQ_OBJECT public: /** * Constructor: no parameters @@ -93,7 +94,7 @@ public: /** * This function reeds the config which are shipped which the group. * - * @param config The configuration group which tqcontains the info for this account. + * @param config The configuration group which contains the info for this account. * @return The same value as KMailDrop::readConfigGroup( config ) returns. */ virtual bool readConfigGroup( const KConfigGroup& config ); diff --git a/korn/dcopdropif.h b/korn/dcopdropif.h index 9e755ac6..48514164 100644 --- a/korn/dcopdropif.h +++ b/korn/dcopdropif.h @@ -32,7 +32,7 @@ K_DCOP public: /** * Constructor - * @param drop The parent DCOPDrop + * @param drop The tqparent DCOPDrop * @param name The name of the dcop-object */ DCOPDropInterface( DCOPDrop* drop, const char* name ); diff --git a/korn/dockedcontainer.cpp b/korn/dockedcontainer.cpp index 5e246388..989e19f0 100644 --- a/korn/dockedcontainer.cpp +++ b/korn/dockedcontainer.cpp @@ -20,8 +20,8 @@ #include "dockeditem.h" -DockedContainer::DockedContainer( TQObject * parent, const char * name ) - : BoxContainer( parent, name ) +DockedContainer::DockedContainer( TQObject * tqparent, const char * name ) + : BoxContainer( tqparent, name ) { } diff --git a/korn/dockedcontainer.h b/korn/dockedcontainer.h index 278de044..d40623b6 100644 --- a/korn/dockedcontainer.h +++ b/korn/dockedcontainer.h @@ -25,19 +25,20 @@ class BoxContainerItem; /** * This class is a implementation of a BoxContainer and does almost nothing. - * The only thing it does is creating DocketItems. + * The only thing it does is creating TQt::DocketItems. */ class DockedContainer : public BoxContainer { Q_OBJECT + TQ_OBJECT public: - DockedContainer( TQObject * parent = 0, const char * name = 0 ); + DockedContainer( TQObject * tqparent = 0, const char * name = 0 ); ~DockedContainer(); protected: //virtual void addItem( BoxContainerItem* ); //Overiding not neccesairy /** - * @return A new instance to a DocketItem. + * @return A new instance to a TQt::DocketItem. */ virtual BoxContainerItem* newBoxInstance() const; }; diff --git a/korn/dockeditem.cpp b/korn/dockeditem.cpp index 4423e766..9849155f 100644 --- a/korn/dockeditem.cpp +++ b/korn/dockeditem.cpp @@ -36,15 +36,15 @@ #include <tqpixmap.h> #include <tqmovie.h> -DockedItem::DockedItem( TQWidget * parent, const char * name ) - : BoxContainerItem( parent, name ), - _systemtray( new SystemTray( parent, "System tray" ) ) +DockedItem::DockedItem( TQWidget * tqparent, const char * name ) + : BoxContainerItem( tqparent, name ), + _systemtray( new SystemTray( tqparent, "System tray" ) ) { this->fillKPopupMenu( _systemtray->contextMenu(), _systemtray->actionCollection() ); connect( _systemtray, TQT_SIGNAL( quitSelected() ), kapp, TQT_SLOT( quit() ) ); - connect( _systemtray, TQT_SIGNAL( mouseButtonPressed( Qt::ButtonState ) ), - this, TQT_SLOT( mouseButtonPressed( Qt::ButtonState ) ) ); + connect( _systemtray, TQT_SIGNAL( mouseButtonPressed( TQt::ButtonState ) ), + this, TQT_SLOT( mouseButtonPressed( TQt::ButtonState ) ) ); } DockedItem::~DockedItem() diff --git a/korn/dockeditem.h b/korn/dockeditem.h index 13cce3af..a80c1787 100644 --- a/korn/dockeditem.h +++ b/korn/dockeditem.h @@ -36,13 +36,14 @@ class TQPixmap; */ class DockedItem : public BoxContainerItem { Q_OBJECT + TQ_OBJECT public: /** - * This contructor gives all it parameters to its parents. - * @param parant The parent window - * @param name The name of the QObject's parents. + * This contructor gives all it parameters to its tqparents. + * @param parant The tqparent window + * @param name The name of the TQObject's tqparents. */ - DockedItem( TQWidget * parent = 0, const char * name = 0 ); + DockedItem( TQWidget * tqparent = 0, const char * name = 0 ); /** * Empty destructor; does nothing at the moment */ @@ -54,10 +55,10 @@ public: virtual void showBox(); /** - * This functions reads the config. It used the parent + * This functions reads the config. It used the tqparent * version for the main things, but it is possible to * add some configurations over here. - * @param config The KConfig-instance which tqcontains the settings of this tray-item. + * @param config The KConfig-instance which contains the settings of this tray-item. * @param index The index of the box in the configuration file */ virtual void readConfig( KConfig* config, const int index ); diff --git a/korn/hvcontainer.cpp b/korn/hvcontainer.cpp index fa815179..991f66eb 100644 --- a/korn/hvcontainer.cpp +++ b/korn/hvcontainer.cpp @@ -24,11 +24,11 @@ #include <tqvbox.h> -HVContainer::HVContainer( Qt::Orientation orientation, TQObject * parent, const char * name ) - : BoxContainer( parent, name ), +HVContainer::HVContainer( Qt::Orientation orientation, TQObject * tqparent, const char * name ) + : BoxContainer( tqparent, name ), box( 0 ) { - if( orientation == Qt::Horizontal ) + if( orientation == TQt::Horizontal ) box = new TQHBox( 0, "hbox" ); else box = new TQVBox( 0, "vbox" ); diff --git a/korn/hvcontainer.h b/korn/hvcontainer.h index d00551d5..b590aa55 100644 --- a/korn/hvcontainer.h +++ b/korn/hvcontainer.h @@ -31,13 +31,14 @@ class TQHBox; class HVContainer : public BoxContainer { Q_OBJECT + TQ_OBJECT public: /** * Constructor: all elements are passed to BoxContainer, except orientation. * * @param orientation The orientation of the box: it is a vertical or horizontal box? */ - HVContainer( Qt::Orientation orientation, TQObject * parent = 0 , const char * name = 0 ); + HVContainer( Qt::Orientation orientation, TQObject * tqparent = 0 , const char * name = 0 ); ~HVContainer(); /** diff --git a/korn/hvitem.cpp b/korn/hvitem.cpp index 7d836da3..36551ae1 100644 --- a/korn/hvitem.cpp +++ b/korn/hvitem.cpp @@ -30,9 +30,9 @@ #include <tqcursor.h> #include <tqtooltip.h> -HVItem::HVItem( TQWidget *parent, const char *name ) +HVItem::HVItem( TQWidget *tqparent, const char *name ) : BoxContainerItem( 0, name ), - _label( new Label( parent, "label" ) ), + _label( new Label( tqparent, "label" ) ), _popup( new KPopupMenu( _label, "popupmenu" ) ), _actions( new KActionCollection( _popup, "actions" ) ) { @@ -41,12 +41,12 @@ HVItem::HVItem( TQWidget *parent, const char *name ) _popup->insertSeparator(); KStdAction::quit( kapp, TQT_SLOT( quit() ), _actions )->plug( _popup ); - connect( _label, TQT_SIGNAL( mouseButtonPressed( Qt::ButtonState ) ), this, TQT_SLOT( mouseButtonPressed( Qt::ButtonState ) ) ); + connect( _label, TQT_SIGNAL( mouseButtonPressed( TQt::ButtonState ) ), this, TQT_SLOT( mouseButtonPressed( TQt::ButtonState ) ) ); } HVItem::~HVItem() { - //Let everything be deleted by his parents. + //Let everything be deleted by his tqparents. } void HVItem::showBox() diff --git a/korn/hvitem.h b/korn/hvitem.h index e728846a..8cb62eaa 100644 --- a/korn/hvitem.h +++ b/korn/hvitem.h @@ -31,8 +31,9 @@ class Label; */ class HVItem : public BoxContainerItem { Q_OBJECT + TQ_OBJECT public: - HVItem( TQWidget *parent = 0, const char *name = 0 ); + HVItem( TQWidget *tqparent = 0, const char *name = 0 ); ~HVItem(); /** diff --git a/korn/imap_proto.cpp b/korn/imap_proto.cpp index 735f5de6..78a42b68 100644 --- a/korn/imap_proto.cpp +++ b/korn/imap_proto.cpp @@ -65,12 +65,12 @@ void Imap_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObjec void Imap_Protocol::readEntries( TQMap< TQString, TQString >* map, TQMap< TQString, TQString > *metadata ) const { - if( map->tqcontains( "ssl" ) && *map->find( "ssl" ) == "true" ) + if( map->tqcontains( "ssl" ) && *map->tqfind( "ssl" ) == "true" ) map->insert( "encryption", "ssl" ); if( metadata->tqcontains( "tls" ) ) - map->insert( "encryption", TQString( "tls=%1" ).arg( *metadata->find( "tls" ) ) ); + map->insert( "encryption", TQString( "tls=%1" ).arg( *metadata->tqfind( "tls" ) ) ); if( metadata->tqcontains( "auth" ) ) - map->insert( "auth", TQString( "auth=%1" ).arg( *metadata->find( "auth" ) ) ); + map->insert( "auth", TQString( "auth=%1" ).arg( *metadata->tqfind( "auth" ) ) ); } void Imap_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const @@ -78,12 +78,12 @@ void Imap_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const TQString metadata; if( map->tqcontains( "encryption" ) ) { - if( *map->find( "encryption" ) == "ssl" ) + if( *map->tqfind( "encryption" ) == "ssl" ) map->insert( "ssl", "true" ); else { map->insert( "ssl", "false" ); - metadata += *map->find( "encryption" ); + metadata += *map->tqfind( "encryption" ); } map->erase( "encryption" ); } @@ -92,7 +92,7 @@ void Imap_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const { if( !metadata.isEmpty() ) metadata += ","; - metadata += *map->find( "auth" ); + metadata += *map->tqfind( "auth" ); map->erase( "auth" ); } diff --git a/korn/imap_proto.h b/korn/imap_proto.h index 451742eb..97fb209a 100644 --- a/korn/imap_proto.h +++ b/korn/imap_proto.h @@ -134,7 +134,7 @@ public: * This function edits writeEntry. It merge things back to a metadata-key and adds this * key to the configuration. * - * @param map The mapping which tqcontains the information to be written to a configuarion file. + * @param map The mapping which contains the information to be written to a configuarion file. * the contents of this mapping can change in this function. */ virtual void writeEntries( TQMap< TQString, TQString >* map ) const; diff --git a/korn/kconf_update/korn-3-4-config_change.cpp b/korn/kconf_update/korn-3-4-config_change.cpp index 9f275181..0cea4577 100644 --- a/korn/kconf_update/korn-3-4-config_change.cpp +++ b/korn/kconf_update/korn-3-4-config_change.cpp @@ -104,11 +104,11 @@ void printToprint( TQTextStream &out, TQMap<TQString,TQString> &to_printed, cons int main( int, char** ) { - TQString line = TQString::null; - TQString currentGroup1 = TQString::null; - TQString currentGroup2 = TQString::null; - TQString type = TQString::null; - TQString password = TQString::null; + TQString line = TQString(); + TQString currentGroup1 = TQString(); + TQString currentGroup2 = TQString(); + TQString type = TQString(); + TQString password = TQString(); TQRegExp interesting_group( "^\\[box-(\\d+)\\]" ); TQRegExp key_value( "^(\\w*)=(.*)$" ); TQValueList<TQString> tobe_deleted; @@ -168,7 +168,7 @@ int main( int, char** ) printToprint( out, to_printed, type ); } - currentGroup1 = TQString::null; + currentGroup1 = TQString(); } if( interesting_group.search( line ) >= 0 ) diff --git a/korn/keditlistboxman.cpp b/korn/keditlistboxman.cpp index cab1d777..cb306672 100644 --- a/korn/keditlistboxman.cpp +++ b/korn/keditlistboxman.cpp @@ -24,9 +24,9 @@ #include <tqmap.h> #include <tqstring.h> -KEditListBoxManager::KEditListBoxManager( TQWidget *parent, const char *name, +KEditListBoxManager::KEditListBoxManager( TQWidget *tqparent, const char *name, bool checkAtEntering, int buttons ) - : KEditListBox( parent, name, checkAtEntering, buttons ), + : KEditListBox( tqparent, name, checkAtEntering, buttons ), _config( 0 ), _groupName( 0 ), _subGroupName( 0 ), @@ -35,10 +35,10 @@ KEditListBoxManager::KEditListBoxManager( TQWidget *parent, const char *name, init(); } -KEditListBoxManager::KEditListBoxManager( const TQString& title, TQWidget *parent, +KEditListBoxManager::KEditListBoxManager( const TQString& title, TQWidget *tqparent, const char *name, bool checkAtEntering, int buttons) - : KEditListBox( title, parent, name, checkAtEntering, buttons ), + : KEditListBox( title, tqparent, name, checkAtEntering, buttons ), _config( 0 ), _groupName( 0 ), _subGroupName( 0 ), @@ -49,9 +49,9 @@ KEditListBoxManager::KEditListBoxManager( const TQString& title, TQWidget *paren KEditListBoxManager::KEditListBoxManager( const TQString& title, const KEditListBox::CustomEditor &customEditor, - TQWidget *parent, const char *name, + TQWidget *tqparent, const char *name, bool checkAtEntering, int buttons ) - : KEditListBox( title, customEditor, parent, name, checkAtEntering, buttons ), + : KEditListBox( title, customEditor, tqparent, name, checkAtEntering, buttons ), _config( 0 ), _groupName( 0 ), _subGroupName( 0 ), @@ -112,7 +112,7 @@ void KEditListBoxManager::readNames() while( _config->hasGroup( _groupName->arg( number ) ) ) { _config->setGroup( _groupName->arg( number ) ); - this->insertItem( _config->readEntry( "name", TQString::null ) ); + this->insertItem( _config->readEntry( "name", TQString() ) ); ++number; } @@ -140,12 +140,12 @@ void KEditListBoxManager::slotChanged() _config->setGroup( _groupName->arg( this->currentItem() ) ); - if( this->currentItem() > 0 && this->text( this->currentItem() - 1 ) == _config->readEntry( "name", TQString::null ) ) + if( this->currentItem() > 0 && this->text( this->currentItem() - 1 ) == _config->readEntry( "name", TQString() ) ) changeItem( this->currentItem() - 1, this->currentItem() ); //moved down else if( this->currentItem() < this->count() - 1 && - this->text( this->currentItem() + 1 ) == _config->readEntry( "name", TQString::null ) ) + this->text( this->currentItem() + 1 ) == _config->readEntry( "name", TQString() ) ) changeItem( this->currentItem(), this->currentItem() + 1 ); //moved up - else if( this->currentText() != _config->readEntry( "name", TQString::null ) ) + else if( this->currentText() != _config->readEntry( "name", TQString() ) ) changedText(); //changed } @@ -186,7 +186,7 @@ void KEditListBoxManager::slotRemoved( const TQString& name ) break; } _config->setGroup( _groupName->arg( number ) ); - if( name == _config->readEntry( "name", TQString::null ) ) + if( name == _config->readEntry( "name", TQString() ) ) break; //found ++number; //Try next group diff --git a/korn/keditlistboxman.h b/korn/keditlistboxman.h index b683a364..45fb9d69 100644 --- a/korn/keditlistboxman.h +++ b/korn/keditlistboxman.h @@ -33,17 +33,18 @@ class TQWidget; */ class KEditListBoxManager : public KEditListBox { Q_OBJECT + TQ_OBJECT public: /** * Constructor: @see KEditListBoxManager::KEditListBoxManager( const TQString&, TQWidget, const char * name, bool, int ) */ - KEditListBoxManager( TQWidget *parent = 0, const char *name = 0, + KEditListBoxManager( TQWidget *tqparent = 0, const char *name = 0, bool checkAtEntering=true, int buttons = All ); /** * The save as above, but with other options for KEditListBox. */ - KEditListBoxManager( const TQString& title, TQWidget *parent = 0, + KEditListBoxManager( const TQString& title, TQWidget *tqparent = 0, const char *name = 0, bool checkAtEntering=true, int buttons = All ); @@ -52,7 +53,7 @@ public: */ KEditListBoxManager( const TQString& title, const KEditListBox::CustomEditor &customEditor, - TQWidget *parent = 0, const char *name = 0, + TQWidget *tqparent = 0, const char *name = 0, bool checkAtEntering = true, int buttons = All ); /** diff --git a/korn/kio.cpp b/korn/kio.cpp index 6fdacdcd..54d0e773 100644 --- a/korn/kio.cpp +++ b/korn/kio.cpp @@ -96,7 +96,7 @@ KKioDrop::KKioDrop() _protocol = Protocols::firstProtocol()->getKIOProtocol(); //The first protocol is the default _kurl->setPort( _protocol->defaultPort( _ssl ) ); - //Creating children and connect them to the outside world; this class passes the messages for them... + //Creating tqchildren and connect them to the outside world; this class passes the messages for them... //This class handles all the counting. _count = new KIO_Count( this, "kio_count" ); @@ -134,7 +134,7 @@ KKioDrop::KKioDrop( KConfigGroup* ) _protocol = Protocols::firstProtocol()->getKIOProtocol(); //The first protocol is the default _kurl->setPort( _protocol->defaultPort( _ssl ) ); - //Creating children and connect them to the outside world; this class passes the messages for them... + //Creating tqchildren and connect them to the outside world; this class passes the messages for them... //This class handles all the counting. _count = new KIO_Count( this, "kio_count" ); @@ -344,25 +344,25 @@ bool KKioDrop::readConfigGroup( const TQMap< TQString, TQString > &map, const Pr return false; } - this->setName( (*map.find( "name" )).utf8() ); + this->setName( (*map.tqfind( "name" )).utf8() ); _protocol = protocol->getKIOProtocol(); if( !_protocol ) _protocol = Protocols::firstProtocol()->getKIOProtocol(); - val = *map.find( "server" ); - setKioServer( val2, val, (*map.find( "port" )).toInt(), KIO::MetaData(), *map.find( "ssl" ) == "true", false ); + val = *map.tqfind( "server" ); + setKioServer( val2, val, (*map.tqfind( "port" )).toInt(), KIO::MetaData(), *map.tqfind( "ssl" ) == "true", false ); - _kurl->setUser( *map.find( "username" ) ); - _kurl->setPath( *map.find( "mailbox" ) ); + _kurl->setUser( *map.tqfind( "username" ) ); + _kurl->setPath( *map.tqfind( "mailbox" ) ); - _kurl->setPass( *map.find( "password" ) ); + _kurl->setPass( *map.tqfind( "password" ) ); - TQStringList list = TQStringList::split( ',', *map.find( "metadata" ) ); + TQStringList list = TQStringList::split( ',', *map.tqfind( "metadata" ) ); TQStringList::Iterator it; for( it = list.begin(); it != list.end(); ++it ) { - int split = (*it).find( "=" ); + int split = (*it).tqfind( "=" ); if( split > 0 ) _metadata->insert( (*it).left( split ), (*it).right( (*it).length() - split - 1 ) ); } @@ -50,6 +50,7 @@ namespace KIO { class Job; class MetaData; class Slave; class TransferJob; } class KKioDrop : public KPollableDrop { Q_OBJECT + TQ_OBJECT private: KURL *_kurl; KIO::MetaData *_metadata; diff --git a/korn/kio_count.cpp b/korn/kio_count.cpp index 71da3080..683f8829 100644 --- a/korn/kio_count.cpp +++ b/korn/kio_count.cpp @@ -34,8 +34,8 @@ #include <tqstring.h> -KIO_Count::KIO_Count( TQObject * parent, const char * name ) - : TQObject ( parent, name ), +KIO_Count::KIO_Count( TQObject * tqparent, const char * name ) + : TQObject ( tqparent, name ), _kurl( 0 ), _metadata( 0 ), _protocol( 0 ), @@ -259,12 +259,12 @@ void KIO_Count::entries( KIO::Job* job, const KIO::UDSEntryList &list ) for ( it1 = list.begin() ; it1 != list.end() ; it1++ ) { /* - * The list tqcontains multiple objects. Each object could be a file. + * The list contains multiple objects. Each object could be a file. * Settings about it are saved in this scope until it is added to the list. */ isFile=false; KKioDrop::FileInfo fileinfo; - fileinfo.name = TQString::null; + fileinfo.name = TQString(); fileinfo.size = 0; for ( it2 = (*it1).begin() ; it2 != (*it1).end() ; it2++ ) diff --git a/korn/kio_count.h b/korn/kio_count.h index a881d410..c97ce2f6 100644 --- a/korn/kio_count.h +++ b/korn/kio_count.h @@ -41,10 +41,11 @@ class KURL; class TQString; -class KIO_Count : public QObject +class KIO_Count : public TQObject { Q_OBJECT + TQ_OBJECT public: - KIO_Count( TQObject * parent = 0, const char * name = 0 ); + KIO_Count( TQObject * tqparent = 0, const char * name = 0 ); ~KIO_Count(); //This function starts counting diff --git a/korn/kio_delete.cpp b/korn/kio_delete.cpp index db27e28d..fa31ad75 100644 --- a/korn/kio_delete.cpp +++ b/korn/kio_delete.cpp @@ -32,7 +32,7 @@ #include <tqptrlist.h> -KIO_Delete::KIO_Delete( TQObject * parent, const char * name ) : TQObject( parent, name ), +KIO_Delete::KIO_Delete( TQObject * tqparent, const char * name ) : TQObject( tqparent, name ), _kio( 0 ), _total( 0 ), _jobs( 0 ), diff --git a/korn/kio_delete.h b/korn/kio_delete.h index 24a1eef7..30c95554 100644 --- a/korn/kio_delete.h +++ b/korn/kio_delete.h @@ -34,11 +34,12 @@ namespace KIO { class MetaData; class Job; class Slave; } template<class T> class TQPtrList; -class KIO_Delete : public QObject +class KIO_Delete : public TQObject { Q_OBJECT + TQ_OBJECT public: //constructors - KIO_Delete( TQObject * parent = 0, const char * name = 0 ); + KIO_Delete( TQObject * tqparent = 0, const char * name = 0 ); ~KIO_Delete( ); //This function should be called if there are messages to be deleted. diff --git a/korn/kio_proto.cpp b/korn/kio_proto.cpp index 5177a2f3..fc0a45ac 100644 --- a/korn/kio_proto.cpp +++ b/korn/kio_proto.cpp @@ -65,11 +65,11 @@ void KIO_Protocol::readEntries( TQMap< TQString, TQString >* map ) const if( map->tqcontains( "metadata" ) ) { - TQStringList list = TQStringList::split( ",", *map->find( "metadata" ) ); + TQStringList list = TQStringList::split( ",", *map->tqfind( "metadata" ) ); TQStringList::Iterator it; for( it = list.begin(); it != list.end(); ++it ) { - int split = (*it).find( '=' ); + int split = (*it).tqfind( '=' ); metadata->insert( (*it).left( split ), (*it).right( (*it).length() - split - 1 ) ); } diff --git a/korn/kio_read.cpp b/korn/kio_read.cpp index b92da304..e87fa822 100644 --- a/korn/kio_read.cpp +++ b/korn/kio_read.cpp @@ -33,8 +33,8 @@ #include <tqcstring.h> #include <tqstring.h> -KIO_Read::KIO_Read( TQObject * parent, const char * name ) - : TQObject( parent, name ), +KIO_Read::KIO_Read( TQObject * tqparent, const char * name ) + : TQObject( tqparent, name ), _job( 0 ), _message( 0 ) { diff --git a/korn/kio_read.h b/korn/kio_read.h index a3e30c88..234cd36a 100644 --- a/korn/kio_read.h +++ b/korn/kio_read.h @@ -32,10 +32,11 @@ class KIO_Protocol; class TQString; -class KIO_Read : public QObject +class KIO_Read : public TQObject { Q_OBJECT + TQ_OBJECT public: - KIO_Read( TQObject * parent = 0, const char * name = 0 ); + KIO_Read( TQObject * tqparent = 0, const char * name = 0 ); ~KIO_Read(); public slots: diff --git a/korn/kio_single_subject.cpp b/korn/kio_single_subject.cpp index 02a6a103..782b1bde 100644 --- a/korn/kio_single_subject.cpp +++ b/korn/kio_single_subject.cpp @@ -35,10 +35,10 @@ #include <tqcstring.h> #include <tqstring.h> -KIO_Single_Subject::KIO_Single_Subject( TQObject * parent, const char * name, +KIO_Single_Subject::KIO_Single_Subject( TQObject * tqparent, const char * name, KURL &kurl, KIO::MetaData &metadata, const KIO_Protocol * protocol, KIO::Slave *& slave, const TQString &url, const long size ) - : TQObject( parent, name ) + : TQObject( tqparent, name ) { _kurl = new KURL( kurl ); _metadata = new KIO::MetaData( metadata ); diff --git a/korn/kio_single_subject.h b/korn/kio_single_subject.h index ee021a33..9057a09e 100644 --- a/korn/kio_single_subject.h +++ b/korn/kio_single_subject.h @@ -33,10 +33,11 @@ class TQString; template<class T> class TQMemArray; typedef TQMemArray<char> TQByteArray; -class KIO_Single_Subject : public QObject +class KIO_Single_Subject : public TQObject { Q_OBJECT + TQ_OBJECT public: - KIO_Single_Subject( TQObject * parent, const char * name, KURL &, KIO::MetaData &, const KIO_Protocol *, + KIO_Single_Subject( TQObject * tqparent, const char * name, KURL &, KIO::MetaData &, const KIO_Protocol *, KIO::Slave *&, const TQString &, const long ); ~KIO_Single_Subject( ); diff --git a/korn/kio_subjects.cpp b/korn/kio_subjects.cpp index 2de6ac59..ae0ab8fd 100644 --- a/korn/kio_subjects.cpp +++ b/korn/kio_subjects.cpp @@ -31,8 +31,8 @@ #include <tqvaluelist.h> #include <tqstring.h> -KIO_Subjects::KIO_Subjects( TQObject * parent, const char * name ) - : TQObject( parent, name ), +KIO_Subjects::KIO_Subjects( TQObject * tqparent, const char * name ) + : TQObject( tqparent, name ), _protocol( 0 ), _slave( 0 ), _valid( true ) diff --git a/korn/kio_subjects.h b/korn/kio_subjects.h index 6ed1798a..3e16d326 100644 --- a/korn/kio_subjects.h +++ b/korn/kio_subjects.h @@ -34,10 +34,11 @@ template<class T> class TQPtrList; class TQString; template<class T> class TQValueList; -class KIO_Subjects : public QObject +class KIO_Subjects : public TQObject { Q_OBJECT + TQ_OBJECT public: - KIO_Subjects( TQObject * parent, const char * name ); + KIO_Subjects( TQObject * tqparent, const char * name ); ~KIO_Subjects( ); //This function let it start fetching headers. diff --git a/korn/kmail_proto.cpp b/korn/kmail_proto.cpp index b0b65233..fb6166c3 100644 --- a/korn/kmail_proto.cpp +++ b/korn/kmail_proto.cpp @@ -38,7 +38,7 @@ const char* KMail_Protocol::kmailKeyType = "Type"; const char* KMail_Protocol::kmailKeyName = "Name"; const char* KMail_Protocol::kmailKeyId = "Id"; const char* KMail_Protocol::kmailKeyMBox = "Location"; -const char* KMail_Protocol::kmailKeyQMail = "Location"; +const char* KMail_Protocol::kmailKeyTQMail = "Location"; const int KMail_Protocol::kmailFirstGroup = 1; class KMailDrop; @@ -164,7 +164,7 @@ TQMap< TQString, TQString > * KMail_Protocol::createConfig( KConfigGroup* config result->insert( "ssl", "false" ); result->insert( "metadata", "" ); result->insert( "username", "" ); - result->insert( "mailbox", kmailconfig.readPathEntry( kmailKeyQMail, "" ) ); + result->insert( "mailbox", kmailconfig.readPathEntry( kmailKeyTQMail, "" ) ); result->insert( "password", "" ); result->insert( "savepassword", "false" ); } @@ -188,8 +188,8 @@ void KMail_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObje while( kmailconfig.hasGroup( TQString( kmailGroupName ).arg( ++nummer ) ) ) { kmailconfig.setGroup( TQString( kmailGroupName ).arg( nummer ) ); - type = kmailconfig.readEntry( kmailKeyType, TQString::null ); - name = kmailconfig.readEntry( kmailKeyName, TQString::null ); + type = kmailconfig.readEntry( kmailKeyType, TQString() ); + name = kmailconfig.readEntry( kmailKeyName, TQString() ); if( type == "imap" || type == "cachedimap" || type == "pop" || type == "local" ) { accountList.insert( name, name ); @@ -227,7 +227,7 @@ TQString KMail_Protocol::getTypeAndConfig( const TQString& kmailname, KConfig &k while( kmailconfig.hasGroup( TQString( kmailGroupName ).arg( ++nummer ) ) ) { kmailconfig.setGroup( TQString( kmailGroupName ).arg( nummer ) ); - if( kmailconfig.readEntry( kmailKeyName, TQString::null ) == kmailname ) + if( kmailconfig.readEntry( kmailKeyName, TQString() ) == kmailname ) { id = kmailconfig.readNumEntry( kmailKeyId, 0 ); found = true; @@ -237,10 +237,10 @@ TQString KMail_Protocol::getTypeAndConfig( const TQString& kmailname, KConfig &k if( !found ) { nummer = -1; - return TQString::null; + return TQString(); } //The correct group is found, and kmailconfig.setGroup() is already called for the right group. - return kmailconfig.readEntry( kmailKeyType, TQString::null ); + return kmailconfig.readEntry( kmailKeyType, TQString() ); } diff --git a/korn/kmail_proto.h b/korn/kmail_proto.h index 9a255ad0..72e846d2 100644 --- a/korn/kmail_proto.h +++ b/korn/kmail_proto.h @@ -115,7 +115,7 @@ private: static const char* kmailKeyType; static const char* kmailKeyId; static const char* kmailKeyMBox; - static const char* kmailKeyQMail; + static const char* kmailKeyTQMail; static const int kmailFirstGroup; }; diff --git a/korn/kornaccountcfg.ui b/korn/kornaccountcfg.ui index 15afffef..318ad944 100644 --- a/korn/kornaccountcfg.ui +++ b/korn/kornaccountcfg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KornAccountCfg</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KornAccountCfg</cstring> </property> @@ -16,18 +16,18 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tab</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>server_tab</cstring> </property> <attribute name="title"> <string>&Server</string> </attribute> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lbProtocol</cstring> </property> @@ -46,7 +46,7 @@ <cstring>cbProtocol</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>cbProtocol</cstring> </property> @@ -60,7 +60,7 @@ </property> </widget> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -71,7 +71,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>tqlayout35</cstring> </property> @@ -79,7 +79,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lbInterval</cstring> </property> @@ -90,7 +90,7 @@ <cstring>edInterval</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>edInterval</cstring> </property> @@ -99,7 +99,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -110,7 +110,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chUseBox</cstring> </property> @@ -121,7 +121,7 @@ <bool>true</bool> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>gbNewMail</cstring> </property> @@ -135,7 +135,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>tqlayout33</cstring> </property> @@ -148,7 +148,7 @@ <cstring>edRunCommand</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lbRunCommand</cstring> </property> @@ -164,7 +164,7 @@ <cstring>edPlaySound</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lbPlaySound</cstring> </property> @@ -177,7 +177,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chPassivePopup</cstring> </property> @@ -185,7 +185,7 @@ <string>Show &passive popup</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chPassiveDate</cstring> </property> @@ -234,9 +234,9 @@ <tabstop>chPassivePopup</tabstop> <tabstop>chPassiveDate</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot access="protected">slotProtocolChanged( const QString& )</slot> -</slots> +</Q_SLOTS> <tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> diff --git a/korn/kornaccountcfgimpl.cpp b/korn/kornaccountcfgimpl.cpp index 5b7706e1..0346f3e8 100644 --- a/korn/kornaccountcfgimpl.cpp +++ b/korn/kornaccountcfgimpl.cpp @@ -37,8 +37,8 @@ #include <tqlabel.h> #include <tqwidget.h> -KornAccountCfgImpl::KornAccountCfgImpl( TQWidget * parent, const char * name ) - : KornAccountCfg( parent, name ), +KornAccountCfgImpl::KornAccountCfgImpl( TQWidget * tqparent, const char * name ) + : KornAccountCfg( tqparent, name ), _config( 0 ), _fields( 0 ), _urlfields( 0 ), @@ -49,8 +49,8 @@ KornAccountCfgImpl::KornAccountCfgImpl( TQWidget * parent, const char * name ) _groupBoxes( 0 ), _accountinput( new TQPtrList< AccountInput >() ) { - connect( parent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) ); - connect( parent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) ); + connect( tqparent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) ); + connect( tqparent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) ); this->cbProtocol->insertStringList( Protocols::getProtocols() ); @@ -81,7 +81,7 @@ void KornAccountCfgImpl::readConfig( KConfigGroup *config, TQMap< TQString, TQSt for( input = _accountinput->first(); input; input = _accountinput->next() ) if( entries->tqcontains( input->configName() ) ) - input->setValue( *(entries->find( input->configName() ) ) ); + input->setValue( *(entries->tqfind( input->configName() ) ) ); this->edInterval->setText( _config->readEntry( "interval", "300" ) ); @@ -117,7 +117,7 @@ void KornAccountCfgImpl::writeConfig() if( map->tqcontains( "password" ) ) { - KOrnPassword::writeKOrnPassword( _boxnr, _accountnr, *_config, *map->find( "password" ) ); + KOrnPassword::writeKOrnPassword( _boxnr, _accountnr, *_config, *map->tqfind( "password" ) ); map->erase( "password" ); } @@ -205,14 +205,14 @@ void KornAccountCfgImpl::slotProtocolChanged( const TQString& proto ) grid->setMargin( 15 ); for( input = _accountinput->first(); input; input = _accountinput->next() ) { - if( input->leftWidget() && _groupBoxes->at( groupCounter ) == input->leftWidget()->parent() ) + if( input->leftWidget() && _groupBoxes->at( groupCounter ) == input->leftWidget()->tqparent() ) { grid->addWidget( input->leftWidget(), counter, 0 ); - if( input->rightWidget() && _groupBoxes->at( groupCounter ) == input->rightWidget()->parent() ) + if( input->rightWidget() && _groupBoxes->at( groupCounter ) == input->rightWidget()->tqparent() ) grid->addWidget( input->rightWidget(), counter, 1 ); ++counter; } else { - if( input->rightWidget() && _groupBoxes->at( groupCounter ) == input->rightWidget()->parent() ) + if( input->rightWidget() && _groupBoxes->at( groupCounter ) == input->rightWidget()->tqparent() ) { grid->addWidget( input->rightWidget(), counter, 1 ); ++counter; diff --git a/korn/kornaccountcfgimpl.h b/korn/kornaccountcfgimpl.h index 9be27bc6..d00da509 100644 --- a/korn/kornaccountcfgimpl.h +++ b/korn/kornaccountcfgimpl.h @@ -37,8 +37,9 @@ template< class T > class TQPtrVector; class KornAccountCfgImpl : public KornAccountCfg { Q_OBJECT + TQ_OBJECT public: - KornAccountCfgImpl( TQWidget * parent = 0, const char * name = 0 ); + KornAccountCfgImpl( TQWidget * tqparent = 0, const char * name = 0 ); ~KornAccountCfgImpl(); void readConfig( KConfigGroup *config, TQMap< TQString, TQString > *entries, int boxnr, int accountnr ); diff --git a/korn/kornapp.h b/korn/kornapp.h index c07ac55c..513695b2 100644 --- a/korn/kornapp.h +++ b/korn/kornapp.h @@ -17,6 +17,7 @@ class KornShell; class KornApp : public KUniqueApplication { Q_OBJECT + TQ_OBJECT public: /** diff --git a/korn/kornboxcfg.ui b/korn/kornboxcfg.ui index 3f69aabf..69806308 100644 --- a/korn/kornboxcfg.ui +++ b/korn/kornboxcfg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KornBoxCfg</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KornBoxCfg</cstring> </property> @@ -16,11 +16,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget3</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -31,7 +31,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="1" column="2"> + <widget class="TQLayoutWidget" row="1" column="2"> <property name="name"> <cstring>tqlayout32</cstring> </property> @@ -39,7 +39,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chNewText</cstring> </property> @@ -67,7 +67,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="2" column="1"> + <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> <cstring>tqlayout34</cstring> </property> @@ -75,7 +75,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chNormalBack</cstring> </property> @@ -106,7 +106,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>lbIcon</cstring> </property> @@ -114,7 +114,7 @@ <string>Icon:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lbBackground</cstring> </property> @@ -122,7 +122,7 @@ <string>Background:</string> </property> </widget> - <widget class="QLayoutWidget" row="2" column="2"> + <widget class="TQLayoutWidget" row="2" column="2"> <property name="name"> <cstring>tqlayout33</cstring> </property> @@ -130,7 +130,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chNewBack</cstring> </property> @@ -154,7 +154,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lbNormal</cstring> </property> @@ -165,7 +165,7 @@ <set>AlignCenter</set> </property> </widget> - <widget class="QLayoutWidget" row="3" column="2"> + <widget class="TQLayoutWidget" row="3" column="2"> <property name="name"> <cstring>tqlayout36</cstring> </property> @@ -173,7 +173,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chNewIcon</cstring> </property> @@ -194,7 +194,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>lbNew</cstring> </property> @@ -205,7 +205,7 @@ <set>AlignCenter</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lbText</cstring> </property> @@ -213,7 +213,7 @@ <string>Text:</string> </property> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> <cstring>tqlayout31</cstring> </property> @@ -221,7 +221,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chNormalText</cstring> </property> @@ -249,7 +249,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="3" column="1"> + <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> <cstring>tqlayout35</cstring> </property> @@ -257,7 +257,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chNormalIcon</cstring> </property> @@ -295,7 +295,7 @@ </size> </property> </spacer> - <widget class="QLayoutWidget" row="5" column="1"> + <widget class="TQLayoutWidget" row="5" column="1"> <property name="name"> <cstring>tqlayout29</cstring> </property> @@ -303,7 +303,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chNormalAnim</cstring> </property> @@ -311,7 +311,7 @@ <string></string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbNormalAnim</cstring> </property> @@ -324,7 +324,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="5" column="2"> + <widget class="TQLayoutWidget" row="5" column="2"> <property name="name"> <cstring>tqlayout28</cstring> </property> @@ -332,7 +332,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chNewAnim</cstring> </property> @@ -340,7 +340,7 @@ <string></string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbNewAnim</cstring> </property> @@ -353,7 +353,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>lbAnimation</cstring> </property> @@ -361,7 +361,7 @@ <string>Animation:</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>lbFont</cstring> </property> @@ -369,7 +369,7 @@ <string>Font:</string> </property> </widget> - <widget class="QLayoutWidget" row="4" column="2"> + <widget class="TQLayoutWidget" row="4" column="2"> <property name="name"> <cstring>tqlayout28_2</cstring> </property> @@ -377,7 +377,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chNewFont</cstring> </property> @@ -385,7 +385,7 @@ <string></string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbNewFont</cstring> </property> @@ -398,7 +398,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="4" column="1"> + <widget class="TQLayoutWidget" row="4" column="1"> <property name="name"> <cstring>tqlayout29_2</cstring> </property> @@ -406,7 +406,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chNormalFont</cstring> </property> @@ -414,7 +414,7 @@ <string></string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbNormalFont</cstring> </property> @@ -429,7 +429,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -440,7 +440,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>tqlayout31</cstring> </property> @@ -448,7 +448,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>lbLeft</cstring> </property> @@ -459,7 +459,7 @@ <set>AlignCenter</set> </property> </widget> - <widget class="QLayoutWidget" row="5" column="2"> + <widget class="TQLayoutWidget" row="5" column="2"> <property name="name"> <cstring>tqlayout52_7</cstring> </property> @@ -484,7 +484,7 @@ </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chMiddleRun</cstring> </property> @@ -511,7 +511,7 @@ </spacer> </hbox> </widget> - <widget class="QLabel" row="1" column="3"> + <widget class="TQLabel" row="1" column="3"> <property name="name"> <cstring>lbRight</cstring> </property> @@ -522,7 +522,7 @@ <set>AlignCenter</set> </property> </widget> - <widget class="QLayoutWidget" row="2" column="2"> + <widget class="TQLayoutWidget" row="2" column="2"> <property name="name"> <cstring>tqlayout52</cstring> </property> @@ -547,7 +547,7 @@ </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chMiddleRecheck</cstring> </property> @@ -574,7 +574,7 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget" row="3" column="1"> + <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> <cstring>tqlayout52_4</cstring> </property> @@ -599,7 +599,7 @@ </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chLeftReset</cstring> </property> @@ -626,7 +626,7 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget" row="5" column="3"> + <widget class="TQLayoutWidget" row="5" column="3"> <property name="name"> <cstring>tqlayout52_9</cstring> </property> @@ -651,7 +651,7 @@ </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chRightRun</cstring> </property> @@ -678,7 +678,7 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget" row="2" column="1"> + <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> <cstring>tqlayout52</cstring> </property> @@ -703,7 +703,7 @@ </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chLeftRecheck</cstring> </property> @@ -730,7 +730,7 @@ </spacer> </hbox> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>lbReset</cstring> </property> @@ -738,7 +738,7 @@ <string>Reset counter:</string> </property> </widget> - <widget class="QLabel" row="0" column="1" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>lbMouseButton</cstring> </property> @@ -749,7 +749,7 @@ <set>AlignCenter</set> </property> </widget> - <widget class="QLayoutWidget" row="4" column="3"> + <widget class="TQLayoutWidget" row="4" column="3"> <property name="name"> <cstring>tqlayout52_9</cstring> </property> @@ -774,7 +774,7 @@ </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chRightView</cstring> </property> @@ -801,7 +801,7 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget" row="5" column="1"> + <widget class="TQLayoutWidget" row="5" column="1"> <property name="name"> <cstring>tqlayout52_5</cstring> </property> @@ -826,7 +826,7 @@ </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chLeftRun</cstring> </property> @@ -853,7 +853,7 @@ </spacer> </hbox> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>lbMiddle</cstring> </property> @@ -864,7 +864,7 @@ <set>AlignCenter</set> </property> </widget> - <widget class="QLayoutWidget" row="6" column="1"> + <widget class="TQLayoutWidget" row="6" column="1"> <property name="name"> <cstring>tqlayout52_5</cstring> </property> @@ -889,7 +889,7 @@ </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chLeftPopup</cstring> </property> @@ -916,7 +916,7 @@ </spacer> </hbox> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>lbPopup</cstring> </property> @@ -924,7 +924,7 @@ <string>Popup:</string> </property> </widget> - <widget class="QLayoutWidget" row="3" column="3"> + <widget class="TQLayoutWidget" row="3" column="3"> <property name="name"> <cstring>tqlayout52_8</cstring> </property> @@ -949,7 +949,7 @@ </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chRightReset</cstring> </property> @@ -976,7 +976,7 @@ </spacer> </hbox> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>lbView</cstring> </property> @@ -984,7 +984,7 @@ <string>View emails:</string> </property> </widget> - <widget class="QLayoutWidget" row="6" column="2"> + <widget class="TQLayoutWidget" row="6" column="2"> <property name="name"> <cstring>tqlayout52_7</cstring> </property> @@ -1009,7 +1009,7 @@ </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chMiddlePopup</cstring> </property> @@ -1036,7 +1036,7 @@ </spacer> </hbox> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lbRecheck</cstring> </property> @@ -1044,7 +1044,7 @@ <string>Recheck:</string> </property> </widget> - <widget class="QLayoutWidget" row="4" column="1"> + <widget class="TQLayoutWidget" row="4" column="1"> <property name="name"> <cstring>tqlayout52_5</cstring> </property> @@ -1069,7 +1069,7 @@ </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chLeftView</cstring> </property> @@ -1096,7 +1096,7 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget" row="2" column="3"> + <widget class="TQLayoutWidget" row="2" column="3"> <property name="name"> <cstring>tqlayout52_3</cstring> </property> @@ -1121,7 +1121,7 @@ </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chRightRecheck</cstring> </property> @@ -1148,7 +1148,7 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget" row="3" column="2"> + <widget class="TQLayoutWidget" row="3" column="2"> <property name="name"> <cstring>tqlayout52_6</cstring> </property> @@ -1173,7 +1173,7 @@ </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chMiddleReset</cstring> </property> @@ -1200,7 +1200,7 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget" row="4" column="2"> + <widget class="TQLayoutWidget" row="4" column="2"> <property name="name"> <cstring>tqlayout52_7</cstring> </property> @@ -1225,7 +1225,7 @@ </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chMiddleView</cstring> </property> @@ -1252,7 +1252,7 @@ </spacer> </hbox> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>lbRun</cstring> </property> @@ -1260,7 +1260,7 @@ <string>Run command:</string> </property> </widget> - <widget class="QLayoutWidget" row="6" column="3"> + <widget class="TQLayoutWidget" row="6" column="3"> <property name="name"> <cstring>tqlayout52_9</cstring> </property> @@ -1285,7 +1285,7 @@ </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chRightPopup</cstring> </property> @@ -1314,7 +1314,7 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>tqlayout31_3</cstring> </property> @@ -1322,7 +1322,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lbCommand</cstring> </property> @@ -1343,7 +1343,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>gbNewMail</cstring> </property> @@ -1354,7 +1354,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>tqlayout33</cstring> </property> @@ -1367,7 +1367,7 @@ <cstring>edNewRun</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lbNewRun</cstring> </property> @@ -1383,7 +1383,7 @@ <cstring>edPlaySound</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lbPlaySound</cstring> </property> @@ -1396,7 +1396,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chShowPassive</cstring> </property> @@ -1404,7 +1404,7 @@ <string>Show &passive popup</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chPassiveDate</cstring> </property> @@ -1419,7 +1419,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -1435,7 +1435,7 @@ <cstring>elbAccounts</cstring> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbEdit</cstring> </property> @@ -1445,7 +1445,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -1665,7 +1665,7 @@ <tabstop>chPassiveDate</tabstop> <tabstop>pbEdit</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot access="protected">slotEditBox()</slot> <slot access="protected">slotActivated( const QString& )</slot> <slot access="protected">slotActivated( const int )</slot> @@ -1676,7 +1676,7 @@ <slot access="protected">slotChangeNewAnim()</slot> <slot access="protected">slotNormalAnimToggled( bool )</slot> <slot access="protected">slotNewAnimToggled( bool )</slot> -</slots> +</Q_SLOTS> <tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> diff --git a/korn/kornboxcfgimpl.cpp b/korn/kornboxcfgimpl.cpp index f7c1845f..58ffd4da 100644 --- a/korn/kornboxcfgimpl.cpp +++ b/korn/kornboxcfgimpl.cpp @@ -38,8 +38,8 @@ class KConfig; #include <tqlabel.h> #include <tqstring.h> -KornBoxCfgImpl::KornBoxCfgImpl( TQWidget * parent, const char * name ) - : KornBoxCfg( parent, name ), +KornBoxCfgImpl::KornBoxCfgImpl( TQWidget * tqparent, const char * name ) + : KornBoxCfg( tqparent, name ), _config( 0 ), _base( 0 ), _index( -1 ) @@ -56,8 +56,8 @@ KornBoxCfgImpl::KornBoxCfgImpl( TQWidget * parent, const char * name ) if( lbRight->text() == "Right" ) lbRight->setText( i18n( "Right" ) ); - connect( parent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) ); - connect( parent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) ); + connect( tqparent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) ); + connect( tqparent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) ); elbAccounts->setTitle( i18n( "Accounts" ) ); @@ -100,13 +100,13 @@ void KornBoxCfgImpl::writeConfig( KConfig * config, const int index ) void KornBoxCfgImpl::readViewConfig() { this->chNormalText->setChecked(_config->readBoolEntry ( "hasnormalfgcolour", true ) ); - this->cbNormalText->setColor( _config->readColorEntry( "normalfgcolour", &Qt::black ) ); + this->cbNormalText->setColor( _config->readColorEntry( "normalfgcolour", &TQt::black ) ); this->chNewText->setChecked( _config->readBoolEntry ( "hasnewfgcolour", true ) ); - this->cbNewText->setColor( _config->readColorEntry( "newfgcolour", &Qt::black ) ); + this->cbNewText->setColor( _config->readColorEntry( "newfgcolour", &TQt::black ) ); this->chNormalBack->setChecked(_config->readBoolEntry ( "hasnormalbgcolour", false ) ); - this->cbNormalBack->setColor( _config->readColorEntry( "normalbgcolour", &Qt::white ) ); + this->cbNormalBack->setColor( _config->readColorEntry( "normalbgcolour", &TQt::white ) ); this->chNewBack->setChecked( _config->readBoolEntry ( "hasnewbgcolour", false ) ); - this->cbNewBack->setColor( _config->readColorEntry( "newbgcolour", &Qt::white ) ); + this->cbNewBack->setColor( _config->readColorEntry( "newbgcolour", &TQt::white ) ); this->chNormalIcon->setChecked(_config->readBoolEntry( "hasnormalicon", false ) ); this->ibNormalIcon->setIcon( _config->readEntry ( "normalicon", "" ) ); @@ -274,13 +274,13 @@ void KornBoxCfgImpl::slotSetDefaults( const TQString& name, const int, KConfig* { config->writeEntry( "name", name ); config->writeEntry( "protocol", "mbox" ); - config->writeEntry( "host", TQString::null ); - config->writeEntry( "port", TQString::null ); - config->writeEntry( "username", TQString::null ); + config->writeEntry( "host", TQString() ); + config->writeEntry( "port", TQString() ); + config->writeEntry( "username", TQString() ); config->writeEntry( "mailbox", "/var/spool/mail/" ); config->writeEntry( "savepassword", 0 ); - config->writeEntry( "password", TQString::null ); - config->writeEntry( "auth", TQString::null ); + config->writeEntry( "password", TQString() ); + config->writeEntry( "auth", TQString() ); config->writeEntry( "interval", 300 ); config->writeEntry( "boxsettings", true ); config->writeEntry( "command", "" ); diff --git a/korn/kornboxcfgimpl.h b/korn/kornboxcfgimpl.h index 47bbbfd1..a3802b81 100644 --- a/korn/kornboxcfgimpl.h +++ b/korn/kornboxcfgimpl.h @@ -31,8 +31,9 @@ class TQWidget; class KornBoxCfgImpl : public KornBoxCfg { Q_OBJECT + TQ_OBJECT public: - KornBoxCfgImpl( TQWidget *parent, const char * name ); + KornBoxCfgImpl( TQWidget *tqparent, const char * name ); ~KornBoxCfgImpl(); /** diff --git a/korn/korncfg.ui b/korn/korncfg.ui index b1b55307..b43d32a4 100644 --- a/korn/korncfg.ui +++ b/korn/korncfg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KornCfgWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KornCfgWidget</cstring> </property> @@ -19,11 +19,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabKornCfg</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -39,7 +39,7 @@ <cstring>elbBoxes</cstring> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbEdit</cstring> </property> @@ -47,7 +47,7 @@ <string>&Edit</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chUseWallet</cstring> </property> @@ -60,7 +60,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -71,7 +71,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>bgCheckBoxes</cstring> </property> @@ -85,7 +85,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbHorizontal</cstring> </property> @@ -93,7 +93,7 @@ <string>&Horizontal</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbVertical</cstring> </property> @@ -101,7 +101,7 @@ <string>&Vertical</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbDocked</cstring> </property> @@ -163,7 +163,7 @@ <slot>slotEditBox()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot access="protected">slotActivated( const QString& )</slot> <slot access="protected">slotActivated( const int )</slot> <slot>slotOK()</slot> @@ -171,6 +171,6 @@ <slot>slotCancel()</slot> <slot access="protected">slotSetDefaults( const QString&, const int, KConfig* )</slot> <slot access="protected">slotEditBox()</slot> -</slots> +</Q_SLOTS> <tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/korn/korncfgimpl.cpp b/korn/korncfgimpl.cpp index df426464..487c48ba 100644 --- a/korn/korncfgimpl.cpp +++ b/korn/korncfgimpl.cpp @@ -35,10 +35,10 @@ /* - * parent should be of type KDialogBase + * tqparent should be of type KDialogBase */ -KornCfgImpl::KornCfgImpl( TQWidget * parent, const char * name ) - : KornCfgWidget( parent, name ), +KornCfgImpl::KornCfgImpl( TQWidget * tqparent, const char * name ) + : KornCfgWidget( tqparent, name ), _config( new KConfig( "kornrc" ) ), _base( 0 ) { @@ -47,9 +47,9 @@ KornCfgImpl::KornCfgImpl( TQWidget * parent, const char * name ) elbBoxes->setConfig( _config ); elbBoxes->setTitle( i18n( "Boxes" ) ); - connect( parent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) ); - connect( parent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) ); - connect( parent, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( slotApply() ) ); + connect( tqparent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) ); + connect( tqparent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) ); + connect( tqparent, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( slotApply() ) ); connect( elbBoxes, TQT_SIGNAL( elementsSwapped( int, int ) ), this, TQT_SLOT( slotElementsSwapped( int, int ) ) ); connect( elbBoxes, TQT_SIGNAL( elementDeleted( int ) ), this, TQT_SLOT( slotElementDeleted( int ) ) ); @@ -131,14 +131,14 @@ void KornCfgImpl::slotSetDefaults( const TQString& name, const int index, KConfi config->writeEntry( "hasnewicon", false ); config->writeEntry( "hasnormalanim", false ); config->writeEntry( "hasnewanim", false ); - config->writeEntry( "normalfgcolour", Qt::black ); - config->writeEntry( "newfgcolour", Qt::black ); - config->writeEntry( "normalbgcolour", TQString::null ); - config->writeEntry( "newbgcolour", TQString::null ); - config->writeEntry( "normalicon", TQString::null ); - config->writeEntry( "newicon", TQString::null ); - config->writeEntry( "normalanim", TQString::null ); - config->writeEntry( "newanim", TQString::null ); + config->writeEntry( "normalfgcolour", TQt::black ); + config->writeEntry( "newfgcolour", TQt::black ); + config->writeEntry( "normalbgcolour", TQString() ); + config->writeEntry( "newbgcolour", TQString() ); + config->writeEntry( "normalicon", TQString() ); + config->writeEntry( "newicon", TQString() ); + config->writeEntry( "normalanim", TQString() ); + config->writeEntry( "newanim", TQString() ); config->writeEntry( "leftrecheck", true ); config->writeEntry( "middlerecheck", false ); config->writeEntry( "rightrecheck", false ); @@ -164,13 +164,13 @@ void KornCfgImpl::slotSetDefaults( const TQString& name, const int index, KConfi config->setGroup( TQString( "korn-%1-0" ).arg( index ) ); config->writeEntry( "name", name ); config->writeEntry( "protocol", "mbox" ); - config->writeEntry( "server", TQString::null ); - config->writeEntry( "port", TQString::null ); - config->writeEntry( "username", TQString::null ); + config->writeEntry( "server", TQString() ); + config->writeEntry( "port", TQString() ); + config->writeEntry( "username", TQString() ); config->writeEntry( "mailbox", "/var/spool/mail/" ); config->writeEntry( "savepassword", 0 ); - config->writeEntry( "password", TQString::null ); - config->writeEntry( "auth", TQString::null ); + config->writeEntry( "password", TQString() ); + config->writeEntry( "auth", TQString() ); config->writeEntry( "interval", 300 ); config->writeEntry( "boxsettings", true ); config->writeEntry( "command", "" ); diff --git a/korn/korncfgimpl.h b/korn/korncfgimpl.h index 5ce4ef4a..1168ec08 100644 --- a/korn/korncfgimpl.h +++ b/korn/korncfgimpl.h @@ -29,8 +29,9 @@ class TQString; class KornCfgImpl : public KornCfgWidget { Q_OBJECT + TQ_OBJECT public: - KornCfgImpl( TQWidget * parent = 0, const char * name = 0 ); + KornCfgImpl( TQWidget * tqparent = 0, const char * name = 0 ); ~KornCfgImpl(); private slots: diff --git a/korn/kornshell.cpp b/korn/kornshell.cpp index 553cac42..f7d30358 100644 --- a/korn/kornshell.cpp +++ b/korn/kornshell.cpp @@ -32,8 +32,8 @@ #include <tqtimer.h> -KornShell::KornShell( TQWidget * parent, const char * name ) - : TQWidget( parent, name ), +KornShell::KornShell( TQWidget * tqparent, const char * name ) + : TQWidget( tqparent, name ), _config( new KConfig( "kornrc" ) ), _box( 0 ), _configDialog( 0 ), @@ -99,9 +99,9 @@ void KornShell::readConfig() KOrnPassword::setUseWallet( _config->readBoolEntry( "usewallet", false ) ); if( tqlayout == 'H' ) - _box = new HVContainer( Qt::Horizontal, this, "horizontal container" ); + _box = new HVContainer( TQt::Horizontal, this, "horizontal container" ); else if( tqlayout == 'V' ) - _box = new HVContainer( Qt::Vertical, this, "vertical container" ); + _box = new HVContainer( TQt::Vertical, this, "vertical container" ); else _box = new DockedContainer( this, "docked container" ); @@ -135,14 +135,14 @@ void KornShell::slotDialogClosed() _configDialog->deleteLater(); _configDialog = 0; //At this time, just delete all widgets and make a new one. - //Maybe, this should tqreplaces later by a better variant. + //Maybe, this should replaces later by a better variant. slotApply(); } void KornShell::slotApply() { //At this time, just delete all widgets and make a new one. - //Maybe, this should tqreplaces later by a better variant. + //Maybe, this should replaces later by a better variant. delete _box; _box = 0; diff --git a/korn/kornshell.h b/korn/kornshell.h index 1e94173a..aa97c40a 100644 --- a/korn/kornshell.h +++ b/korn/kornshell.h @@ -29,10 +29,11 @@ class KConfig; /** * This is a rewritten KornShell class. It is rewritten because the depending classes changed. */ -class KornShell : public QWidget +class KornShell : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KornShell( TQWidget * parent = 0, const char * name = 0 ); + KornShell( TQWidget * tqparent = 0, const char * name = 0 ); ~KornShell(); void show(); diff --git a/korn/label.h b/korn/label.h index 18d4cb29..86db3c42 100644 --- a/korn/label.h +++ b/korn/label.h @@ -25,10 +25,11 @@ /** * A simple overriding of the TQLabel class to get a mouseButtonPressed() signal */ -class Label : public QLabel +class Label : public TQLabel { Q_OBJECT + TQ_OBJECT public: - Label( TQWidget * parent = 0, const char * name = 0 ) : TQLabel( parent, name ) {} + Label( TQWidget * tqparent = 0, const char * name = 0 ) : TQLabel( tqparent, name ) {} virtual ~Label() {} protected: @@ -37,7 +38,7 @@ signals: /** * Emitted when a button is pressed. */ - void mouseButtonPressed( Qt::ButtonState ); + void mouseButtonPressed( TQt::ButtonState ); }; #endif //MK_LABEL_H diff --git a/korn/maildlg.cpp b/korn/maildlg.cpp index 3424e19e..5ea61430 100644 --- a/korn/maildlg.cpp +++ b/korn/maildlg.cpp @@ -7,8 +7,8 @@ #include <tqprogressdialog.h> #include "maildrop.h" -KornMailDlg::KornMailDlg( TQWidget *parent ) - : KDialogBase( parent, "maildialog", true, i18n("Mail Details"), User1|Close, Close, true, KGuiItem(i18n("&Full Message"))), +KornMailDlg::KornMailDlg( TQWidget *tqparent ) + : KDialogBase( tqparent, "maildialog", true, i18n("Mail Details"), User1|Close, Close, true, KGuiItem(i18n("&Full Message"))), _progress( 0 ) { TQWidget * page = new TQWidget( this ); diff --git a/korn/maildlg.h b/korn/maildlg.h index c8ba216a..68f8f30e 100644 --- a/korn/maildlg.h +++ b/korn/maildlg.h @@ -17,6 +17,7 @@ class TQString; class KornMailDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT /** * Edit control showing the mail (read only) @@ -45,9 +46,9 @@ class KornMailDlg : public KDialogBase public: /** * KornMailDlg Constructor - * @param parent parent widget + * @param tqparent tqparent widget */ - KornMailDlg( TQWidget *parent=0 ); + KornMailDlg( TQWidget *tqparent=0 ); /** * Set the mail details to show. The mails body is transfered to the edit control diff --git a/korn/maildrop.h b/korn/maildrop.h index b15ec973..160a59cd 100644 --- a/korn/maildrop.h +++ b/korn/maildrop.h @@ -27,9 +27,10 @@ template< class T, class R > class TQMap; * @author Sirtaj Singh Kang (taj@kde.org) * @version $Id$ */ -class KMailDrop : public QObject +class KMailDrop : public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -358,7 +359,7 @@ signals: /** * The next signal is emitted when a passive popup could be displayed. - * As argument, there is a KornSubject, which tqcontains a subject and + * As argument, there is a KornSubject, which contains a subject and * some more info that could be used with the popup. */ void showPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& realname ); diff --git a/korn/mailsubject.cpp b/korn/mailsubject.cpp index d431f440..b71205b1 100644 --- a/korn/mailsubject.cpp +++ b/korn/mailsubject.cpp @@ -54,20 +54,20 @@ TQString KornMailSubject::toString() const date.setTime_t(_date); return TQString("KornMailSubject, Id: ") + (_id?_id->toString():TQString("NULL")) + ", " + i18n("Subject:") + " " + _subject + ", " + i18n("Sender:") + " " + _sender + ", " + i18n("Size:") + " " + TQString::number(_size) - + ", " + i18n("Date:") + " " + date.toString(Qt::ISODate); + + ", " + i18n("Date:") + " " + date.toString(TQt::ISODate); } TQString KornMailSubject::decodeRFC2047String(const TQCString& aStr) { if ( aStr.isEmpty() ) - return TQString::null; + return TQString(); const TQCString str = unfold( aStr ); if ( str.isEmpty() ) - return TQString::null; + return TQString(); - if ( str.find( "=?" ) < 0 ) { + if ( str.tqfind( "=?" ) < 0 ) { // No need to decode return TQString(str); } @@ -128,7 +128,7 @@ TQString KornMailSubject::decodeRFC2047String(const TQCString& aStr) in.resetRawData( enc_start, pos - enc_start ); const TQTextCodec * codec = codecForName(charset); - if (!codec) return TQString::null; + if (!codec) return TQString(); result += codec->toUnicode(enc); lastWasEncodedWord = true; diff --git a/korn/mailsubject.h b/korn/mailsubject.h index 3e85b69e..6e4c214b 100644 --- a/korn/mailsubject.h +++ b/korn/mailsubject.h @@ -18,9 +18,9 @@ class KornMailSubject { KornMailId * _id; KMailDrop * _drop; - QString _subject; - QString _sender; - QString _header; + TQString _subject; + TQString _sender; + TQString _header; int _size; int _date; bool _fullMessage; @@ -47,7 +47,7 @@ public: KornMailSubject(const KornMailSubject & src); /** - * tqreplaces the contents of this by the contents of another + * replaces the contents of this by the contents of another * KornMailSubject instance. All data of the source * KornMailSubject instance are cloned. * @param src KornMailSubject to copy from @@ -92,7 +92,7 @@ public: /** * Set the mails header and (if possible) body. * @param header the mails header with or without body (see fullMessage parameter). - * @param fullMessage true, if header tqcontains the message body as well, false otherwise. + * @param fullMessage true, if header contains the message body as well, false otherwise. */ void setHeader(const TQString & header, bool fullMessage) {_header = header; _fullMessage = fullMessage;} @@ -103,8 +103,8 @@ public: const TQString & getHeader() const {return _header;} /** - * Return true, if the header tqcontains the header and the full message. - * Return false if the header just tqcontains the header. + * Return true, if the header contains the header and the full message. + * Return false if the header just contains the header. * @return see above. */ bool isHeaderFullMessage() const {return _fullMessage;} diff --git a/korn/password.h b/korn/password.h index 05450ae5..ebfb24c4 100644 --- a/korn/password.h +++ b/korn/password.h @@ -47,7 +47,7 @@ public: * @param box The boxnumber of the account * @param account The accountnumber of the account * @param fallbackConfig The configuration file if KWallet cannot be used. - * @return The password, or TQString::null if it failes. + * @return The password, or TQString() if it failes. */ static TQString readKOrnPassword( int box, int account, const KConfigBase& fallbackConfig ); /** @@ -55,7 +55,7 @@ public: * * @param accountnr The id of the KMail account * @param fallbackConfig The configuration used if KWallet isn't available. - * @return The password, QStirng::null if it failes. + * @return The password, TQStirng::null if it failes. */ static TQString readKMailPassword( int accountnr, const KConfigBase& fallbackConfig ); diff --git a/korn/polldrop.cpp b/korn/polldrop.cpp index 8d05a03b..7cc6bc57 100644 --- a/korn/polldrop.cpp +++ b/korn/polldrop.cpp @@ -52,7 +52,7 @@ void KPollableDrop::timerEvent( TQTimerEvent *ev ) { if( _timerRunning && (ev->timerId() == _timerId) ) { // this event is ours. - recheck(); // should be reimplemented by children. + recheck(); // should be reimplemented by tqchildren. } else { TQObject::timerEvent( ev ); diff --git a/korn/polldrop.h b/korn/polldrop.h index 94444d4d..751bebc0 100644 --- a/korn/polldrop.h +++ b/korn/polldrop.h @@ -21,6 +21,7 @@ class TQTimerEvent; class KPollableDrop : public KMailDrop { Q_OBJECT + TQ_OBJECT public: static const char *PollConfigKey; static const int DefaultPoll; diff --git a/korn/pop3_proto.cpp b/korn/pop3_proto.cpp index 6f904614..e97fd82c 100644 --- a/korn/pop3_proto.cpp +++ b/korn/pop3_proto.cpp @@ -64,10 +64,10 @@ void Pop3_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObjec void Pop3_Protocol::readEntries( TQMap< TQString, TQString >* map, TQMap< TQString, TQString > *metadata ) const { - if( map->tqcontains( "ssl" ) && *map->find( "ssl" ) == "true" ) + if( map->tqcontains( "ssl" ) && *map->tqfind( "ssl" ) == "true" ) map->insert( "encryption", "ssl" ); if( metadata->tqcontains( "tls" ) ) - map->insert( "encryption", TQString( "tls=%1" ).arg( *metadata->find( "tls" ) ) ); + map->insert( "encryption", TQString( "tls=%1" ).arg( *metadata->tqfind( "tls" ) ) ); if( metadata->tqcontains( "auth" ) ) map->insert( "auth", TQString( "auth=APOP" ) ); } @@ -77,21 +77,21 @@ void Pop3_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const TQString metadata; if( map->tqcontains( "encryption" ) ) { - if( *map->find( "encryption" ) == "ssl" ) + if( *map->tqfind( "encryption" ) == "ssl" ) map->insert( "ssl", "true" ); else { map->insert( "ssl", "false" ); - metadata += *map->find( "encryption" ); + metadata += *map->tqfind( "encryption" ); } map->erase( "encryption" ); } if( map->tqcontains( "auth" ) ) { - if( !metadata.isEmpty() && ! (*map->find( "auth" )).isEmpty() ) + if( !metadata.isEmpty() && ! (*map->tqfind( "auth" )).isEmpty() ) metadata += ","; - metadata += *map->find( "auth" ); + metadata += *map->tqfind( "auth" ); map->erase( "auth" ); } diff --git a/korn/progress_dialog.ui b/korn/progress_dialog.ui index d21ecee2..9cb237ba 100644 --- a/korn/progress_dialog.ui +++ b/korn/progress_dialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>DoubleProgressDialog</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>DoubleProgressDialog</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lbText</cstring> </property> @@ -27,17 +27,17 @@ <string></string> </property> </widget> - <widget class="QProgressBar"> + <widget class="TQProgressBar"> <property name="name"> <cstring>pbBoxes</cstring> </property> </widget> - <widget class="QProgressBar"> + <widget class="TQProgressBar"> <property name="name"> <cstring>pbProgress</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>tqlayout1</cstring> </property> @@ -62,7 +62,7 @@ </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbCancel</cstring> </property> @@ -105,16 +105,16 @@ <includes> <include location="local" impldecl="in implementation">progress_dialog.ui.h</include> </includes> -<signals> +<Q_SIGNALS> <signal>cancelPressed()</signal> -</signals> -<slots> +</Q_SIGNALS> +<Q_SLOTS> <slot>setText( const QString & str )</slot> <slot>setNumberOfBoxes( int number )</slot> <slot>setProgressOfBoxes( int number )</slot> <slot>setNumberOfSteps( int number )</slot> <slot>setProgress( int number )</slot> <slot access="private" specifier="non virtual">cancelbutton()</slot> -</slots> +</Q_SLOTS> <tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/korn/progress_dialog.ui.h b/korn/progress_dialog.ui.h index 2407ca53..a9188a90 100644 --- a/korn/progress_dialog.ui.h +++ b/korn/progress_dialog.ui.h @@ -20,7 +20,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you want to add, delete, or rename functions or slots, use -** Qt Designer to update this file, preserving your code. +** TQt Designer to update this file, preserving your code. ** ** You should not define a constructor or destructor in this file. ** Instead, write your code in functions called init() and destroy(). diff --git a/korn/protocols.cpp b/korn/protocols.cpp index 526c099b..c35ce4ba 100644 --- a/korn/protocols.cpp +++ b/korn/protocols.cpp @@ -42,7 +42,7 @@ const Protocol* Protocols::getProto( const TQString& proto ) if( !protocols ) fillProtocols(); - return protocols->find( proto ); + return protocols->tqfind( proto ); } const Protocol* Protocols::firstProtocol() @@ -75,7 +75,7 @@ void Protocols::fillProtocols() addProtocol( new Pop3_Protocol ); addProtocol( new Process_Protocol ); addProtocol( new Nntp_Protocol ); - addProtocol( new QMail_Protocol ); + addProtocol( new TQMail_Protocol ); addProtocol( new DCOP_Protocol ); addProtocol( new KMail_Protocol ); } diff --git a/korn/qmail_proto.cpp b/korn/qmail_proto.cpp index 55b98123..c902ad49 100644 --- a/korn/qmail_proto.cpp +++ b/korn/qmail_proto.cpp @@ -28,22 +28,22 @@ #include "account_input.h" -void QMail_Protocol::configFillGroupBoxes( TQStringList* groupBoxes ) const +void TQMail_Protocol::configFillGroupBoxes( TQStringList* groupBoxes ) const { groupBoxes->append( "Maildir" ); } -void QMail_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObject*, TQPtrList< AccountInput > *result ) const +void TQMail_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObject*, TQPtrList< AccountInput > *result ) const { result->append( new URLInput( (TQWidget*)vector->at( 0 ), i18n( "Path:" ), "", "mailbox" ) ); dynamic_cast<KURLRequester*>(result->last()->rightWidget())->setMode( KFile::Directory ); } -void QMail_Protocol::readEntries( TQMap< TQString, TQString >*, TQMap< TQString, TQString >* ) const +void TQMail_Protocol::readEntries( TQMap< TQString, TQString >*, TQMap< TQString, TQString >* ) const { } -void QMail_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const +void TQMail_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const { clearFields( map, (KIO_Protocol::Fields)( server | port | username | password | save_password | metadata ) ); } diff --git a/korn/qmail_proto.h b/korn/qmail_proto.h index aaa722ee..4abd7fbc 100644 --- a/korn/qmail_proto.h +++ b/korn/qmail_proto.h @@ -16,18 +16,18 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef MK_QMAIL_PROTO_H -#define MK_QMAIL_PROTO_H +#ifndef MK_TQMAIL_PROTO_H +#define MK_TQMAIL_PROTO_H #include "kio_proto.h" -class QMail_Protocol : public KIO_Protocol +class TQMail_Protocol : public KIO_Protocol { public: - QMail_Protocol() {} - virtual ~QMail_Protocol() {} + TQMail_Protocol() {} + virtual ~TQMail_Protocol() {} - virtual KIO_Protocol * clone() const { return new QMail_Protocol; } + virtual KIO_Protocol * clone() const { return new TQMail_Protocol; } virtual bool connectionBased() const { return false; } diff --git a/korn/subjectsdlg.cpp b/korn/subjectsdlg.cpp index b001f776..f770d075 100644 --- a/korn/subjectsdlg.cpp +++ b/korn/subjectsdlg.cpp @@ -13,9 +13,9 @@ #include "maildlg.h" #include "progress_dialog.h" -KornSubjectsDlg::SubjectListViewItem::SubjectListViewItem( TQListView *parent, KornMailSubject * item) +KornSubjectsDlg::SubjectListViewItem::SubjectListViewItem( TQListView *tqparent, KornMailSubject * item) // set the column strings except column 2 (date) - : KListViewItem(parent, item->getSender(), item->getSubject(), "", KGlobal::locale()->formatNumber(item->getSize(), 0)) + : KListViewItem(tqparent, item->getSender(), item->getSubject(), "", KGlobal::locale()->formatNumber(item->getSize(), 0)) , _mailSubject( new KornMailSubject( *item ) ) { // convert the date according to the user settings and show it in column 2 @@ -53,14 +53,14 @@ int KornSubjectsDlg::SubjectListViewItem::compare( TQListViewItem* item, int col } } -KornSubjectsDlg::KornSubjectsDlg( TQWidget *parent ) - : KDialogBase( parent, "urldialog", true, "test", Close, Close, true), _mailDrop( new TQPtrList< KMailDrop > ), +KornSubjectsDlg::KornSubjectsDlg( TQWidget *tqparent ) + : KDialogBase( tqparent, "urldialog", true, "test", Close, Close, true), _mailDrop( new TQPtrList< KMailDrop > ), _subjects(0), _delete(0), mailDlg(0), _canDeleteMaildrop( true ) { _loadSubjectsCanceled = false; setModal( true ); - // The dialog tqcontains a list view and several buttons. + // The dialog contains a list view and several buttons. // Two box tqlayouts hol dthem. TQWidget * page = new TQWidget( this ); setMainWidget(page); @@ -88,8 +88,8 @@ KornSubjectsDlg::KornSubjectsDlg( TQWidget *parent ) _list->addColumn(i18n("Date")); _list->addColumn(i18n("Size (Bytes)")); - // column 3 tqcontains a number (change tqalignment) - _list->setColumnAlignment(3, Qt::AlignRight); + // column 3 contains a number (change tqalignment) + _list->setColumnAlignment(3, TQt::AlignRight); _list->setItemMargin(3); // connect the selection changed and double click events of the list view diff --git a/korn/subjectsdlg.h b/korn/subjectsdlg.h index e7c032c2..8201e8e6 100644 --- a/korn/subjectsdlg.h +++ b/korn/subjectsdlg.h @@ -24,6 +24,7 @@ template< class T > class TQPtrList; class KornSubjectsDlg: public KDialogBase { Q_OBJECT + TQ_OBJECT /** * SubjectListViewItem is a helper class representing one line in the list view. @@ -35,11 +36,11 @@ class KornSubjectsDlg: public KDialogBase public: /** * SubjectListViewItem Constructor - * @param parent list view + * @param tqparent list view * @param item KornMailSubject this item should represent. It is NOT deleted * if SubjectListViewItem is deleted. */ - SubjectListViewItem( TQListView *parent, KornMailSubject * item); + SubjectListViewItem( TQListView *tqparent, KornMailSubject * item); /** * SubjectListViewItem Destructor @@ -103,9 +104,9 @@ class KornSubjectsDlg: public KDialogBase public: /** * KornSubjectsDlg Constructor - * @param parent parent widget + * @param tqparent tqparent widget */ - KornSubjectsDlg( TQWidget *parent=0 ); + KornSubjectsDlg( TQWidget *tqparent=0 ); /** * This functions clears all available KMailDrop's. diff --git a/korn/systemtray.cpp b/korn/systemtray.cpp index e7ca45f7..67a58eb0 100644 --- a/korn/systemtray.cpp +++ b/korn/systemtray.cpp @@ -24,8 +24,8 @@ #include <tqmovie.h> -SystemTray::SystemTray( TQWidget * parent, const char * name ) - : KSystemTray( parent, name ) +SystemTray::SystemTray( TQWidget * tqparent, const char * name ) + : KSystemTray( tqparent, name ) { } diff --git a/korn/systemtray.h b/korn/systemtray.h index 83daaeb3..6338ae57 100644 --- a/korn/systemtray.h +++ b/korn/systemtray.h @@ -31,13 +31,14 @@ class TQWidget; */ class SystemTray : public KSystemTray { Q_OBJECT + TQ_OBJECT public: /** - * This contructor gives all it parameters to its parents. - * @param parant The parent window - * @param name The name of the QObject's parents. + * This contructor gives all it parameters to its tqparents. + * @param parant The tqparent window + * @param name The name of the TQObject's tqparents. */ - SystemTray( TQWidget * parent = 0, const char * name = 0 ); + SystemTray( TQWidget * tqparent = 0, const char * name = 0 ); /** * Empty destructor; does nothing at the moment */ @@ -47,12 +48,12 @@ protected: /** * Reimplementation because in the reimplementation of KSystray it popup's of restores. * In this implemention, the action depends on the settings. - * @param me An object which tqcontains the mousebutton which is pressed. + * @param me An object which contains the mousebutton which is pressed. */ virtual void mousePressEvent( TQMouseEvent* me ); signals: - void mouseButtonPressed( Qt::ButtonState ); + void mouseButtonPressed( TQt::ButtonState ); }; #endif //MK_SYSTEMTRAY_H |