diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 04:12:51 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 04:12:51 +0000 |
commit | 560378aaca1784ba19806a0414a32b20c744de39 (patch) | |
tree | ce0dfd7c3febf2a1adc7603d1019a8be2083c415 /kio/kfile | |
parent | d4d5af1cdbd3cc65d095e0afc5b1f4260091cf5d (diff) | |
download | tdelibs-560378aaca1784ba19806a0414a32b20c744de39.tar.gz tdelibs-560378aaca1784ba19806a0414a32b20c744de39.zip |
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kio/kfile')
62 files changed, 660 insertions, 660 deletions
diff --git a/kio/kfile/ChangeLog b/kio/kfile/ChangeLog index bb43f16da..3f121b600 100644 --- a/kio/kfile/ChangeLog +++ b/kio/kfile/ChangeLog @@ -34,7 +34,7 @@ Fri Feb 18 23:35:04 2000 Carsten Pfeiffer <pfeiffer@kde.org> Thu Feb 17 19:09:54 2000 Carsten Pfeiffer <pfeiffer@kde.org> * kfiledialog.{cpp,h} (KDirComboBox): - Added KDirComboBox and replaced the directory combobox with it. It + Added KDirComboBox and tqreplaced the directory combobox with it. It even does something now :) Items need to be indented tho. * kfilereader.cpp, kdiroperator.{cpp,h}: @@ -43,12 +43,12 @@ Thu Feb 17 19:09:54 2000 Carsten Pfeiffer <pfeiffer@kde.org> Tue Feb 15 14:21:41 2000 Carsten Pfeiffer <pfeiffer@kde.org> * kfile.h (class KFile): - added a small class that contains all the enums now. + added a small class that tqcontains all the enums now. cleaned up the enums (hope not too many apps will be broken) added flags for "Existing files only" and "local files only" * all views (setSelected()): - replaced highlightItem(item) with setSelected(item, bool) which makes + tqreplaced highlightItem(item) with setSelected(item, bool) which makes it more suitable and more consistent with Qt. added selectionChanged() method (necessary for multiselection) @@ -161,12 +161,12 @@ Sat Jan 29 15:33:37 2000 Carsten Pfeiffer <pfeiffer@kde.org> * kfileview.cpp (compareItems): - added support to disable sorting directories first (QDir::DirsFirst) - added support to sort by date and to sort reversed - - removed unused findCompletion method + - removed unused tqfindCompletion method - sort case insensitive by default - some optimization for mergeList - fixed infinite loop in mergeLists, when the lists are the same (I think another one is still there, but I'm tired now) - - changed setSortMode stuff: Switching-mode replaced with + - changed setSortMode stuff: Switching-mode tqreplaced with sortReversed(). The enum Switching will be removed, soon. - made setSortMode public @@ -292,7 +292,7 @@ Wed Dec 2 15:59:13 1998 Carsten Pfeiffer <pfeiffer@kde.org> * kfilesimpleview.cpp: added some checks to prevent division with zero using the latest qt snapshots - * kfilesimpleview.cpp: added a repaint call after a resize + * kfilesimpleview.cpp: added a tqrepaint call after a resize * kfiledialog.cpp: new experimental button order @@ -599,7 +599,7 @@ Wed Mar 18 02:56:32 1998 Stephan Kulow <coolo@kde.org> * kdir.cpp: disable parent button in / - * kfiledialog.cpp: fixed layout of mkdir dialog + * kfiledialog.cpp: fixed tqlayout of mkdir dialog * kdir.cpp: use currentDir instead of homeDir as default @@ -666,7 +666,7 @@ Tue Feb 10 01:09:16 1998 Richard Moore <rich@kde.org> Fri Feb 6 18:08:14 1998 Stephan Kulow <coolo@kde.org> - * kfiledialog.cpp: replaced the location lineedit with an combo + * kfiledialog.cpp: tqreplaced the location lineedit with an combo box. Currently configurable with a compiler define. Fri Feb 6 17:07:26 1998 Stephan Kulow <coolo@kde.org> @@ -694,7 +694,7 @@ Mon Jan 19 01:10:11 1998 Stephan Kulow <coolo@kde.org> * kdir.cpp: added isReadable() to indicate, that the dir is not correct - * kfiledialog.cpp: played a little bit with the geometry management + * kfiledialog.cpp: played a little bit with the tqgeometry management Sun Jan 18 15:00:06 1998 Stephan Kulow <coolo@kde.org> diff --git a/kio/kfile/NOTES b/kio/kfile/NOTES index c3fb6fbcb..0fe395c85 100644 --- a/kio/kfile/NOTES +++ b/kio/kfile/NOTES @@ -29,7 +29,7 @@ for more integration between kfile and konqueror. 16/08/2000. has a QWidget * canvas() method, xOffset() and yOffset() (4) KFileIconView holds a QPtrDict to look up a QIconViewItem quickly from a given KFileItem. This will help for e.g. deleteItems and refreshItems. -(5) KFileListView holds a QPtrDict to find the QListViewItem for a +(5) KFileListView holds a QPtrDict to tqfind the QListViewItem for a KFileItem. It implements different modes if we want the tree view in kfile ? @@ -86,7 +86,7 @@ KActions for it. Important : -Make sure to take kfind into account. It would be nice if it could use the +Make sure to take ktqfind into account. It would be nice if it could use the same views as konqueror, to have access to all the view modes, as well as image preview, etc. diff --git a/kio/kfile/config-kfile.h b/kio/kfile/config-kfile.h index 8715ed273..6c18c8019 100644 --- a/kio/kfile/config-kfile.h +++ b/kio/kfile/config-kfile.h @@ -3,10 +3,10 @@ const int kfile_area = 250; -#define DefaultViewStyle TQString::fromLatin1("SimpleView") +#define DefaultViewStyle TQString::tqfromLatin1("SimpleView") #define DefaultPannerPosition 40 #define DefaultMixDirsAndFiles false -#define DefaultShowStatusLine false +#define DefaultShowtqStatusLine false #define DefaultShowHidden false #define DefaultCaseInsensitive true #define DefaultDirsFirst true @@ -14,19 +14,19 @@ const int kfile_area = 250; #define DefaultRecentURLsNumber 15 #define DefaultDirectoryFollowing true #define DefaultAutoSelectExtChecked true -#define ConfigGroup TQString::fromLatin1("KFileDialog Settings") -#define RecentURLs TQString::fromLatin1("Recent URLs") -#define RecentFiles TQString::fromLatin1("Recent Files") -#define RecentURLsNumber TQString::fromLatin1("Maximum of recent URLs") -#define RecentFilesNumber TQString::fromLatin1("Maximum of recent files") -#define DialogWidth TQString::fromLatin1("Width (%1)") -#define DialogHeight TQString::fromLatin1("Height (%1)") -#define ConfigShowStatusLine TQString::fromLatin1("ShowStatusLine") -#define AutoDirectoryFollowing TQString::fromLatin1("Automatic directory following") -#define PathComboCompletionMode TQString::fromLatin1("PathCombo Completionmode") -#define LocationComboCompletionMode TQString::fromLatin1("LocationCombo Completionmode") -#define ShowSpeedbar TQString::fromLatin1("Show Speedbar") -#define ShowBookmarks TQString::fromLatin1("Show Bookmarks") -#define AutoSelectExtChecked TQString::fromLatin1("Automatically select filename extension") +#define ConfigGroup TQString::tqfromLatin1("KFileDialog Settings") +#define RecentURLs TQString::tqfromLatin1("Recent URLs") +#define RecentFiles TQString::tqfromLatin1("Recent Files") +#define RecentURLsNumber TQString::tqfromLatin1("Maximum of recent URLs") +#define RecentFilesNumber TQString::tqfromLatin1("Maximum of recent files") +#define DialogWidth TQString::tqfromLatin1("Width (%1)") +#define DialogHeight TQString::tqfromLatin1("Height (%1)") +#define ConfigShowtqStatusLine TQString::tqfromLatin1("ShowtqStatusLine") +#define AutoDirectoryFollowing TQString::tqfromLatin1("Automatic directory following") +#define PathComboCompletionMode TQString::tqfromLatin1("PathCombo Completionmode") +#define LocationComboCompletionMode TQString::tqfromLatin1("LocationCombo Completionmode") +#define ShowSpeedbar TQString::tqfromLatin1("Show Speedbar") +#define ShowBookmarks TQString::tqfromLatin1("Show Bookmarks") +#define AutoSelectExtChecked TQString::tqfromLatin1("Automatically select filename extension") #endif diff --git a/kio/kfile/images.h b/kio/kfile/images.h index f544e2f0a..3d248ba24 100644 --- a/kio/kfile/images.h +++ b/kio/kfile/images.h @@ -48,7 +48,7 @@ static const QRgb group_data[] = { 0x0,0x0,0x0,0x0 }; -static const QRgb mask_data[] = { +static const QRgb tqmask_data[] = { 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x11c84a00,0x1000000,0x0,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x68d14e00,0xffda6400,0x72bf4700,0x3000000,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x14d04d00,0xefda6400,0xfffec300,0xf2d86300,0x24742b00, @@ -234,7 +234,7 @@ static struct EmbedImage { } embed_image_vec[] = { { 16, 16, 32, (const unsigned char*)group_grey_data, 0, 0, TRUE, "group-grey" }, { 16, 16, 32, (const unsigned char*)group_data, 0, 0, TRUE, "group" }, - { 16, 16, 32, (const unsigned char*)mask_data, 0, 0, TRUE, "mask" }, + { 16, 16, 32, (const unsigned char*)tqmask_data, 0, 0, TRUE, "tqmask" }, { 16, 16, 32, (const unsigned char*)others_grey_data, 0, 0, TRUE, "others-grey" }, { 16, 16, 32, (const unsigned char*)others_data, 0, 0, TRUE, "others" }, { 16, 16, 32, (const unsigned char*)user_green_data, 0, 0, TRUE, "user-green" }, @@ -245,10 +245,10 @@ static struct EmbedImage { { 0, 0, 0, 0, 0, 0, 0, 0 } }; -static const TQImage& qembed_findImage( const TQString& name ) +static const TQImage& qembed_tqfindImage( const TQString& name ) { static TQDict<TQImage> dict; - TQImage* img = dict.find( name ); + TQImage* img = dict.tqfind( name ); if ( !img ) { for ( int i = 0; embed_image_vec[i].data; i++ ) { if ( strcmp(embed_image_vec[i].name, name.latin1()) == 0 ) { diff --git a/kio/kfile/kacleditwidget.cpp b/kio/kfile/kacleditwidget.cpp index 7f253f8c5..8e887b59c 100644 --- a/kio/kfile/kacleditwidget.cpp +++ b/kio/kfile/kacleditwidget.cpp @@ -63,7 +63,7 @@ static struct { { I18N_NOOP( "Owner" ), "user-grey", 0 }, { I18N_NOOP( "Owning Group" ), "group-grey", 0 }, { I18N_NOOP( "Others" ), "others-grey", 0 }, - { I18N_NOOP( "Mask" ), "mask", 0 }, + { I18N_NOOP( "Mask" ), "tqmask", 0 }, { I18N_NOOP( "Named User" ), "user", 0 }, { I18N_NOOP( "Named Group" ), "group", 0 }, }; @@ -85,7 +85,7 @@ KACLEditWidget::KACLEditWidget( TQWidget *parent, const char *name ) m_DelBtn = new TQPushButton( i18n( "Delete Entry" ), vbox, "delete_entry_button" ); connect( m_DelBtn, TQT_SIGNAL( clicked() ), m_listView, TQT_SLOT( slotRemoveEntry() ) ); TQWidget *spacer = new TQWidget( vbox ); - spacer->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ); + spacer->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ); slotUpdateButtons(); } @@ -148,7 +148,7 @@ KACLListViewItem::KACLListViewItem( TQListView* parent, qualifier( _qualifier ), isPartial( false ) { m_pACLListView = dynamic_cast<KACLListView*>( parent ); - repaint(); + tqrepaint(); } @@ -192,7 +192,7 @@ TQString KACLListViewItem::key( int, bool ) const } void KACLListViewItem::paintCell( TQPainter* p, const TQColorGroup &cg, - int column, int width, int alignment ) + int column, int width, int tqalignment ) { TQColorGroup mycg = cg; if ( isDefault ) { @@ -204,7 +204,7 @@ void KACLListViewItem::paintCell( TQPainter* p, const TQColorGroup &cg, mycg.setColor( TQColorGroup::Text, TQColor( 100, 100, 100 ) ); p->setFont( font ); } - KListViewItem::paintCell( p, mycg, column, width, alignment ); + KListViewItem::paintCell( p, mycg, column, width, tqalignment ); KACLListViewItem *below =0; if ( itemBelow() ) @@ -247,7 +247,7 @@ void KACLListViewItem::updatePermPixmaps() setPixmap( 4, TQPixmap() ); } -void KACLListViewItem::repaint() +void KACLListViewItem::tqrepaint() { int idx = 0; switch ( type ) @@ -287,7 +287,7 @@ void KACLListViewItem::calcEffectiveRights() { TQString strEffective = TQString( "---" ); - // Do we need to worry about the mask entry? It applies to named users, + // Do we need to worry about the tqmask entry? It applies to named users, // owning group, and named groups if ( m_pACLListView->hasMaskEntry() && ( type == KACLListView::NamedUser @@ -296,22 +296,22 @@ void KACLListViewItem::calcEffectiveRights() && !isDefault ) { - strEffective[0] = ( m_pACLListView->maskPermissions() & value & ACL_READ ) ? 'r' : '-'; - strEffective[1] = ( m_pACLListView->maskPermissions() & value & ACL_WRITE ) ? 'w' : '-'; - strEffective[2] = ( m_pACLListView->maskPermissions() & value & ACL_EXECUTE ) ? 'x' : '-'; + strEffective[0] = ( m_pACLListView->tqmaskPermissions() & value & ACL_READ ) ? 'r' : '-'; + strEffective[1] = ( m_pACLListView->tqmaskPermissions() & value & ACL_WRITE ) ? 'w' : '-'; + strEffective[2] = ( m_pACLListView->tqmaskPermissions() & value & ACL_EXECUTE ) ? 'x' : '-'; /* // What about any partial perms? - if ( maskPerms & partialPerms & ACL_READ || // Partial perms on entry - maskPartialPerms & perms & ACL_READ || // Partial perms on mask - maskPartialPerms & partialPerms & ACL_READ ) // Partial perms on mask and entry + if ( tqmaskPerms & partialPerms & ACL_READ || // Partial perms on entry + tqmaskPartialPerms & perms & ACL_READ || // Partial perms on tqmask + tqmaskPartialPerms & partialPerms & ACL_READ ) // Partial perms on tqmask and entry strEffective[0] = 'R'; - if ( maskPerms & partialPerms & ACL_WRITE || // Partial perms on entry - maskPartialPerms & perms & ACL_WRITE || // Partial perms on mask - maskPartialPerms & partialPerms & ACL_WRITE ) // Partial perms on mask and entry + if ( tqmaskPerms & partialPerms & ACL_WRITE || // Partial perms on entry + tqmaskPartialPerms & perms & ACL_WRITE || // Partial perms on tqmask + tqmaskPartialPerms & partialPerms & ACL_WRITE ) // Partial perms on tqmask and entry strEffective[1] = 'W'; - if ( maskPerms & partialPerms & ACL_EXECUTE || // Partial perms on entry - maskPartialPerms & perms & ACL_EXECUTE || // Partial perms on mask - maskPartialPerms & partialPerms & ACL_EXECUTE ) // Partial perms on mask and entry + if ( tqmaskPerms & partialPerms & ACL_EXECUTE || // Partial perms on entry + tqmaskPartialPerms & perms & ACL_EXECUTE || // Partial perms on tqmask + tqmaskPartialPerms & partialPerms & ACL_EXECUTE ) // Partial perms on tqmask and entry strEffective[2] = 'X'; */ } @@ -339,7 +339,7 @@ bool KACLListViewItem::isDeletable() const { bool isMaskAndDeletable = false; if (type == KACLListView::Mask ) { - if ( !isDefault && m_pACLListView->maskCanBeDeleted() ) + if ( !isDefault && m_pACLListView->tqmaskCanBeDeleted() ) isMaskAndDeletable = true; else if ( isDefault && m_pACLListView->defaultMaskCanBeDeleted() ) isMaskAndDeletable = true; @@ -424,8 +424,8 @@ EditACLEntryDialog::EditACLEntryDialog( KACLListView *listView, KACLListViewItem m_buttonGroup->insert( owningGroupType, KACLListView::Group ); TQRadioButton *othersType = new TQRadioButton( i18n("Others"), m_buttonGroup, "othersType" ); m_buttonGroup->insert( othersType, KACLListView::Others ); - TQRadioButton *maskType = new TQRadioButton( i18n("Mask"), m_buttonGroup, "maskType" ); - m_buttonGroup->insert( maskType, KACLListView::Mask ); + TQRadioButton *tqmaskType = new TQRadioButton( i18n("Mask"), m_buttonGroup, "tqmaskType" ); + m_buttonGroup->insert( tqmaskType, KACLListView::Mask ); TQRadioButton *namedUserType = new TQRadioButton( i18n("Named User"), m_buttonGroup, "namesUserType" ); m_buttonGroup->insert( namedUserType, KACLListView::NamedUser ); TQRadioButton *namedGroupType = new TQRadioButton( i18n("Named Group"), m_buttonGroup, "namedGroupType" ); @@ -481,9 +481,9 @@ void EditACLEntryDialog::slotUpdateAllowedTypes() } for ( int i=1; i < KACLListView::AllTypes; i=i*2 ) { if ( allowedTypes & i ) - m_buttonGroup->find( i )->show(); + m_buttonGroup->tqfind( i )->show(); else - m_buttonGroup->find( i )->hide(); + m_buttonGroup->tqfind( i )->hide(); } } @@ -495,17 +495,17 @@ void EditACLEntryDialog::slotUpdateAllowedUsersAndGroups() m_groupsCombo->clear(); if ( m_defaultCB && m_defaultCB->isChecked() ) { m_usersCombo->insertStringList( m_defaultUsers ); - if ( m_defaultUsers.find( oldUser ) != m_defaultUsers.end() ) + if ( m_defaultUsers.tqfind( oldUser ) != m_defaultUsers.end() ) m_usersCombo->setCurrentText( oldUser ); m_groupsCombo->insertStringList( m_defaultGroups ); - if ( m_defaultGroups.find( oldGroup ) != m_defaultGroups.end() ) + if ( m_defaultGroups.tqfind( oldGroup ) != m_defaultGroups.end() ) m_groupsCombo->setCurrentText( oldGroup ); } else { m_usersCombo->insertStringList( m_users ); - if ( m_users.find( oldUser ) != m_users.end() ) + if ( m_users.tqfind( oldUser ) != m_users.end() ) m_usersCombo->setCurrentText( oldUser ); m_groupsCombo->insertStringList( m_groups ); - if ( m_groups.find( oldGroup ) != m_groups.end() ) + if ( m_groups.tqfind( oldGroup ) != m_groups.end() ) m_groupsCombo->setCurrentText( oldGroup ); } } @@ -527,7 +527,7 @@ void EditACLEntryDialog::slotOk() } if ( m_defaultCB ) m_item->isDefault = m_defaultCB->isChecked(); - m_item->repaint(); + m_item->tqrepaint(); KDialogBase::slotOk(); } @@ -571,10 +571,10 @@ KACLListView::KACLListView( TQWidget* parent, const char* name ) // Load the avatars for ( int i=0; i < LAST_IDX; ++i ) { - s_itemAttributes[i].pixmap = new TQPixmap( qembed_findImage( s_itemAttributes[i].pixmapName ) ); + s_itemAttributes[i].pixmap = new TQPixmap( qembed_tqfindImage( s_itemAttributes[i].pixmapName ) ); } - m_yesPixmap = new TQPixmap( qembed_findImage( "yes" ) ); - m_yesPartialPixmap = new TQPixmap( qembed_findImage( "yespartial" ) ); + m_yesPixmap = new TQPixmap( qembed_tqfindImage( "yes" ) ); + m_yesPartialPixmap = new TQPixmap( qembed_tqfindImage( "yespartial" ) ); setSelectionMode( TQListView::Extended ); @@ -582,14 +582,14 @@ KACLListView::KACLListView( TQWidget* parent, const char* name ) struct passwd *user = 0; setpwent(); while ( ( user = getpwent() ) != 0 ) { - m_allUsers << TQString::fromLatin1( user->pw_name ); + m_allUsers << TQString::tqfromLatin1( user->pw_name ); } endpwent(); struct group *gr = 0; setgrent(); while ( ( gr = getgrent() ) != 0 ) { - m_allGroups << TQString::fromLatin1( gr->gr_name ); + m_allGroups << TQString::tqfromLatin1( gr->gr_name ); } endgrent(); m_allUsers.sort(); @@ -651,9 +651,9 @@ void KACLListView::fillItemsFromACL( const KACL &pACL, bool defaults ) item = new KACLListViewItem( this, Others, pACL.othersPermissions(), defaults ); bool hasMask = false; - unsigned short mask = pACL.maskPermissions( hasMask ); + unsigned short tqmask = pACL.tqmaskPermissions( hasMask ); if ( hasMask ) { - item = new KACLListViewItem( this, Mask, mask, defaults ); + item = new KACLListViewItem( this, Mask, tqmask, defaults ); } // read all named user entries @@ -680,7 +680,7 @@ void KACLListView::setACL( const KACL &acl ) m_ACL = acl; fillItemsFromACL( m_ACL ); - m_mask = acl.maskPermissions( m_hasMask ); + m_tqmask = acl.tqmaskPermissions( m_hasMask ); calculateEffectiveRights(); } @@ -818,13 +818,13 @@ void KACLListView::entryClicked( TQListViewItem* pItem, const TQPoint& /*pt*/, i { // Mark the required entries as no longer being partial entries. // That is, they will get applied to all selected directories. - KACLListViewItem* pUserObj = findACLEntryByType( this, ACL_USER_OBJ ); + KACLListViewItem* pUserObj = tqfindACLEntryByType( this, ACL_USER_OBJ ); pUserObj->entry()->setPartialEntry( false ); - KACLListViewItem* pGroupObj = findACLEntryByType( this, ACL_GROUP_OBJ ); + KACLListViewItem* pGroupObj = tqfindACLEntryByType( this, ACL_GROUP_OBJ ); pGroupObj->entry()->setPartialEntry( false ); - KACLListViewItem* pOther = findACLEntryByType( this, ACL_OTHER ); + KACLListViewItem* pOther = tqfindACLEntryByType( this, ACL_OTHER ); pOther->entry()->setPartialEntry( false ); update(); @@ -845,29 +845,29 @@ void KACLListView::calculateEffectiveRights() } -unsigned short KACLListView::maskPermissions() const +unsigned short KACLListView::tqmaskPermissions() const { - return m_mask; + return m_tqmask; } -void KACLListView::setMaskPermissions( unsigned short maskPerms ) +void KACLListView::setMaskPermissions( unsigned short tqmaskPerms ) { - m_mask = maskPerms; + m_tqmask = tqmaskPerms; calculateEffectiveRights(); } -acl_perm_t KACLListView::maskPartialPermissions() const +acl_perm_t KACLListView::tqmaskPartialPermissions() const { // return m_pMaskEntry->m_partialPerms; return 0; } -void KACLListView::setMaskPartialPermissions( acl_perm_t /*maskPartialPerms*/ ) +void KACLListView::setMaskPartialPermissions( acl_perm_t /*tqmaskPartialPerms*/ ) { - //m_pMaskEntry->m_partialPerms = maskPartialPerms; + //m_pMaskEntry->m_partialPerms = tqmaskPartialPerms; calculateEffectiveRights(); } @@ -882,12 +882,12 @@ bool KACLListView::hasDefaultEntries() const return false; } -const KACLListViewItem* KACLListView::findDefaultItemByType( EntryType type ) const +const KACLListViewItem* KACLListView::tqfindDefaultItemByType( EntryType type ) const { - return findItemByType( type, true ); + return tqfindItemByType( type, true ); } -const KACLListViewItem* KACLListView::findItemByType( EntryType type, bool defaults ) const +const KACLListViewItem* KACLListView::tqfindItemByType( EntryType type, bool defaults ) const { TQListViewItemIterator it( const_cast<KACLListView*>( this ) ); while ( it.current() ) { @@ -905,7 +905,7 @@ unsigned short KACLListView::calculateMaskValue( bool defaults ) const { // KACL auto-adds the relevant maks entries, so we can simply query bool dummy; - return itemsToACL( defaults ).maskPermissions( dummy ); + return itemsToACL( defaults ).tqmaskPermissions( dummy ); } void KACLListView::slotAddEntry() @@ -914,7 +914,7 @@ void KACLListView::slotAddEntry() if ( !m_hasMask ) allowedTypes |= Mask; int allowedDefaultTypes = NamedUser | NamedGroup; - if ( !findDefaultItemByType( Mask ) ) + if ( !tqfindDefaultItemByType( Mask ) ) allowedDefaultTypes |= Mask; if ( !hasDefaultEntries() ) allowedDefaultTypes |= User | Group; @@ -927,24 +927,24 @@ void KACLListView::slotAddEntry() if ( !item ) return; // canceled if ( item->type == Mask && !item->isDefault ) { m_hasMask = true; - m_mask = item->value; + m_tqmask = item->value; } if ( item->isDefault && !hasDefaultEntries() ) { // first default entry, fill in what is needed if ( item->type != User ) { - unsigned short v = findDefaultItemByType( User )->value; + unsigned short v = tqfindDefaultItemByType( User )->value; new KACLListViewItem( this, User, v, true ); } if ( item->type != Group ) { - unsigned short v = findDefaultItemByType( Group )->value; + unsigned short v = tqfindDefaultItemByType( Group )->value; new KACLListViewItem( this, Group, v, true ); } if ( item->type != Others ) { - unsigned short v = findDefaultItemByType( Others )->value; + unsigned short v = tqfindDefaultItemByType( Others )->value; new KACLListViewItem( this, Others, v, true ); } } - const KACLListViewItem *defaultMaskItem = findDefaultItemByType( Mask ); + const KACLListViewItem *defaultMaskItem = tqfindDefaultItemByType( Mask ); if ( item->isDefault && !defaultMaskItem ) { unsigned short v = calculateMaskValue( true ); new KACLListViewItem( this, Mask, v, true ); @@ -953,11 +953,11 @@ void KACLListView::slotAddEntry() ( item->type == Group || item->type == NamedUser || item->type == NamedGroup ) ) { - // auto-add a mask entry + // auto-add a tqmask entry unsigned short v = calculateMaskValue( false ); new KACLListViewItem( this, Mask, v, false ); m_hasMask = true; - m_mask = v; + m_tqmask = v; } calculateEffectiveRights(); sort(); @@ -978,7 +978,7 @@ void KACLListView::slotEditEntry() if ( !m_hasMask || itemWasMask ) allowedTypes |= Mask; int allowedDefaultTypes = item->type | NamedUser | NamedGroup; - if ( !findDefaultItemByType( Mask ) ) + if ( !tqfindDefaultItemByType( Mask ) ) allowedDefaultTypes |= Mask; if ( !hasDefaultEntries() ) allowedDefaultTypes |= User | Group; @@ -990,10 +990,10 @@ void KACLListView::slotEditEntry() dlg.exec(); if ( itemWasMask && item->type != Mask ) { m_hasMask = false; - m_mask = 0; + m_tqmask = 0; } if ( !itemWasMask && item->type == Mask ) { - m_mask = item->value; + m_tqmask = item->value; m_hasMask = true; } calculateEffectiveRights(); @@ -1006,20 +1006,20 @@ void KACLListView::slotRemoveEntry() while ( it.current() ) { KACLListViewItem *item = static_cast<KACLListViewItem*>( it.current() ); ++it; - /* First check if it's a mask entry and if so, make sure that there is - * either no name user or group entry, which means the mask can be + /* First check if it's a tqmask entry and if so, make sure that there is + * either no name user or group entry, which means the tqmask can be * removed, or don't remove it, but reset it. That is allowed. */ if ( item->type == Mask ) { bool itemWasDefault = item->isDefault; - if ( !itemWasDefault && maskCanBeDeleted() ) { + if ( !itemWasDefault && tqmaskCanBeDeleted() ) { m_hasMask= false; - m_mask = 0; + m_tqmask = 0; delete item; } else if ( itemWasDefault && defaultMaskCanBeDeleted() ) { delete item; } else { item->value = 0; - item->repaint(); + item->tqrepaint(); } if ( !itemWasDefault ) calculateEffectiveRights(); @@ -1030,7 +1030,7 @@ void KACLListView::slotRemoveEntry() || item->type == Group || item->type == Others ) ) { item->value = 0; - item->repaint(); + item->tqrepaint(); } else { delete item; } @@ -1038,14 +1038,14 @@ void KACLListView::slotRemoveEntry() } } -bool KACLListView::maskCanBeDeleted() const +bool KACLListView::tqmaskCanBeDeleted() const { - return !findItemByType( NamedUser ) && !findItemByType( NamedGroup ); + return !tqfindItemByType( NamedUser ) && !tqfindItemByType( NamedGroup ); } bool KACLListView::defaultMaskCanBeDeleted() const { - return !findDefaultItemByType( NamedUser ) && !findDefaultItemByType( NamedGroup ); + return !tqfindDefaultItemByType( NamedUser ) && !tqfindDefaultItemByType( NamedGroup ); } #include "kacleditwidget.moc" diff --git a/kio/kfile/kacleditwidget_p.h b/kio/kfile/kacleditwidget_p.h index 8bd0292d3..4cadf0efe 100644 --- a/kio/kfile/kacleditwidget_p.h +++ b/kio/kfile/kacleditwidget_p.h @@ -73,16 +73,16 @@ public: bool hasDefaultEntries() const; bool allowDefaults() const { return m_allowDefaults; } void setAllowDefaults( bool v ) { m_allowDefaults = v; } - unsigned short maskPermissions() const; - void setMaskPermissions( unsigned short maskPerms ); - acl_perm_t maskPartialPermissions() const; - void setMaskPartialPermissions( acl_perm_t maskPerms ); + unsigned short tqmaskPermissions() const; + void setMaskPermissions( unsigned short tqmaskPerms ); + acl_perm_t tqmaskPartialPermissions() const; + void setMaskPartialPermissions( acl_perm_t tqmaskPerms ); - bool maskCanBeDeleted() const; + bool tqmaskCanBeDeleted() const; bool defaultMaskCanBeDeleted() const; - const KACLListViewItem* findDefaultItemByType( EntryType type ) const; - const KACLListViewItem* findItemByType( EntryType type, + const KACLListViewItem* tqfindDefaultItemByType( EntryType type ) const; + const KACLListViewItem* tqfindItemByType( EntryType type, bool defaults = false ) const; unsigned short calculateMaskValue( bool defaults ) const; void calculateEffectiveRights(); @@ -117,7 +117,7 @@ private: KACL m_ACL; KACL m_defaultACL; - unsigned short m_mask; + unsigned short m_tqmask; bool m_hasMask; bool m_allowDefaults; TQStringList m_allUsers; @@ -180,10 +180,10 @@ public: void togglePerm( acl_perm_t perm ); virtual void paintCell( TQPainter *p, const TQColorGroup &cg, - int column, int width, int alignment ); + int column, int width, int tqalignment ); void updatePermPixmaps(); - void repaint(); + void tqrepaint(); KACLListView::EntryType type; unsigned short value; diff --git a/kio/kfile/kcombiview.cpp b/kio/kfile/kcombiview.cpp index 6baf6d36f..a21eafe05 100644 --- a/kio/kfile/kcombiview.cpp +++ b/kio/kfile/kcombiview.cpp @@ -282,7 +282,7 @@ KFileItem * KCombiView::prevItem( const KFileItem *fileItem ) const // with the next view's last item! if ( m_lastViewForPrevItem != otherView ) { fileItem = otherView->firstFileItem(); - while ( otherView->nextItem( fileItem ) ) // find the last item + while ( otherView->nextItem( fileItem ) ) // tqfind the last item fileItem = otherView->nextItem( fileItem ); } @@ -300,7 +300,7 @@ void KCombiView::slotSortingChanged( TQDir::SortSpec sorting ) KFileView *KCombiView::focusView( KFileView *preferred ) const { - TQWidget *w = focusWidget(); + TQWidget *w = tqfocusWidget(); KFileView *other = (right == preferred) ? left : right; return (preferred && w == preferred->widget()) ? preferred : other; } diff --git a/kio/kfile/kcustommenueditor.cpp b/kio/kfile/kcustommenueditor.cpp index aec3c10f1..3b4e9a68c 100644 --- a/kio/kfile/kcustommenueditor.cpp +++ b/kio/kfile/kcustommenueditor.cpp @@ -57,8 +57,8 @@ public: TQString serviceName = s->name(); // item names may contain ampersands. To avoid them being converted - // to accelators, replace them with two ampersands. - serviceName.replace("&", "&&"); + // to accelators, tqreplace them with two ampersands. + serviceName.tqreplace("&", "&&"); TQPixmap normal = KGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small, 0, KIcon::DefaultState, 0L, true); @@ -99,7 +99,7 @@ KCustomMenuEditor::KCustomMenuEditor(TQWidget *parent) d->pbRemove=buttonBox->addButton(i18n("Remove"), this, TQT_SLOT(slotRemoveItem())); d->pbMoveUp=buttonBox->addButton(i18n("Move Up"), this, TQT_SLOT(slotMoveUp())); d->pbMoveDown=buttonBox->addButton(i18n("Move Down"), this, TQT_SLOT(slotMoveDown())); - buttonBox->layout(); + buttonBox->tqlayout(); connect( m_listView, TQT_SIGNAL( selectionChanged () ), this, TQT_SLOT( refreshButton() ) ); refreshButton(); } diff --git a/kio/kfile/kdiroperator.cpp b/kio/kfile/kdiroperator.cpp index 6013b7c57..75d72f258 100644 --- a/kio/kfile/kdiroperator.cpp +++ b/kio/kfile/kdiroperator.cpp @@ -111,13 +111,13 @@ KDirOperator::KDirOperator(const KURL& _url, TQString strPath = TQDir::currentDirPath(); strPath.append('/'); currUrl = KURL(); - currUrl.setProtocol(TQString::fromLatin1("file")); + currUrl.setProtocol(TQString::tqfromLatin1("file")); currUrl.setPath(strPath); } else { currUrl = _url; if ( currUrl.protocol().isEmpty() ) - currUrl.setProtocol(TQString::fromLatin1("file")); + currUrl.setProtocol(TQString::tqfromLatin1("file")); currUrl.addPath("/"); // make sure we have a trailing slash! } @@ -414,7 +414,7 @@ bool KDirOperator::mkdir( const TQString& directory, bool enterDirectory ) { url.addPath( *it ); exists = KIO::NetAccess::exists( url, false, 0 ); - writeOk = !exists && KIO::NetAccess::mkdir( url, topLevelWidget() ); + writeOk = !exists && KIO::NetAccess::mkdir( url, tqtopLevelWidget() ); } if ( exists ) // url was already existant @@ -484,7 +484,7 @@ KIO::DeleteJob * KDirOperator::del( const KFileItemList& items, if ( doIt ) { KIO::DeleteJob *job = KIO::del( urls, false, showProgress ); - job->setWindow (topLevelWidget()); + job->setWindow (tqtopLevelWidget()); job->setAutoErrorHandlingEnabled( true, parent ); return job; } @@ -547,7 +547,7 @@ KIO::CopyJob * KDirOperator::trash( const KFileItemList& items, if ( doIt ) { KIO::CopyJob *job = KIO::trash( urls, showProgress ); - job->setWindow (topLevelWidget()); + job->setWindow (tqtopLevelWidget()); job->setAutoErrorHandlingEnabled( true, parent ); return job; } @@ -590,13 +590,13 @@ void KDirOperator::checkPath(const TQString &, bool /*takeFiles*/) // SLOT text = text.stripWhiteSpace(); // if the argument is no URL (the check is quite fragil) and it's // no absolute path, we add the current directory to get a correct url - if (text.find(':') < 0 && text[0] != '/') + if (text.tqfind(':') < 0 && text[0] != '/') text.insert(0, currUrl); // in case we have a selection defined and someone patched the file- // name, we check, if the end of the new name is changed. if (!selection.isNull()) { - int position = text.findRev('/'); + int position = text.tqfindRev('/'); ASSERT(position >= 0); // we already inserted the current dir in case TQString filename = text.mid(position + 1, text.length()); if (filename != selection) @@ -651,7 +651,7 @@ void KDirOperator::setURL(const KURL& _newurl, bool clearforward) if ( !isReadable( newurl ) ) { // maybe newurl is a file? check its parent directory - newurl.cd(TQString::fromLatin1("..")); + newurl.cd(TQString::tqfromLatin1("..")); if ( !isReadable( newurl ) ) { resetCursor(); KMessageBox::error(viewWidget(), @@ -777,7 +777,7 @@ KURL KDirOperator::url() const void KDirOperator::cdUp() { KURL tmp(currUrl); - tmp.cd(TQString::fromLatin1("..")); + tmp.cd(TQString::tqfromLatin1("..")); setURL(tmp, true); } @@ -825,7 +825,7 @@ bool KDirOperator::checkPreviewInternal() const { TQStringList supported = KIO::PreviewJob::supportedMimeTypes(); // no preview support for directories? - if ( dirOnlyMode() && supported.findIndex( "inode/directory" ) == -1 ) + if ( dirOnlyMode() && supported.tqfindIndex( "inode/directory" ) == -1 ) return false; TQStringList mimeTypes = dir->mimeFilters(); @@ -851,7 +851,7 @@ bool KDirOperator::checkPreviewInternal() const } if ( !nameFilter.isEmpty() ) { - // find the mimetypes of all the filter-patterns and + // tqfind the mimetypes of all the filter-patterns and KServiceTypeFactory *fac = KServiceTypeFactory::self(); TQStringList::Iterator it1 = nameFilter.begin(); for ( ; it1 != nameFilter.end(); ++it1 ) { @@ -859,7 +859,7 @@ bool KDirOperator::checkPreviewInternal() const return true; } - KMimeType *mt = fac->findFromPattern( *it1 ); + KMimeType *mt = fac->tqfindFromPattern( *it1 ); if ( !mt ) continue; TQString mime = mt->name(); @@ -1120,7 +1120,7 @@ void KDirOperator::setDirLister( KDirLister *lister ) dir->setAutoUpdate( true ); - TQWidget* mainWidget = topLevelWidget(); + TQWidget* mainWidget = tqtopLevelWidget(); dir->setMainWindow (mainWidget); kdDebug (kfile_area) << "mainWidget=" << mainWidget << endl; @@ -1194,7 +1194,7 @@ void KDirOperator::setCurrentItem( const TQString& filename ) const KFileItem *item = 0L; if ( !filename.isNull() ) - item = static_cast<KFileItem *>(dir->findByName( filename )); + item = static_cast<KFileItem *>(dir->tqfindByName( filename )); m_fileView->clearSelection(); if ( item ) { @@ -1253,7 +1253,7 @@ void KDirOperator::slotCompletionMatch(const TQString& match) void KDirOperator::setupActions() { - myActionCollection = new KActionCollection( topLevelWidget(), this, "KDirOperator::myActionCollection" ); + myActionCollection = new KActionCollection( tqtopLevelWidget(), this, "KDirOperator::myActionCollection" ); actionMenu = new KActionMenu( i18n("Menu"), myActionCollection, "popupMenu" ); upAction = KStdAction::up( this, TQT_SLOT( cdUp() ), myActionCollection, "up" ); @@ -1273,7 +1273,7 @@ void KDirOperator::setupActions() this, TQT_SLOT( trashSelected( KAction::ActivationReason, Qt::ButtonState ) ) ); new KAction( i18n( "Delete" ), "editdelete", SHIFT+Key_Delete, this, TQT_SLOT( deleteSelected() ), myActionCollection, "delete" ); - mkdirAction->setIcon( TQString::fromLatin1("folder_new") ); + mkdirAction->setIcon( TQString::tqfromLatin1("folder_new") ); reloadAction->setText( i18n("Reload") ); reloadAction->setShortcut( KStdAccel::shortcut( KStdAccel::Reload )); @@ -1293,7 +1293,7 @@ void KDirOperator::setupActions() this, TQT_SLOT( slotSortReversed() ), myActionCollection, "reversed" ); - TQString sortGroup = TQString::fromLatin1("sort"); + TQString sortGroup = TQString::tqfromLatin1("sort"); byNameAction->setExclusiveGroup( sortGroup ); byDateAction->setExclusiveGroup( sortGroup ); bySizeAction->setExclusiveGroup( sortGroup ); @@ -1337,7 +1337,7 @@ void KDirOperator::setupActions() TQT_SLOT( togglePreview( bool ))); - TQString viewGroup = TQString::fromLatin1("view"); + TQString viewGroup = TQString::tqfromLatin1("view"); shortAction->setExclusiveGroup( viewGroup ); detailedAction->setExclusiveGroup( viewGroup ); @@ -1386,7 +1386,7 @@ void KDirOperator::setupMenu(int whichActions) if (currUrl.isLocalFile() && !(KApplication::keyboardMouseState() & Qt::ShiftButton)) actionMenu->insert( myActionCollection->action( "trash" ) ); KConfig *globalconfig = KGlobal::config(); - KConfigGroupSaver cs( globalconfig, TQString::fromLatin1("KDE") ); + KConfigGroupSaver cs( globalconfig, TQString::tqfromLatin1("KDE") ); if (!currUrl.isLocalFile() || (KApplication::keyboardMouseState() & Qt::ShiftButton) || globalconfig->readBoolEntry("ShowDeleteCommand", false)) actionMenu->insert( myActionCollection->action( "delete" ) ); @@ -1450,45 +1450,45 @@ void KDirOperator::readConfig( KConfig *kc, const TQString& group ) defaultView = 0; int sorting = 0; - TQString viewStyle = kc->readEntry( TQString::fromLatin1("View Style"), - TQString::fromLatin1("Simple") ); - if ( viewStyle == TQString::fromLatin1("Detail") ) + TQString viewStyle = kc->readEntry( TQString::tqfromLatin1("View Style"), + TQString::tqfromLatin1("Simple") ); + if ( viewStyle == TQString::tqfromLatin1("Detail") ) defaultView |= KFile::Detail; else defaultView |= KFile::Simple; - if ( kc->readBoolEntry( TQString::fromLatin1("Separate Directories"), + if ( kc->readBoolEntry( TQString::tqfromLatin1("Separate Directories"), DefaultMixDirsAndFiles ) ) defaultView |= KFile::SeparateDirs; - if ( kc->readBoolEntry(TQString::fromLatin1("Show Preview"), false)) + if ( kc->readBoolEntry(TQString::tqfromLatin1("Show Preview"), false)) defaultView |= KFile::PreviewContents; - if ( kc->readBoolEntry( TQString::fromLatin1("Sort case insensitively"), + if ( kc->readBoolEntry( TQString::tqfromLatin1("Sort case insensitively"), DefaultCaseInsensitive ) ) sorting |= TQDir::IgnoreCase; - if ( kc->readBoolEntry( TQString::fromLatin1("Sort directories first"), + if ( kc->readBoolEntry( TQString::tqfromLatin1("Sort directories first"), DefaultDirsFirst ) ) sorting |= TQDir::DirsFirst; - TQString name = TQString::fromLatin1("Name"); - TQString sortBy = kc->readEntry( TQString::fromLatin1("Sort by"), name ); + TQString name = TQString::tqfromLatin1("Name"); + TQString sortBy = kc->readEntry( TQString::tqfromLatin1("Sort by"), name ); if ( sortBy == name ) sorting |= TQDir::Name; - else if ( sortBy == TQString::fromLatin1("Size") ) + else if ( sortBy == TQString::tqfromLatin1("Size") ) sorting |= TQDir::Size; - else if ( sortBy == TQString::fromLatin1("Date") ) + else if ( sortBy == TQString::tqfromLatin1("Date") ) sorting |= TQDir::Time; mySorting = static_cast<TQDir::SortSpec>( sorting ); setSorting( mySorting ); - if ( kc->readBoolEntry( TQString::fromLatin1("Show hidden files"), + if ( kc->readBoolEntry( TQString::tqfromLatin1("Show hidden files"), DefaultShowHidden ) ) { showHiddenAction->setChecked( true ); dir->setShowingDotFiles( true ); } - if ( kc->readBoolEntry( TQString::fromLatin1("Sort reversed"), + if ( kc->readBoolEntry( TQString::tqfromLatin1("Sort reversed"), DefaultSortReversed ) ) reverseAction->setChecked( true ); @@ -1505,18 +1505,18 @@ void KDirOperator::writeConfig( KConfig *kc, const TQString& group ) if ( !group.isEmpty() ) kc->setGroup( group ); - TQString sortBy = TQString::fromLatin1("Name"); + TQString sortBy = TQString::tqfromLatin1("Name"); if ( KFile::isSortBySize( mySorting ) ) - sortBy = TQString::fromLatin1("Size"); + sortBy = TQString::tqfromLatin1("Size"); else if ( KFile::isSortByDate( mySorting ) ) - sortBy = TQString::fromLatin1("Date"); - kc->writeEntry( TQString::fromLatin1("Sort by"), sortBy ); + sortBy = TQString::tqfromLatin1("Date"); + kc->writeEntry( TQString::tqfromLatin1("Sort by"), sortBy ); - kc->writeEntry( TQString::fromLatin1("Sort reversed"), + kc->writeEntry( TQString::tqfromLatin1("Sort reversed"), reverseAction->isChecked() ); - kc->writeEntry( TQString::fromLatin1("Sort case insensitively"), + kc->writeEntry( TQString::tqfromLatin1("Sort case insensitively"), caseInsensitiveAction->isChecked() ); - kc->writeEntry( TQString::fromLatin1("Sort directories first"), + kc->writeEntry( TQString::tqfromLatin1("Sort directories first"), dirsFirstAction->isChecked() ); // don't save the separate dirs or preview when an application specific @@ -1530,26 +1530,26 @@ void KDirOperator::writeConfig( KConfig *kc, const TQString& group ) if ( !appSpecificPreview ) { if ( separateDirsAction->isEnabled() ) - kc->writeEntry( TQString::fromLatin1("Separate Directories"), + kc->writeEntry( TQString::tqfromLatin1("Separate Directories"), separateDirsAction->isChecked() ); KToggleAction *previewAction = static_cast<KToggleAction*>(myActionCollection->action("preview")); if ( previewAction->isEnabled() ) { bool hasPreview = previewAction->isChecked(); - kc->writeEntry( TQString::fromLatin1("Show Preview"), hasPreview ); + kc->writeEntry( TQString::tqfromLatin1("Show Preview"), hasPreview ); } } - kc->writeEntry( TQString::fromLatin1("Show hidden files"), + kc->writeEntry( TQString::tqfromLatin1("Show hidden files"), showHiddenAction->isChecked() ); KFile::FileView fv = static_cast<KFile::FileView>( m_viewKind ); TQString style; if ( KFile::isDetailView( fv ) ) - style = TQString::fromLatin1("Detail"); + style = TQString::tqfromLatin1("Detail"); else if ( KFile::isSimpleView( fv ) ) - style = TQString::fromLatin1("Simple"); - kc->writeEntry( TQString::fromLatin1("View Style"), style ); + style = TQString::tqfromLatin1("Simple"); + kc->writeEntry( TQString::tqfromLatin1("View Style"), style ); kc->setGroup( oldGroup ); } diff --git a/kio/kfile/kdirselectdialog.cpp b/kio/kfile/kdirselectdialog.cpp index a361a8bde..2df357575 100644 --- a/kio/kfile/kdirselectdialog.cpp +++ b/kio/kfile/kdirselectdialog.cpp @@ -211,7 +211,7 @@ void KDirSelectDialog::setCurrentURL( const KURL& url ) { while ( pos > 0 ) { - pos = path.findRev( '/', pos -1 ); + pos = path.tqfindRev( '/', pos -1 ); if ( pos >= 0 ) { dirToList.setPath( path.left( pos +1 ) ); @@ -232,7 +232,7 @@ void KDirSelectDialog::openNextDir( KFileTreeViewItem * /*parent*/ ) KURL url = d->dirsToList.pop(); - KFileTreeViewItem *item = view()->findItem( d->branch, url.path().mid(1)); + KFileTreeViewItem *item = view()->tqfindItem( d->branch, url.path().mid(1)); if ( item ) { if ( !item->isOpen() ) @@ -248,7 +248,7 @@ void KDirSelectDialog::slotNextDirToList( KFileTreeViewItem *item ) { // scroll to make item the topmost item view()->ensureItemVisible( item ); - TQRect r = view()->itemRect( item ); + TQRect r = view()->tqitemRect( item ); if ( r.isValid() ) { int x, y; @@ -376,7 +376,7 @@ void KDirSelectDialog::slotComboTextChanged( const TQString& text ) if ( d->branch ) { KURL url = KURL::fromPathOrURL( KShell::tildeExpand( text ) ); - KFileTreeViewItem *item = d->branch->findTVIByURL( url ); + KFileTreeViewItem *item = d->branch->tqfindTVIByURL( url ); if ( item ) { view()->setCurrentItem( item ); @@ -390,8 +390,8 @@ void KDirSelectDialog::slotComboTextChanged( const TQString& text ) if ( item ) { item->setSelected( false ); - // 2002/12/27, deselected item is not repainted, so force it - item->repaint(); + // 2002/12/27, deselected item is not tqrepainted, so force it + item->tqrepaint(); } } @@ -426,7 +426,7 @@ void KDirSelectDialog::slotMkdir() { folderurl.addPath( *it ); exists = KIO::NetAccess::exists( folderurl, false, 0 ); - writeOk = !exists && KIO::NetAccess::mkdir( folderurl, topLevelWidget() ); + writeOk = !exists && KIO::NetAccess::mkdir( folderurl, tqtopLevelWidget() ); } if ( exists ) // url was already existant diff --git a/kio/kfile/kdirsize.cpp b/kio/kfile/kdirsize.cpp index 3c9bfbb8c..86dfc756d 100644 --- a/kio/kfile/kdirsize.cpp +++ b/kio/kfile/kdirsize.cpp @@ -63,7 +63,7 @@ void KDirSize::processList() } kdDebug(kfile_area) << "KDirSize::processList finished" << endl; if ( !m_bAsync ) - qApp->exit_loop(); + tqApp->exit_loop(); emitResult(); } @@ -139,7 +139,7 @@ KIO::filesize_t KDirSize::dirSize( const KURL & directory ) { KDirSize * dirSize = dirSizeJob( directory ); dirSize->setSync(); - qApp->enter_loop(); + tqApp->enter_loop(); return dirSize->totalSize(); } @@ -155,7 +155,7 @@ void KDirSize::slotResult( KIO::Job * job ) else { if ( !m_bAsync ) - qApp->exit_loop(); + tqApp->exit_loop(); KIO::Job::slotResult( job ); } } diff --git a/kio/kfile/kdiskfreesp.cpp b/kio/kfile/kdiskfreesp.cpp index 179b69f72..23562b63f 100644 --- a/kio/kfile/kdiskfreesp.cpp +++ b/kio/kfile/kdiskfreesp.cpp @@ -100,7 +100,7 @@ void KDiskFreeSp::dfDone() TQTextStream t (dfStringErrOut, IO_ReadOnly); TQString s=t.readLine(); - if ( (s.isEmpty()) || ( s.left(10) != TQString::fromLatin1("Filesystem") ) ) + if ( (s.isEmpty()) || ( s.left(10) != TQString::tqfromLatin1("Filesystem") ) ) kdError() << "Error running df command... got [" << s << "]" << endl; while ( !t.eof() ) { TQString u,v; @@ -109,7 +109,7 @@ void KDiskFreeSp::dfDone() if ( !s.isEmpty() ) { //kdDebug(kfile_area) << "GOT: [" << s << "]" << endl; - if (s.find(BLANK)<0) // devicename was too long, rest in next line + if (s.tqfind(BLANK)<0) // devicename was too long, rest in next line if ( !t.eof() ) { // just appends the next line v=t.readLine(); s=s.append(v); @@ -119,30 +119,30 @@ void KDiskFreeSp::dfDone() //kdDebug(kfile_area) << "[" << s << "]" << endl; - //TQString deviceName = s.left(s.find(BLANK)); - s=s.remove(0,s.find(BLANK)+1 ); + //TQString deviceName = s.left(s.tqfind(BLANK)); + s=s.remove(0,s.tqfind(BLANK)+1 ); //kdDebug(kfile_area) << " DeviceName: [" << deviceName << "]" << endl; if (!NO_FS_TYPE) - s=s.remove(0,s.find(BLANK)+1 ); // eat fs type + s=s.remove(0,s.tqfind(BLANK)+1 ); // eat fs type - u=s.left(s.find(BLANK)); + u=s.left(s.tqfind(BLANK)); unsigned long kBSize = u.toULong(); - s=s.remove(0,s.find(BLANK)+1 ); + s=s.remove(0,s.tqfind(BLANK)+1 ); //kdDebug(kfile_area) << " Size: [" << kBSize << "]" << endl; - u=s.left(s.find(BLANK)); + u=s.left(s.tqfind(BLANK)); unsigned long kBUsed = u.toULong(); - s=s.remove(0,s.find(BLANK)+1 ); + s=s.remove(0,s.tqfind(BLANK)+1 ); //kdDebug(kfile_area) << " Used: [" << kBUsed << "]" << endl; - u=s.left(s.find(BLANK)); + u=s.left(s.tqfind(BLANK)); unsigned long kBAvail = u.toULong(); - s=s.remove(0,s.find(BLANK)+1 ); + s=s.remove(0,s.tqfind(BLANK)+1 ); //kdDebug(kfile_area) << " Avail: [" << kBAvail << "]" << endl; - s=s.remove(0,s.find(BLANK)+1 ); // delete the capacity 94% + s=s.remove(0,s.tqfind(BLANK)+1 ); // delete the capacity 94% TQString mountPoint = s.stripWhiteSpace(); //kdDebug(kfile_area) << " MountPoint: [" << mountPoint << "]" << endl; @@ -160,10 +160,10 @@ void KDiskFreeSp::dfDone() delete this; } -KDiskFreeSp * KDiskFreeSp::findUsageInfo( const TQString & path ) +KDiskFreeSp * KDiskFreeSp::tqfindUsageInfo( const TQString & path ) { KDiskFreeSp * job = new KDiskFreeSp; - TQString mountPoint = KIO::findPathMountPoint( path ); + TQString mountPoint = KIO::tqfindPathMountPoint( path ); job->readDF( mountPoint ); return job; } diff --git a/kio/kfile/kdiskfreesp.h b/kio/kfile/kdiskfreesp.h index 6a0591d6f..eeb285b08 100644 --- a/kio/kfile/kdiskfreesp.h +++ b/kio/kfile/kdiskfreesp.h @@ -34,10 +34,10 @@ class KProcess; /** - * This class parses the output of "df" to find the disk usage + * This class parses the output of "df" to tqfind the disk usage * information for a given partition (mount point). */ -class KIO_EXPORT KDiskFreeSp : public QObject +class KIO_EXPORT KDiskFreeSp : public TQObject { Q_OBJECT public: KDiskFreeSp( TQObject *parent=0, const char *name=0 ); @@ -60,7 +60,7 @@ public: * if this mount point is found, with the info requested. * done is emitted in any case. */ - static KDiskFreeSp * findUsageInfo( const TQString & path ); + static KDiskFreeSp * tqfindUsageInfo( const TQString & path ); signals: void foundMountPoint( const TQString & mountPoint, unsigned long kBSize, unsigned long kBUsed, unsigned long kBAvail ); diff --git a/kio/kfile/kencodingfiledialog.cpp b/kio/kfile/kencodingfiledialog.cpp index 396006504..be5ca033b 100644 --- a/kio/kfile/kencodingfiledialog.cpp +++ b/kio/kfile/kencodingfiledialog.cpp @@ -54,7 +54,7 @@ KEncodingFileDialog::KEncodingFileDialog(const TQString& startDir, const TQStrin d->encoding->clear (); TQString sEncoding = encoding; if (sEncoding.isEmpty()) - sEncoding = TQString::fromLatin1(KGlobal::locale()->encoding()); + sEncoding = TQString::tqfromLatin1(KGlobal::locale()->encoding()); TQStringList encodings (KGlobal::charsets()->availableEncodingNames()); int insert = 0; diff --git a/kio/kfile/kencodingfiledialog.h b/kio/kfile/kencodingfiledialog.h index 15b44f9c3..ae28a9e76 100644 --- a/kio/kfile/kencodingfiledialog.h +++ b/kio/kfile/kencodingfiledialog.h @@ -32,8 +32,8 @@ struct KEncodingFileDialogPrivate; * * * The dialog has been designed to allow applications to customise it - * by subclassing. It uses geometry management to ensure that subclasses - * can easily add children that will be incorporated into the layout. + * by subclassing. It uses tqgeometry management to ensure that subclasses + * can easily add children that will be incorporated into the tqlayout. */ class KIO_EXPORT KEncodingFileDialog : public KFileDialog diff --git a/kio/kfile/kfiledetailview.cpp b/kio/kfile/kfiledetailview.cpp index 823714396..6643d5a4c 100644 --- a/kio/kfile/kfiledetailview.cpp +++ b/kio/kfile/kfiledetailview.cpp @@ -317,7 +317,7 @@ void KFileDetailView::updateView( const KFileItem *i ) item->init(); setSortingKey( item, i ); - //item->repaint(); // only repaints if visible + //item->tqrepaint(); // only tqrepaints if visible } void KFileDetailView::setSortingKey( KFileListViewItem *item, diff --git a/kio/kfile/kfiledetailview.h b/kio/kfile/kfiledetailview.h index 937c8f56c..7e0baff83 100644 --- a/kio/kfile/kfiledetailview.h +++ b/kio/kfile/kfiledetailview.h @@ -78,7 +78,7 @@ public: TQRect rect() const { - TQRect r = listView()->itemRect(this); + TQRect r = listView()->tqitemRect(this); return TQRect( listView()->viewportToContents( r.topLeft() ), TQSize( r.width(), r.height() ) ); } diff --git a/kio/kfile/kfiledialog.cpp b/kio/kfile/kfiledialog.cpp index 0c9364943..0cdeaa029 100644 --- a/kio/kfile/kfiledialog.cpp +++ b/kio/kfile/kfiledialog.cpp @@ -117,7 +117,7 @@ struct KFileDialogPrivate TQString selection; // now following all kind of widgets, that I need to rebuild - // the geometry management + // the tqgeometry management TQBoxLayout *boxLayout; TQWidget *mainWidget; @@ -204,7 +204,7 @@ void KFileDialog::setLocationLabel(const TQString& text) void KFileDialog::setFilter(const TQString& filter) { - int pos = filter.find('/'); + int pos = filter.tqfind('/'); // Check for an un-escaped '/', if found // interpret as a MIME filter. @@ -219,7 +219,7 @@ void KFileDialog::setFilter(const TQString& filter) // escaped '/' characters. TQString copy (filter); - for (pos = 0; (pos = copy.find("\\/", pos)) != -1; ++pos) + for (pos = 0; (pos = copy.tqfind("\\/", pos)) != -1; ++pos) copy.remove(pos, 1); ops->clearFilter(); @@ -258,7 +258,7 @@ void KFileDialog::setMimeFilter( const TQStringList& mimeTypes, filterWidget->setMimeFilter( mimeTypes, defaultType ); TQStringList types = TQStringList::split(" ", filterWidget->currentFilter()); - types.append( TQString::fromLatin1( "inode/directory" )); + types.append( TQString::tqfromLatin1( "inode/directory" )); ops->clearFilter(); ops->setMimeFilter( types ); d->hasDefaultFilter = !defaultType.isEmpty(); @@ -357,7 +357,7 @@ void KFileDialog::slotOk() bool multi = (mode() & KFile::Files) != 0; KFileItemListIterator it( *items ); - TQString endQuote = TQString::fromLatin1("\" "); + TQString endQuote = TQString::tqfromLatin1("\" "); TQString name, files; while ( it.current() ) { name = (*it)->name(); @@ -402,7 +402,7 @@ void KFileDialog::slotOk() } } - KURL url = KIO::NetAccess::mostLocalURL(d->url,topLevelWidget()); + KURL url = KIO::NetAccess::mostLocalURL(d->url,tqtopLevelWidget()); if ( (mode() & KFile::LocalOnly) == KFile::LocalOnly && !url.isLocalFile() ) { // ### after message freeze, add message for directories! @@ -422,7 +422,7 @@ void KFileDialog::slotOk() if ( (mode() & KFile::Files) == KFile::Files ) {// multiselection mode TQString locationText = locationEdit->currentText(); - if ( locationText.contains( '/' )) { + if ( locationText.tqcontains( '/' )) { // relative path? -> prepend the current directory KURL u( ops->url(), KShell::tildeExpand(locationText)); if ( u.isValid() ) @@ -446,7 +446,7 @@ void KFileDialog::slotOk() return; } - KURL url = KIO::NetAccess::mostLocalURL(selectedURL,topLevelWidget()); + KURL url = KIO::NetAccess::mostLocalURL(selectedURL,tqtopLevelWidget()); if ( (mode() & KFile::LocalOnly) == KFile::LocalOnly && !url.isLocalFile() ) { KMessageBox::sorry( d->mainWidget, @@ -538,7 +538,7 @@ void KFileDialog::slotOk() d->filenames = KShell::tildeExpand(locationEdit->currentText()); if ( (mode() & KFile::Files) == KFile::Files && - !locationEdit->currentText().contains( '/' )) { + !locationEdit->currentText().tqcontains( '/' )) { kdDebug(kfile_area) << "Files\n"; KURL::List list = parseSelectedURLs(); for ( KURL::List::ConstIterator it = list.begin(); @@ -555,7 +555,7 @@ void KFileDialog::slotOk() it != list.end(); ++it ) { job = KIO::stat( *it, !(*it).isLocalFile() ); - job->setWindow (topLevelWidget()); + job->setWindow (tqtopLevelWidget()); KIO::Scheduler::scheduleJob( job ); d->statJobs.append( job ); connect( job, TQT_SIGNAL( result(KIO::Job *) ), @@ -565,7 +565,7 @@ void KFileDialog::slotOk() } job = KIO::stat(d->url,!d->url.isLocalFile()); - job->setWindow (topLevelWidget()); + job->setWindow (tqtopLevelWidget()); d->statJobs.append( job ); connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotStatResult(KIO::Job*))); } @@ -658,7 +658,7 @@ void KFileDialog::accept() for ( ; it != list.end(); ++it ) { const KURL& url = *it; // we strip the last slash (-1) because KURLComboBox does that as well - // when operating in file-mode. If we wouldn't , dupe-finding wouldn't + // when operating in file-mode. If we wouldn't , dupe-tqfinding wouldn't // work. TQString file = url.isLocalFile() ? url.path(-1) : url.prettyURL(-1); @@ -831,10 +831,10 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge d->autoSelectExtChecked = false; d->urlBar = 0; // delayed loading - QtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar ); + QtMsgHandler oldHandler = tqInstallMsgHandler( silenceQToolBar ); toolbar = new KToolBar( d->mainWidget, "KFileDialog::toolbar", true); toolbar->setFlat(true); - qInstallMsgHandler( oldHandler ); + tqInstallMsgHandler( oldHandler ); d->pathCombo = new KURLComboBox( KURLComboBox::Directories, true, toolbar, "path combo" ); @@ -1063,7 +1063,7 @@ void KFileDialog::initSpeedbar() void KFileDialog::initGUI() { - delete d->boxLayout; // deletes all sub layouts + delete d->boxLayout; // deletes all sub tqlayouts d->boxLayout = new TQVBoxLayout( d->mainWidget, 0, KDialog::spacingHint()); d->boxLayout->addWidget(toolbar, AlignTop); @@ -1133,7 +1133,7 @@ void KFileDialog::slotFilterChanged() TQString filter = filterWidget->currentFilter(); ops->clearFilter(); - if ( filter.find( '/' ) > -1 ) { + if ( filter.tqfind( '/' ) > -1 ) { TQStringList types = TQStringList::split( " ", filter ); types.prepend( "inode/directory" ); ops->setMimeFilter( types ); @@ -1204,7 +1204,7 @@ void KFileDialog::enterURL( const KURL& url) void KFileDialog::enterURL( const TQString& url ) { - setURL( KURL::fromPathOrURL( KURLCompletion::replacedPath( url, true, true )) ); + setURL( KURL::fromPathOrURL( KURLCompletion::tqreplacedPath( url, true, true )) ); } void KFileDialog::toolbarCallback(int) // SLOT @@ -1250,7 +1250,7 @@ void KFileDialog::setSelection(const TQString& url) } else { TQString filename = u.url(); - int sep = filename.findRev('/'); + int sep = filename.tqfindRev('/'); if (sep >= 0) { // there is a / in it if ( KProtocolInfo::supportsListing( u )) { KURL dir(u); @@ -1310,9 +1310,9 @@ void KFileDialog::slotLocationChanged( const TQString& text ) updateFilter(); } -void KFileDialog::updateStatusLine(int /* dirs */, int /* files */) +void KFileDialog::updatetqStatusLine(int /* dirs */, int /* files */) { - kdWarning() << "KFileDialog::updateStatusLine is deprecated! The status line no longer exists. Do not try and use it!" << endl; + kdWarning() << "KFileDialog::updatetqStatusLine is deprecated! The status line no longer exists. Do not try and use it!" << endl; } TQString KFileDialog::getOpenFileName(const TQString& startDir, @@ -1335,7 +1335,7 @@ TQString KFileDialog::getOpenFileNameWId(const TQString& startDir, const TQString& filter, WId parent_id, const TQString& caption) { - TQWidget* parent = TQWidget::find( parent_id ); + TQWidget* parent = TQWidget::tqfind( parent_id ); KFileDialog dlg(startDir, filter, parent, "filedialog", true); #ifdef Q_WS_X11 if( parent == NULL && parent_id != 0 ) @@ -1471,10 +1471,10 @@ KURL::List& KFileDialog::parseSelectedURLs() const } d->urlList.clear(); - if ( d->filenames.contains( '/' )) { // assume _one_ absolute filename + if ( d->filenames.tqcontains( '/' )) { // assume _one_ absolute filename static const TQString &prot = KGlobal::staticQString(":/"); KURL u; - if ( d->filenames.find( prot ) != -1 ) + if ( d->filenames.tqfind( prot ) != -1 ) u = d->filenames; else u.setPath( d->filenames ); @@ -1504,7 +1504,7 @@ KURL::List KFileDialog::tokenize( const TQString& line ) const KURL u( ops->url() ); TQString name; - int count = line.contains( '"' ); + int count = line.tqcontains( '"' ); if ( count == 0 ) { // no " " -> assume one single file u.setFileName( line ); if ( u.isValid() ) @@ -1526,8 +1526,8 @@ KURL::List KFileDialog::tokenize( const TQString& line ) const int start = 0; int index1 = -1, index2 = -1; while ( true ) { - index1 = line.find( '"', start ); - index2 = line.find( '"', index1 + 1 ); + index1 = line.tqfind( '"', start ); + index2 = line.tqfind( '"', index1 + 1 ); if ( index1 < 0 ) break; @@ -1548,7 +1548,7 @@ TQString KFileDialog::selectedFile() const { if ( result() == TQDialog::Accepted ) { - KURL url = KIO::NetAccess::mostLocalURL(d->url,topLevelWidget()); + KURL url = KIO::NetAccess::mostLocalURL(d->url,tqtopLevelWidget()); if (url.isLocalFile()) return url.path(); else { @@ -1570,7 +1570,7 @@ TQStringList KFileDialog::selectedFiles() const KURL::List urls = parseSelectedURLs(); TQValueListConstIterator<KURL> it = urls.begin(); while ( it != urls.end() ) { - url = KIO::NetAccess::mostLocalURL(*it,topLevelWidget()); + url = KIO::NetAccess::mostLocalURL(*it,tqtopLevelWidget()); if ( url.isLocalFile() ) list.append( url.path() ); ++it; @@ -1617,7 +1617,7 @@ TQString KFileDialog::getSaveFileNameWId(const TQString& dir, const TQString& fi const TQString& caption) { bool specialDir = dir.at(0) == ':'; - TQWidget* parent = TQWidget::find( parent_id ); + TQWidget* parent = TQWidget::tqfind( parent_id ); KFileDialog dlg( specialDir ? dir : TQString::null, filter, parent, "filedialog", true); #ifdef Q_WS_X11 if( parent == NULL && parent_id != 0 ) @@ -1737,8 +1737,8 @@ void KFileDialog::readConfig( KConfig *kc, const TQString& group ) d->autoSelectExtChecked = kc->readBoolEntry (AutoSelectExtChecked, DefaultAutoSelectExtChecked); updateAutoSelectExtension (); - int w1 = minimumSize().width(); - int w2 = toolbar->sizeHint().width() + 10; + int w1 = tqminimumSize().width(); + int w2 = toolbar->tqsizeHint().width() + 10; if (w1 < w2) setMinimumWidth(w2); @@ -1885,7 +1885,7 @@ static TQString getExtensionFromPatternList (const TQStringList &patternList) // *.JP? if ((*it).startsWith ("*.") && (*it).length () > 2 && - (*it).find ('*', 2) < 0 && (*it).find ('?', 2) < 0) + (*it).tqfind ('*', 2) < 0 && (*it).tqfind ('?', 2) < 0) { ret = (*it).mid (1); break; @@ -1937,7 +1937,7 @@ void KFileDialog::updateAutoSelectExtension (void) if (!filter.isEmpty ()) { // e.g. "*.cpp" - if (filter.find ('/') < 0) + if (filter.tqfind ('/') < 0) { d->extension = getExtensionFromPatternList (TQStringList::split (" ", filter)).lower (); kdDebug (kfile_area) << "\tsetFilter-style: pattern ext=\'" @@ -2056,10 +2056,10 @@ void KFileDialog::updateLocationEditExtension (const TQString &lastExtension) KURL url = getCompleteURL (urlStr); kdDebug (kfile_area) << "updateLocationEditExtension (" << url << ")" << endl; - const int fileNameOffset = urlStr.findRev ('/') + 1; + const int fileNameOffset = urlStr.tqfindRev ('/') + 1; TQString fileName = urlStr.mid (fileNameOffset); - const int dot = fileName.findRev ('.'); + const int dot = fileName.tqfindRev ('.'); const int len = fileName.length (); if (dot > 0 && // has an extension already and it's not a hidden file // like ".hidden" (but we do accept ".hidden.ext") @@ -2068,7 +2068,7 @@ void KFileDialog::updateLocationEditExtension (const TQString &lastExtension) { // exists? KIO::UDSEntry t; - if (KIO::NetAccess::stat (url, t, topLevelWidget())) + if (KIO::NetAccess::stat (url, t, tqtopLevelWidget())) { kdDebug (kfile_area) << "\tfile exists" << endl; @@ -2112,10 +2112,10 @@ void KFileDialog::updateFilter () if (urlStr.isEmpty ()) return; - KMimeType::Ptr mime = KMimeType::findByPath(urlStr, 0, true); + KMimeType::Ptr mime = KMimeType::tqfindByPath(urlStr, 0, true); if (mime && mime->name() != KMimeType::defaultMimeType()) { if (filterWidget->currentFilter() != mime->name() && - filterWidget->filters.findIndex(mime->name()) != -1) { + filterWidget->filters.tqfindIndex(mime->name()) != -1) { filterWidget->setCurrentFilter(mime->name()); } } @@ -2135,7 +2135,7 @@ void KFileDialog::appendExtension (KURL &url) kdDebug (kfile_area) << "appendExtension(" << url << ")" << endl; const int len = fileName.length (); - const int dot = fileName.findRev ('.'); + const int dot = fileName.tqfindRev ('.'); const bool suppressExtension = (dot == len - 1); const bool unspecifiedExtension = (dot <= 0); @@ -2146,7 +2146,7 @@ void KFileDialog::appendExtension (KURL &url) // exists? KIO::UDSEntry t; - if (KIO::NetAccess::stat (url, t, topLevelWidget())) + if (KIO::NetAccess::stat (url, t, tqtopLevelWidget())) { kdDebug (kfile_area) << "\tfile exists - won't append extension" << endl; return; @@ -2265,7 +2265,7 @@ void KFileDialog::toggleBookmarks(bool show) connect( d->bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )), TQT_SLOT( enterURL( const TQString& ))); - toolbar->insertButton(TQString::fromLatin1("bookmark"), + toolbar->insertButton(TQString::tqfromLatin1("bookmark"), (int)HOTLIST_BUTTON, true, i18n("Bookmarks"), 5); toolbar->getButton(HOTLIST_BUTTON)->setPopup(d->bookmarkHandler->menu(), @@ -2359,13 +2359,13 @@ void KFileDialog::setNonExtSelection() { // Enhanced rename: Don't highlight the file extension. TQString pattern, filename = locationEdit->currentText().stripWhiteSpace(); - KServiceTypeFactory::self()->findFromPattern( filename, &pattern ); + KServiceTypeFactory::self()->tqfindFromPattern( filename, &pattern ); - if ( !pattern.isEmpty() && pattern.at( 0 ) == '*' && pattern.find( '*' , 1 ) == -1 ) + if ( !pattern.isEmpty() && pattern.at( 0 ) == '*' && pattern.tqfind( '*' , 1 ) == -1 ) locationEdit->lineEdit()->setSelection( 0, filename.length() - pattern.stripWhiteSpace().length()+1 ); else { - int lastDot = filename.findRev( '.' ); + int lastDot = filename.tqfindRev( '.' ); if ( lastDot > 0 ) locationEdit->lineEdit()->setSelection( 0, lastDot ); } diff --git a/kio/kfile/kfiledialog.h b/kio/kfile/kfiledialog.h index 33e0c9b12..1fd4f7b7f 100644 --- a/kio/kfile/kfiledialog.h +++ b/kio/kfile/kfiledialog.h @@ -57,7 +57,7 @@ struct KFileDialogPrivate; * Provides a user (and developer) friendly way to * select files and directories. * - * The widget can be used as a drop in replacement for the + * The widget can be used as a drop in tqreplacement for the * TQFileDialog widget, but has greater functionality and a nicer GUI. * * You will usually want to use one of the static methods @@ -65,8 +65,8 @@ struct KFileDialogPrivate; * or for multiple files getOpenFileNames() or getOpenURLs(). * * The dialog has been designed to allow applications to customise it - * by subclassing. It uses geometry management to ensure that subclasses - * can easily add children that will be incorporated into the layout. + * by subclassing. It uses tqgeometry management to ensure that subclasses + * can easily add children that will be incorporated into the tqlayout. * * \image html kfiledialog.png "KDE File Dialog" * @@ -276,7 +276,7 @@ public: * want to show the suffix to select by a specific filter, you must * repeat it. * - * If the filter contains an unescaped '/', a mimetype-filter is assumed. + * If the filter tqcontains an unescaped '/', a mimetype-filter is assumed. * If you would like a '/' visible in your filter it can be escaped with * a '\'. You can specify multiple mimetypes like this (separated with * space): @@ -356,7 +356,7 @@ public: * Add a preview widget and enter the preview mode. * * In this mode - * the dialog is split and the right part contains your widget. + * the dialog is split and the right part tqcontains your widget. * This widget has to inherit TQWidget and it has to implement * a slot showPreview(const KURL &); which is called * every time the file changes. You may want to look at @@ -370,7 +370,7 @@ public: /** * Adds a preview widget and enters the preview mode. * - * In this mode the dialog is split and the right part contains your + * In this mode the dialog is split and the right part tqcontains your * preview widget. * * Ownership is transferred to KFileDialog. You need to create the @@ -811,7 +811,7 @@ signals: * Emitted when the filter changed, i.e. the user entered an own filter * or chose one of the predefined set via setFilter(). * - * @param filter contains the new filter (only the extension part, + * @param filter tqcontains the new filter (only the extension part, * not the explanation), i.e. "*.cpp" or "*.cpp *.cc". * * @see setFilter() @@ -840,7 +840,7 @@ protected: void init(const TQString& startDir, const TQString& filter, TQWidget* widget); /** - * rebuild geometry management. + * rebuild tqgeometry management. * */ virtual void initGUI(); @@ -946,7 +946,7 @@ protected slots: /** * @deprecated */ - virtual void updateStatusLine(int dirs, int files); + virtual void updatetqStatusLine(int dirs, int files); virtual void slotOk(); virtual void accept(); diff --git a/kio/kfile/kfilefiltercombo.cpp b/kio/kfile/kfilefiltercombo.cpp index c865cc0e1..492c36d55 100644 --- a/kio/kfile/kfilefiltercombo.cpp +++ b/kio/kfile/kfilefiltercombo.cpp @@ -68,11 +68,11 @@ void KFileFilterCombo::setFilter(const TQString& filter) if (!filter.isEmpty()) { TQString tmp = filter; - int index = tmp.find('\n'); + int index = tmp.tqfind('\n'); while (index > 0) { filters.append(tmp.left(index)); tmp = tmp.mid(index + 1); - index = tmp.find('\n'); + index = tmp.tqfind('\n'); } filters.append(tmp); } @@ -82,7 +82,7 @@ void KFileFilterCombo::setFilter(const TQString& filter) TQStringList::ConstIterator it; TQStringList::ConstIterator end(filters.end()); for (it = filters.begin(); it != end; ++it) { - int tab = (*it).find('|'); + int tab = (*it).tqfind('|'); insertItem((tab < 0) ? *it : (*it).mid(tab + 1)); } @@ -101,7 +101,7 @@ TQString KFileFilterCombo::currentFilter() const } } - int tab = f.find('|'); + int tab = f.tqfind('|'); if (tab < 0) return f; else @@ -129,7 +129,7 @@ void KFileFilterCombo::setMimeFilter( const TQStringList& types, { clear(); filters.clear(); - TQString delim = TQString::fromLatin1(", "); + TQString delim = TQString::tqfromLatin1(", "); d->hasAllSupportedFiles = false; m_allTypes = defaultType.isEmpty() && (types.count() > 1); diff --git a/kio/kfile/kfileiconview.cpp b/kio/kfile/kfileiconview.cpp index a4c65924d..ab68cba4a 100644 --- a/kio/kfile/kfileiconview.cpp +++ b/kio/kfile/kfileiconview.cpp @@ -70,8 +70,8 @@ public: parent->actionCollection(), "large rows" ); - smallColumns->setExclusiveGroup(TQString::fromLatin1("IconView mode")); - largeRows->setExclusiveGroup(TQString::fromLatin1("IconView mode")); + smallColumns->setExclusiveGroup(TQString::tqfromLatin1("IconView mode")); + largeRows->setExclusiveGroup(TQString::tqfromLatin1("IconView mode")); previews = new KToggleAction( i18n("Thumbnail Previews"), 0, parent->actionCollection(), @@ -191,7 +191,7 @@ void KFileIconView::readConfig( KConfig *kc, const TQString& group ) { TQString gr = group.isEmpty() ? TQString("KFileIconView") : group; KConfigGroupSaver cs( kc, gr ); - TQString small = TQString::fromLatin1("SmallColumns"); + TQString small = TQString::tqfromLatin1("SmallColumns"); d->previewIconSize = kc->readNumEntry( "Preview Size", DEFAULT_PREVIEW_SIZE ); d->previews->setChecked( kc->readBoolEntry( "ShowPreviews", DEFAULT_SHOW_PREVIEWS ) ); @@ -214,8 +214,8 @@ void KFileIconView::writeConfig( KConfig *kc, const TQString& group ) KConfigGroupSaver cs( kc, gr ); TQString viewMode = d->smallColumns->isChecked() ? - TQString::fromLatin1("SmallColumns") : - TQString::fromLatin1("LargeRows"); + TQString::tqfromLatin1("SmallColumns") : + TQString::tqfromLatin1("LargeRows"); if(!kc->hasDefault( "ViewMode" ) && viewMode == DEFAULT_VIEW_MODE ) kc->revertToDefault( "ViewMode" ); else @@ -251,12 +251,12 @@ void KFileIconView::showToolTip( TQIconViewItem *item ) int w = maxItemWidth() - ( itemTextPos() == TQIconView::Bottom ? 0 : item->pixmapRect().width() ) - 4; if ( fontMetrics().width( item->text() ) >= w ) { - toolTip = new TQLabel( TQString::fromLatin1(" %1 ").arg(item->text()), 0, + toolTip = new TQLabel( TQString::tqfromLatin1(" %1 ").arg(item->text()), 0, "myToolTip", WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM ); toolTip->setFrameStyle( TQFrame::Plain | TQFrame::Box ); toolTip->setLineWidth( 1 ); - toolTip->setAlignment( AlignLeft | AlignTop ); + toolTip->tqsetAlignment( AlignLeft | AlignTop ); toolTip->move( TQCursor::pos() + TQPoint( 14, 14 ) ); toolTip->adjustSize(); TQRect screen = TQApplication::desktop()->screenGeometry( @@ -338,7 +338,7 @@ void KFileIconView::insertItem( KFileItem *i ) KFileView::insertItem( i ); TQIconView* qview = static_cast<TQIconView*>( this ); - // Since creating and initializing an item leads to a repaint, + // Since creating and initializing an item leads to a tqrepaint, // we disable updates on the IconView for a while. qview->setUpdatesEnabled( false ); KFileIconViewItem *item = new KFileIconViewItem( qview, i ); @@ -450,7 +450,7 @@ void KFileIconView::updateView( bool b ) if ( !item->pixmapSize().isNull() ) item->setPixmapSize( TQSize( 0, 0 ) ); } - // recalculate item parameters but avoid an in-place repaint + // recalculate item parameters but avoid an in-place tqrepaint item->setPixmap( (item->fileInfo())->pixmap( myIconSize ), true, false ); item = static_cast<KFileIconViewItem *>(item->nextItem()); } while ( item != 0L ); @@ -763,7 +763,7 @@ void KFileIconView::initItem( KFileIconViewItem *item, const KFileItem *i, if ( updateTextAndPixmap ) { - // this causes a repaint of the item, which we want to avoid during + // this causes a tqrepaint of the item, which we want to avoid during // directory listing, when all items are created. We want to paint all // items at once, not every single item in that case. item->setText( i->text() , false, false ); @@ -866,7 +866,7 @@ void KFileIconView::contentsDragEnterEvent( TQDragEnterEvent *e ) if ((dropOptions() & AutoOpenDirs) == 0) return; - KFileIconViewItem *item = dynamic_cast<KFileIconViewItem*>(findItem( contentsToViewport( e->pos() ) )); + KFileIconViewItem *item = dynamic_cast<KFileIconViewItem*>(tqfindItem( contentsToViewport( e->pos() ) )); if ( item ) { // are we over an item ? d->dropItem = item; d->autoOpenTimer.start( autoOpenDelay() ); // restart timer @@ -889,7 +889,7 @@ void KFileIconView::contentsDragMoveEvent( TQDragMoveEvent *e ) if ((dropOptions() & AutoOpenDirs) == 0) return; - KFileIconViewItem *item = dynamic_cast<KFileIconViewItem*>(findItem( contentsToViewport( e->pos() ) )); + KFileIconViewItem *item = dynamic_cast<KFileIconViewItem*>(tqfindItem( contentsToViewport( e->pos() ) )); if ( item ) { // are we over an item ? if (d->dropItem != item) { @@ -921,7 +921,7 @@ void KFileIconView::contentsDropEvent( TQDropEvent *e ) } e->acceptAction(); // Yes - KFileIconViewItem *item = dynamic_cast<KFileIconViewItem*>(findItem( contentsToViewport( e->pos() ) )); + KFileIconViewItem *item = dynamic_cast<KFileIconViewItem*>(tqfindItem( contentsToViewport( e->pos() ) )); KFileItem * fileItem = 0; if (item) fileItem = item->fileInfo(); diff --git a/kio/kfile/kfilemetapreview.cpp b/kio/kfile/kfilemetapreview.cpp index 1be7743a1..3b409158c 100644 --- a/kio/kfile/kfilemetapreview.cpp +++ b/kio/kfile/kfilemetapreview.cpp @@ -21,9 +21,9 @@ KFileMetaPreview::KFileMetaPreview( TQWidget *parent, const char *name ) : KPreviewWidgetBase( parent, name ), haveAudioPreview( false ) { - TQHBoxLayout *layout = new TQHBoxLayout( this, 0, 0 ); + TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 0, 0 ); m_stack = new TQWidgetStack( this ); - layout->addWidget( m_stack ); + tqlayout->addWidget( m_stack ); // ### // m_previewProviders.setAutoDelete( true ); @@ -43,7 +43,7 @@ void KFileMetaPreview::initPreviewProviders() KImageFilePreview *imagePreview = new KImageFilePreview( m_stack ); (void) m_stack->addWidget( imagePreview ); m_stack->raiseWidget( imagePreview ); - resize( imagePreview->sizeHint() ); + resize( imagePreview->tqsizeHint() ); TQStringList mimeTypes = imagePreview->supportedMimeTypes(); TQStringList::ConstIterator it = mimeTypes.begin(); @@ -62,11 +62,11 @@ KPreviewWidgetBase * KFileMetaPreview::previewProviderFor( const TQString& mimeT if ( mimeType == "inode/directory" ) return 0L; - KPreviewWidgetBase *provider = m_previewProviders.find( mimeType ); + KPreviewWidgetBase *provider = m_previewProviders.tqfind( mimeType ); if ( provider ) return provider; -//qDebug("#### didn't find anything for: %s", mimeType.latin1()); +//qDebug("#### didn't tqfind anything for: %s", mimeType.latin1()); if ( s_tryAudioPreview && !mimeType.startsWith("text/") && !mimeType.startsWith("image/") ) @@ -87,15 +87,15 @@ KPreviewWidgetBase * KFileMetaPreview::previewProviderFor( const TQString& mimeT } // with the new mimetypes from the audio-preview, try again - provider = m_previewProviders.find( mimeType ); + provider = m_previewProviders.tqfind( mimeType ); if ( provider ) return provider; // ### mimetype may be image/* for example, try that - int index = mimeType.find( '/' ); + int index = mimeType.tqfind( '/' ); if ( index > 0 ) { - provider = m_previewProviders.find( mimeType.left( index + 1 ) + "*" ); + provider = m_previewProviders.tqfind( mimeType.left( index + 1 ) + "*" ); if ( provider ) return provider; } @@ -107,7 +107,7 @@ KPreviewWidgetBase * KFileMetaPreview::previewProviderFor( const TQString& mimeT TQString parentMimeType = mimeInfo->parentMimeType(); while ( !parentMimeType.isEmpty() ) { - provider = m_previewProviders.find( parentMimeType ); + provider = m_previewProviders.tqfind( parentMimeType ); if ( provider ) return provider; @@ -123,11 +123,11 @@ KPreviewWidgetBase * KFileMetaPreview::previewProviderFor( const TQString& mimeT { if ( textProperty.toBool() ) { - provider = m_previewProviders.find( "text/plain" ); + provider = m_previewProviders.tqfind( "text/plain" ); if ( provider ) return provider; - provider = m_previewProviders.find( "text/*" ); + provider = m_previewProviders.tqfind( "text/*" ); if ( provider ) return provider; } diff --git a/kio/kfile/kfilepreview.cpp b/kio/kfile/kfilepreview.cpp index b221a1ebb..c0f73949e 100644 --- a/kio/kfile/kfilepreview.cpp +++ b/kio/kfile/kfilepreview.cpp @@ -53,7 +53,7 @@ KFilePreview::~KFilePreview() // don't delete the preview, we can reuse it // (it will get deleted by ~KDirOperator) - if ( preview && preview->parentWidget() == this ) { + if ( preview && preview->tqparentWidget() == this ) { preview->reparent(0L, 0, TQPoint(0, 0), false); } } @@ -68,9 +68,9 @@ void KFilePreview::init( KFileView *view ) preview = new TQWidget((TQSplitter*)this, "preview"); TQString tmp = i18n("No preview available."); TQLabel *l = new TQLabel(tmp, preview); - l->setMinimumSize(l->sizeHint()); + l->setMinimumSize(l->tqsizeHint()); l->move(10, 5); - preview->setMinimumWidth(l->sizeHint().width()+20); + preview->setMinimumWidth(l->tqsizeHint().width()+20); setResizeMode(preview, TQSplitter::KeepSize); // Why copy the actions? --ellis, 13 Jan 02. @@ -123,7 +123,7 @@ void KFilePreview::setPreviewWidget(const TQWidget *w, const KURL &) delete preview; preview = const_cast<TQWidget*>(w); preview->reparent((TQSplitter*)this, 0, TQPoint(0, 0), true); - preview->resize(preview->sizeHint()); + preview->resize(preview->tqsizeHint()); preview->show(); } @@ -149,7 +149,7 @@ void KFilePreview::updateView(bool b) { left->updateView(b); if(preview) - preview->repaint(b); + preview->tqrepaint(b); } void KFilePreview::updateView(const KFileItem *i) diff --git a/kio/kfile/kfilepreview.h b/kio/kfile/kfilepreview.h index 123d221f1..2bb2d860c 100644 --- a/kio/kfile/kfilepreview.h +++ b/kio/kfile/kfilepreview.h @@ -88,7 +88,7 @@ public: /** * This overrides KFileView::actionCollection() by returning - * the actionCollection() of the KFileView (member left) it contains. + * the actionCollection() of the KFileView (member left) it tqcontains. * This means that KFilePreview will never create a KActionCollection * object of its own. */ diff --git a/kio/kfile/kfilesharedlg.cpp b/kio/kfile/kfilesharedlg.cpp index 329bd19dc..fa82539a8 100644 --- a/kio/kfile/kfilesharedlg.cpp +++ b/kio/kfile/kfilesharedlg.cpp @@ -124,13 +124,13 @@ void KFileSharePropsPlugin::init() // 0 => not shared // 1 => shared read only // 3 => shared writeable - int dirStatus = KFileShare::isDirectoryShared( path ); + int dirtqStatus = KFileShare::isDirectoryShared( path ); if ( !path.startsWith( home ) ) ok = false; - if ( dirStatus == 1 ) { + if ( dirtqStatus == 1 ) { d->m_bAllUnshared = false; } - else if ( dirStatus == 3 ) { + else if ( dirtqStatus == 3 ) { d->m_bAllUnshared = false; d->m_bAllReadOnly = false; } @@ -184,13 +184,13 @@ void KFileSharePropsPlugin::init() // Some help text TQLabel *label = new TQLabel( i18n("Sharing this folder makes it available under Linux/UNIX (NFS) and Windows (Samba).") , m_widget ); - label->setAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::WordBreak ); + label->tqsetAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::WordBreak ); vbox->addWidget( label, 0 ); KSeparator* sep=new KSeparator(m_widget); vbox->addWidget( sep, 0 ); label = new TQLabel( i18n("You can also reconfigure file sharing authorization.") , m_widget ); - label->setAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::WordBreak ); + label->tqsetAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::WordBreak ); vbox->addWidget( label, 0 ); m_pbConfig = new TQPushButton( i18n("Configure File Sharing..."), m_widget ); connect( m_pbConfig, TQT_SIGNAL( clicked() ), TQT_SLOT( slotConfigureFileSharing() ) ); diff --git a/kio/kfile/kfilespeedbar.cpp b/kio/kfile/kfilespeedbar.cpp index 154009625..c96e1a60e 100644 --- a/kio/kfile/kfilespeedbar.cpp +++ b/kio/kfile/kfilespeedbar.cpp @@ -81,17 +81,17 @@ KFileSpeedBar::KFileSpeedBar( TQWidget *parent, const char *name ) while (!line.isNull()) { if (line.startsWith("XDG_DOWNLOAD_DIR=")) - download = line.remove("XDG_DOWNLOAD_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); + download = line.remove("XDG_DOWNLOAD_DIR=").remove("\"").tqreplace("$HOME", TQDir::homeDirPath()); else if (line.startsWith("XDG_MUSIC_DIR=")) - music = line.remove("XDG_MUSIC_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); + music = line.remove("XDG_MUSIC_DIR=").remove("\"").tqreplace("$HOME", TQDir::homeDirPath()); else if (line.startsWith("XDG_PICTURES_DIR=")) - pictures = line.remove("XDG_PICTURES_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); + pictures = line.remove("XDG_PICTURES_DIR=").remove("\"").tqreplace("$HOME", TQDir::homeDirPath()); else if (line.startsWith("XDG_VIDEOS_DIR=")) - videos = line.remove("XDG_VIDEOS_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); + videos = line.remove("XDG_VIDEOS_DIR=").remove("\"").tqreplace("$HOME", TQDir::homeDirPath()); else if (line.startsWith("XDG_TEMPLATES_DIR=")) - templates = line.remove("XDG_TEMPLATES_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); + templates = line.remove("XDG_TEMPLATES_DIR=").remove("\"").tqreplace("$HOME", TQDir::homeDirPath()); else if (line.startsWith("XDG_PUBLICSHARES_DIR=")) - publicShares = line.remove("XDG_PUBLICSHARES_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); + publicShares = line.remove("XDG_PUBLICSHARES_DIR=").remove("\"").tqreplace("$HOME", TQDir::homeDirPath()); line = s.readLine(); } @@ -133,15 +133,15 @@ void KFileSpeedBar::save( KConfig *config ) writeConfig( config, "KFileDialog Speedbar" ); } -TQSize KFileSpeedBar::sizeHint() const +TQSize KFileSpeedBar::tqsizeHint() const { - TQSize sizeHint = KURLBar::sizeHint(); + TQSize tqsizeHint = KURLBar::tqsizeHint(); int ems = fontMetrics().width("mmmmmmmmmmmm"); - if (sizeHint.width() < ems) + if (tqsizeHint.width() < ems) { - sizeHint.setWidth(ems); + tqsizeHint.setWidth(ems); } - return sizeHint; + return tqsizeHint; } #include "kfilespeedbar.moc" diff --git a/kio/kfile/kfilespeedbar.h b/kio/kfile/kfilespeedbar.h index 28c621651..171081101 100644 --- a/kio/kfile/kfilespeedbar.h +++ b/kio/kfile/kfilespeedbar.h @@ -31,7 +31,7 @@ public: ~KFileSpeedBar(); virtual void save( KConfig *config ); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; private: bool m_initializeSpeedbar : 1; diff --git a/kio/kfile/kfiletreebranch.cpp b/kio/kfile/kfiletreebranch.cpp index 352bd875e..c0a5d1b6e 100644 --- a/kio/kfile/kfiletreebranch.cpp +++ b/kio/kfile/kfiletreebranch.cpp @@ -126,7 +126,7 @@ KFileTreeViewItem *KFileTreeBranch::parentKFTVItem( KFileItem *item ) dirUrl.setFileName( TQString::null ); // kdDebug(250) << "Directory url is " << dirUrl.prettyURL() << endl; - parent = findTVIByURL( dirUrl ); + parent = tqfindTVIByURL( dirUrl ); // kdDebug(250) << "Returning as parent item <" << parent << ">" << endl; return( parent ); } @@ -141,7 +141,7 @@ void KFileTreeBranch::slotRefreshItems( const KFileItemList& list ) while ( (currItem = it.current()) != 0 ) { - item = findTVIByURL(currItem->url()); + item = tqfindTVIByURL(currItem->url()); if (item) { item->setPixmap(0, item->fileItem()->pixmap( KIcon::SizeSmall )); item->setText( 0, item->fileItem()->text()); @@ -182,14 +182,14 @@ void KFileTreeBranch::addItems( const KFileItemList& list ) if( !m_showExtensions && !currItem->isDir() ) /* Need to cut the extension */ { TQString name = currItem->text(); - int mPoint = name.findRev( '.' ); + int mPoint = name.tqfindRev( '.' ); if( mPoint > 0 ) name = name.left( mPoint ); newKFTVI->setText( 0, name ); } } - /* Now try to find out if there are children for dirs in the treeview */ + /* Now try to tqfind out if there are children for dirs in the treeview */ /* This stats a directory on the local file system and checks the */ /* hardlink entry in the stat-buf. This works only for local directories. */ if( dirOnlyMode() && !m_recurseChildren && currItem->isLocalFile( ) && currItem->isDir() ) @@ -197,7 +197,7 @@ void KFileTreeBranch::addItems( const KFileItemList& list ) KURL url = currItem->url(); TQString filename = url.directory( false, true ) + url.fileName(); /* do the stat trick of Carsten. The problem is, that the hardlink - * count only contains directory links. Thus, this method only seem + * count only tqcontains directory links. Thus, this method only seem * to work in dir-only mode */ kdDebug(250) << "Doing stat on " << filename << endl; KDE_struct_stat statBuf; @@ -321,7 +321,7 @@ void KFileTreeBranch::slotCanceled( const KURL& url ) m_openChildrenURLs.remove( url); // stop animations etc. - KFileTreeViewItem *item = findTVIByURL(url); + KFileTreeViewItem *item = tqfindTVIByURL(url); if (!item) return; // Uh oh... emit populateFinished(item); } @@ -365,7 +365,7 @@ void KFileTreeBranch::slotRedirect( const KURL& oldUrl, const KURL&newUrl ) } } -KFileTreeViewItem* KFileTreeBranch::findTVIByURL( const KURL& url ) +KFileTreeViewItem* KFileTreeBranch::tqfindTVIByURL( const KURL& url ) { KFileTreeViewItem *resultItem = 0; @@ -400,7 +400,7 @@ KFileTreeViewItem* KFileTreeBranch::findTVIByURL( const KURL& url ) void KFileTreeBranch::slCompleted( const KURL& url ) { kdDebug(250) << "SlotCompleted hit for " << url.prettyURL() << endl; - KFileTreeViewItem *currParent = findTVIByURL( url ); + KFileTreeViewItem *currParent = tqfindTVIByURL( url ); if( ! currParent ) return; kdDebug(250) << "current parent " << currParent << " is already listed: " @@ -463,7 +463,7 @@ void KFileTreeBranch::slCompleted( const KURL& url ) if( nextChild ) /* This implies that idx > -1 */ { /* Next child is defined. We start a dirlister job on every child item - * which is a directory to find out how much children are in the child + * which is a directory to tqfind out how much children are in the child * of the last opened dir */ diff --git a/kio/kfile/kfiletreebranch.h b/kio/kfile/kfiletreebranch.h index 30f5cf47c..03976a8d7 100644 --- a/kio/kfile/kfiletreebranch.h +++ b/kio/kfile/kfiletreebranch.h @@ -166,9 +166,9 @@ protected: public: /** - * find the according KFileTreeViewItem by an url + * tqfind the according KFileTreeViewItem by an url */ - virtual KFileTreeViewItem *findTVIByURL( const KURL& ); + virtual KFileTreeViewItem *tqfindTVIByURL( const KURL& ); signals: /** @@ -213,7 +213,7 @@ private: KURL::List m_openChildrenURLs; - /* The next two members are used for caching purposes in findTVIByURL. */ + /* The next two members are used for caching purposes in tqfindTVIByURL. */ KURL m_lastFoundURL; KFileTreeViewItem *m_lastFoundItem; diff --git a/kio/kfile/kfiletreeview.cpp b/kio/kfile/kfiletreeview.cpp index e8451077d..2b38635b9 100644 --- a/kio/kfile/kfiletreeview.cpp +++ b/kio/kfile/kfiletreeview.cpp @@ -342,7 +342,7 @@ void KFileTreeView::slotAutoOpenFolder() return; m_dropItem->setOpen( true ); - m_dropItem->repaint(); + m_dropItem->tqrepaint(); } @@ -413,7 +413,7 @@ KFileTreeBranchList& KFileTreeView::branches() bool KFileTreeView::removeBranch( KFileTreeBranch *branch ) { - if(m_branches.contains(branch)) + if(m_branches.tqcontains(branch)) { delete (branch->root()); m_branches.remove( branch ); @@ -522,7 +522,7 @@ void KFileTreeView::slotAnimation() } uint & iconNumber = it.data().iconNumber; - TQString icon = TQString::fromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) ); + TQString icon = TQString::tqfromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) ); // kdDebug(250) << "Loading icon " << icon << endl; item->setPixmap( 0, DesktopIcon( icon,KIcon::SizeSmall,KIcon::ActiveState )); // KFileTreeViewFactory::instance() ) ); @@ -558,7 +558,7 @@ void KFileTreeView::stopAnimation( KFileTreeViewItem * item ) kdDebug(250) << "Stoping Animation !" << endl; - MapCurrentOpeningFolders::Iterator it = m_mapCurrentOpeningFolders.find(item); + MapCurrentOpeningFolders::Iterator it = m_mapCurrentOpeningFolders.tqfind(item); if ( it != m_mapCurrentOpeningFolders.end() ) { if( item->isDir() && isOpen( item) ) @@ -575,7 +575,7 @@ void KFileTreeView::stopAnimation( KFileTreeViewItem * item ) else { if( item ) - kdDebug(250)<< "StopAnimation - could not find item " << item->url().prettyURL()<< endl; + kdDebug(250)<< "StopAnimation - could not tqfind item " << item->url().prettyURL()<< endl; else kdDebug(250)<< "StopAnimation - item is zero !" << endl; } @@ -616,13 +616,13 @@ void KFileTreeView::slotItemRenamed(TQListViewItem* item, const TQString &name, kdDebug(250) << "Do not bother: " << name << col << endl; } -KFileTreeViewItem *KFileTreeView::findItem( const TQString& branchName, const TQString& relUrl ) +KFileTreeViewItem *KFileTreeView::tqfindItem( const TQString& branchName, const TQString& relUrl ) { KFileTreeBranch *br = branch( branchName ); - return( findItem( br, relUrl )); + return( tqfindItem( br, relUrl )); } -KFileTreeViewItem *KFileTreeView::findItem( KFileTreeBranch* brnch, const TQString& relUrl ) +KFileTreeViewItem *KFileTreeView::tqfindItem( KFileTreeBranch* brnch, const TQString& relUrl ) { KFileTreeViewItem *ret = 0; if( brnch ) @@ -666,7 +666,7 @@ void KFileTreeViewToolTip::maybeTip( const TQPoint & ) if ( item ) { TQString text = static_cast<KFileViewItem*>( item )->toolTipText(); if ( !text.isEmpty() ) - tip ( m_view->itemRect( item ), text ); + tip ( m_view->tqitemRect( item ), text ); } #endif } diff --git a/kio/kfile/kfiletreeview.h b/kio/kfile/kfiletreeview.h index 92565269d..03c4661b2 100644 --- a/kio/kfile/kfiletreeview.h +++ b/kio/kfile/kfiletreeview.h @@ -58,7 +58,7 @@ private: * KFileTreeBranch. * * Typical usage: - * 1. create a KFileTreeView fitting in your layout and add columns to it + * 1. create a KFileTreeView fitting in your tqlayout and add columns to it * 2. call addBranch to create one or more branches * 3. retrieve the root item with KFileTreeBranch::root() and set it open * if desired. That starts the listing. @@ -133,18 +133,18 @@ public: /** * searches a branch for a KFileTreeViewItem identified by the relative url given as - * second parameter. The method adds the branches base url to the relative path and finds + * second parameter. The method adds the branches base url to the relative path and tqfinds * the item. * @returns a pointer to the item or zero if the item does not exist. * @param brnch is a pointer to the branch to search in * @param relUrl is the branch relativ url */ - KFileTreeViewItem *findItem( KFileTreeBranch* brnch, const TQString& relUrl ); + KFileTreeViewItem *tqfindItem( KFileTreeBranch* brnch, const TQString& relUrl ); /** * see method above, differs only in the first parameter. Finds the branch by its name. */ - KFileTreeViewItem *findItem( const TQString& branchName, const TQString& relUrl ); + KFileTreeViewItem *tqfindItem( const TQString& branchName, const TQString& relUrl ); /** * @returns a flag indicating if extended folder pixmaps are displayed or not. diff --git a/kio/kfile/kfileview.cpp b/kio/kfile/kfileview.cpp index 165801652..eb12a9498 100644 --- a/kio/kfile/kfileview.cpp +++ b/kio/kfile/kfileview.cpp @@ -258,7 +258,7 @@ sort_by_name: void KFileView::updateView(bool f) { - widget()->repaint(f); + widget()->tqrepaint(f); } void KFileView::updateView(const KFileItem *) diff --git a/kio/kfile/kfileview.h b/kio/kfile/kfileview.h index 05b32e863..1a13e264e 100644 --- a/kio/kfile/kfileview.h +++ b/kio/kfile/kfileview.h @@ -34,7 +34,7 @@ class KActionCollection; * internal class to make easier to use signals possible * @internal **/ -class KIO_EXPORT KFileViewSignaler : public QObject +class KIO_EXPORT KFileViewSignaler : public TQObject { Q_OBJECT @@ -146,11 +146,11 @@ public: virtual void clear(); /** - * does a repaint of the view. + * does a tqrepaint of the view. * * The default implementation calls * \code - * widget()->repaint(f) + * widget()->tqrepaint(f) * \endcode **/ virtual void updateView(bool f = true); diff --git a/kio/kfile/kicondialog.cpp b/kio/kfile/kicondialog.cpp index 164abd35a..e33db8d69 100644 --- a/kio/kfile/kicondialog.cpp +++ b/kio/kfile/kicondialog.cpp @@ -68,7 +68,7 @@ protected: public: IconPath(const TQString &ip) : TQString (ip) { - int n = findRev('/'); + int n = tqfindRev('/'); m_iconName = (n==-1) ? static_cast<TQString>(*this) : mid(n+1); } @@ -136,8 +136,8 @@ void KIconCanvas::slotLoadFiles() for (it=mFiles.begin(), i=0; it!=end; ++it, i++) { // Calling kapp->processEvents() makes the iconview flicker like hell - // (it's being repainted once for every new item), so we don't do this. - // Instead, we directly repaint the progress bar without going through + // (it's being tqrepainted once for every new item), so we don't do this. + // Instead, we directly tqrepaint the progress bar without going through // the event-loop. We do that just once for every 10th item so that // the progress bar doesn't flicker in turn. (pfeiffer) if ( emitProgress >= 10 ) { @@ -259,7 +259,7 @@ void KIconDialog::init() mGroupOrSize = KIcon::Desktop; mContext = KIcon::Any; mType = 0; - mFileList = KGlobal::dirs()->findAllResources("appicon", TQString::fromLatin1("*.png")); + mFileList = KGlobal::dirs()->findAllResources("appicon", TQString::tqfromLatin1("*.png")); TQWidget *main = new TQWidget( this ); setMainWidget(main); @@ -268,11 +268,11 @@ void KIconDialog::init() top->setSpacing( spacingHint() ); TQButtonGroup *bgroup = new TQButtonGroup(0, Qt::Vertical, i18n("Icon Source"), main); - bgroup->layout()->setSpacing(KDialog::spacingHint()); - bgroup->layout()->setMargin(KDialog::marginHint()); + bgroup->tqlayout()->setSpacing(KDialog::spacingHint()); + bgroup->tqlayout()->setMargin(KDialog::marginHint()); top->addWidget(bgroup); connect(bgroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotButtonClicked(int))); - TQGridLayout *grid = new TQGridLayout(bgroup->layout(), 3, 2); + TQGridLayout *grid = new TQGridLayout(bgroup->tqlayout(), 3, 2); mpRb1 = new TQRadioButton(i18n("S&ystem icons:"), bgroup); grid->addWidget(mpRb1, 1, 0); mpCombo = new TQComboBox(bgroup); @@ -338,7 +338,7 @@ void KIconDialog::init() I18N_NOOP( "International" ), I18N_NOOP( "Mimetypes" ), I18N_NOOP( "Places" ), - I18N_NOOP( "Status" ) }; + I18N_NOOP( "tqStatus" ) }; static const KIcon::Context context_id[] = { KIcon::Action, KIcon::Animation, @@ -351,7 +351,7 @@ void KIconDialog::init() KIcon::International, KIcon::MimeType, KIcon::Place, - KIcon::StatusIcon }; + KIcon::tqStatusIcon }; mNumContext = 0; int cnt = sizeof( context_text ) / sizeof( context_text[ 0 ] ); // check all 3 arrays have same sizes @@ -367,7 +367,7 @@ void KIconDialog::init() mContextMap[ mNumContext++ ] = context_id[ i ]; } } - mpCombo->setFixedSize(mpCombo->sizeHint()); + mpCombo->setFixedSize(mpCombo->tqsizeHint()); mpBrowseBut->setFixedWidth(mpCombo->width()); @@ -631,8 +631,8 @@ void KIconDialog::slotProgress(int p) { mpProgress->setProgress(p); // commented out the following since setProgress already paints ther - // progress bar. ->repaint() only makes it flicker - //mpProgress->repaint(); + // progress bar. ->tqrepaint() only makes it flicker + //mpProgress->tqrepaint(); } void KIconDialog::slotFinished() diff --git a/kio/kfile/kimagefilepreview.cpp b/kio/kfile/kimagefilepreview.cpp index 2d9f7881a..f2869314c 100644 --- a/kio/kfile/kimagefilepreview.cpp +++ b/kio/kfile/kimagefilepreview.cpp @@ -43,8 +43,8 @@ KImageFilePreview::KImageFilePreview( TQWidget *parent ) imageLabel = new TQLabel( this ); imageLabel->setFrameStyle( TQFrame::NoFrame ); - imageLabel->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter ); - imageLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding) ); + imageLabel->tqsetAlignment( Qt::AlignHCenter | Qt::AlignVCenter ); + imageLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding) ); vb->addWidget( imageLabel ); TQHBoxLayout *hb = new TQHBoxLayout( 0 ); @@ -137,7 +137,7 @@ void KImageFilePreview::resizeEvent( TQResizeEvent * ) timer->start( 100, true ); // forces a new preview } -TQSize KImageFilePreview::sizeHint() const +TQSize KImageFilePreview::tqsizeHint() const { return TQSize( 20, 200 ); // otherwise it ends up huge??? } diff --git a/kio/kfile/kimagefilepreview.h b/kio/kfile/kimagefilepreview.h index 864fc5d31..3e64f2a7b 100644 --- a/kio/kfile/kimagefilepreview.h +++ b/kio/kfile/kimagefilepreview.h @@ -36,7 +36,7 @@ class KIO_EXPORT KImageFilePreview : public KPreviewWidgetBase KImageFilePreview(TQWidget *parent); ~KImageFilePreview(); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; public slots: virtual void showPreview(const KURL &url); diff --git a/kio/kfile/kmetaprops.cpp b/kio/kfile/kmetaprops.cpp index 281fbc622..a8c859792 100644 --- a/kio/kfile/kmetaprops.cpp +++ b/kio/kfile/kmetaprops.cpp @@ -56,8 +56,8 @@ protected: virtual void viewportResizeEvent(TQResizeEvent* ev) { TQScrollView::viewportResizeEvent(ev); - m_frame->resize( kMax(m_frame->sizeHint().width(), ev->size().width()), - kMax(m_frame->sizeHint().height(), ev->size().height())); + m_frame->resize( kMax(m_frame->tqsizeHint().width(), ev->size().width()), + kMax(m_frame->tqsizeHint().height(), ev->size().height())); }; private: @@ -71,7 +71,7 @@ public: ~KFileMetaPropsPluginPrivate() {} TQFrame* m_frame; - TQGridLayout* m_framelayout; + TQGridLayout* m_frametqlayout; KFileMetaInfo m_info; // TQPushButton* m_add; TQPtrList<KFileMetaInfoWidget> m_editWidgets; @@ -138,8 +138,8 @@ void KFileMetaPropsPlugin::createLayout() d->m_frame = view->frame(); - TQVBoxLayout *toplayout = new TQVBoxLayout(d->m_frame); - toplayout->setSpacing(KDialog::spacingHint()); + TQVBoxLayout *toptqlayout = new TQVBoxLayout(d->m_frame); + toptqlayout->setSpacing(KDialog::spacingHint()); for (TQStringList::Iterator git=groupList.begin(); git!=groupList.end(); ++git) @@ -154,7 +154,7 @@ void KFileMetaPropsPlugin::createLayout() TQStyleSheet::escape(mtinfo->groupInfo(*git)->translatedName()), d->m_frame); - toplayout->addWidget(groupBox); + toptqlayout->addWidget(groupBox); TQValueList<KFileMetaInfoItem> readItems; TQValueList<KFileMetaInfoItem> editItems; @@ -174,12 +174,12 @@ void KFileMetaPropsPlugin::createLayout() } KFileMetaInfoWidget* w = 0L; - // then first add the editable items to the layout + // then first add the editable items to the tqlayout for (TQValueList<KFileMetaInfoItem>::Iterator iit= editItems.begin(); iit!=editItems.end(); ++iit) { TQLabel* l = new TQLabel((*iit).translatedKey() + ":", groupBox); - l->setAlignment( AlignAuto | AlignTop | ExpandTabs ); + l->tqsetAlignment( AlignAuto | AlignTop | ExpandTabs ); TQValidator* val = mtinfo->createValidator(*git, (*iit).key()); if (!val) kdDebug(7033) << "didn't get a validator for " << *git << "/" << (*iit).key() << endl; w = new KFileMetaInfoWidget(*iit, val, groupBox); @@ -192,16 +192,16 @@ void KFileMetaPropsPlugin::createLayout() iit!=readItems.end(); ++iit) { TQLabel* l = new TQLabel((*iit).translatedKey() + ":", groupBox); - l->setAlignment( AlignAuto | AlignTop | ExpandTabs ); + l->tqsetAlignment( AlignAuto | AlignTop | ExpandTabs ); (new KFileMetaInfoWidget(*iit, KFileMetaInfoWidget::ReadOnly, 0L, groupBox)); } } - toplayout->addStretch(1); + toptqlayout->addStretch(1); // the add key (disabled until fully implemented) /* d->m_add = new TQPushButton(i18n("&Add"), topframe); - d->m_add->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, + d->m_add->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); connect(d->m_add, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAdd())); tmp->addWidget(d->m_add); @@ -216,7 +216,7 @@ void KFileMetaPropsPlugin::createLayout() d->m_add->setEnabled(false); for (TQStringList::Iterator it = sk.begin(); it!=sk.end(); ++it) { - if ( l.find(*it)==l.end() ) + if ( l.tqfind(*it)==l.end() ) { d->m_add->setEnabled(true); kdDebug(250) << "**first addable key is " << (*it).latin1() << "**" <<endl; diff --git a/kio/kfile/knotifydialog.cpp b/kio/kfile/knotifydialog.cpp index 9e370643f..3ed69ec71 100644 --- a/kio/kfile/knotifydialog.cpp +++ b/kio/kfile/knotifydialog.cpp @@ -65,7 +65,7 @@ enum }; // -// I don't feel like subclassing KComboBox and find ways to insert that into +// I don't feel like subclassing KComboBox and tqfind ways to insert that into // the .ui file... // namespace KNotify @@ -130,7 +130,7 @@ namespace KNotify protected: virtual void maybeTip ( const TQPoint& p ) { - TQHeader *header = static_cast<TQHeader*>( parentWidget() ); + TQHeader *header = static_cast<TQHeader*>( tqparentWidget() ); int section = 0; if ( header->orientation() == Horizontal ) @@ -181,7 +181,7 @@ KNotifyDialog::~KNotifyDialog() void KNotifyDialog::addApplicationEvents( const char *appName ) { addApplicationEvents( TQString::fromUtf8( appName ) + - TQString::fromLatin1( "/eventsrc" ) ); + TQString::tqfromLatin1( "/eventsrc" ) ); } void KNotifyDialog::addApplicationEvents( const TQString& path ) @@ -514,7 +514,7 @@ void KNotifyWidget::updatePixmaps( ListViewItem *item ) void KNotifyWidget::addVisibleApp( Application *app ) { - if ( !app || (m_visibleApps.findRef( app ) != -1) ) + if ( !app || (m_visibleApps.tqfindRef( app ) != -1) ) return; m_visibleApps.append( app ); @@ -830,8 +830,8 @@ void KNotifyWidget::save() // "/opt/kde3/share/apps/kwin/eventsrc" TQString KNotifyWidget::makeRelative( const TQString& fullPath ) { - int slash = fullPath.findRev( '/' ) - 1; - slash = fullPath.findRev( '/', slash ); + int slash = fullPath.tqfindRev( '/' ) - 1; + slash = fullPath.tqfindRev( '/', slash ); if ( slash < 0 ) return TQString::null; @@ -861,7 +861,7 @@ void KNotifyWidget::openSoundDialog( KURLRequester *requester ) << "audio/x-adpcm"; fileDialog->setMimeFilter( filters ); - // find the first "sound"-resource that contains files + // tqfind the first "sound"-resource that tqcontains files const Application *app = currentEvent()->application(); TQStringList soundDirs = KGlobal::dirs()->findDirs("data", app->appName() + "/sounds"); @@ -918,7 +918,7 @@ void KNotifyWidget::playSound() if (!KIO::NetAccess::exists( m_soundPath->url(), true, 0 )) { bool foundSound=false; - // find the first "sound"-resource that contains files + // tqfind the first "sound"-resource that tqcontains files const Application *app = currentEvent()->application(); TQStringList soundDirs = KGlobal::dirs()->findDirs("data", app->appName() + "/sounds"); soundDirs += KGlobal::dirs()->resourceDirs( "sound" ); @@ -1001,17 +1001,17 @@ void KNotifyWidget::enableAll( int what, bool enable ) Application::Application( const TQString &path ) { TQString config_file = path; - config_file[config_file.find('/')] = '.'; + config_file[config_file.tqfind('/')] = '.'; m_events = 0L; config = new KConfig(config_file, false, false); kc = new KConfig(path, true, false, "data"); - kc->setGroup( TQString::fromLatin1("!Global!") ); - m_icon = kc->readEntry(TQString::fromLatin1("IconName"), - TQString::fromLatin1("misc")); - m_description = kc->readEntry( TQString::fromLatin1("Comment"), + kc->setGroup( TQString::tqfromLatin1("!Global!") ); + m_icon = kc->readEntry(TQString::tqfromLatin1("IconName"), + TQString::tqfromLatin1("misc")); + m_description = kc->readEntry( TQString::tqfromLatin1("Comment"), i18n("No description available") ); - int index = path.find( '/' ); + int index = path.tqfind( '/' ); if ( index >= 0 ) m_appname = path.left( index ); else @@ -1070,10 +1070,10 @@ void Application::reloadEvents( bool revertToDefaults ) Event *e = 0L; - TQString global = TQString::fromLatin1("!Global!"); - TQString default_group = TQString::fromLatin1("<default>"); - TQString name = TQString::fromLatin1("Name"); - TQString comment = TQString::fromLatin1("Comment"); + TQString global = TQString::tqfromLatin1("!Global!"); + TQString default_group = TQString::tqfromLatin1("<default>"); + TQString name = TQString::tqfromLatin1("Name"); + TQString comment = TQString::tqfromLatin1("Comment"); TQStringList conflist = kc->groupList(); TQStringList::ConstIterator it = conflist.begin(); diff --git a/kio/kfile/knotifydialog.h b/kio/kfile/knotifydialog.h index 70e195aba..cc801ae8c 100644 --- a/kio/kfile/knotifydialog.h +++ b/kio/kfile/knotifydialog.h @@ -64,7 +64,7 @@ public: * @param name The widget name * @param modal If true, this will be a modal dialog, otherwise non-modal. * @param aboutData A pointer to a KAboutData object. KAboutData::appName() - * will be used to find the KNotify events (in the eventsrc file). + * will be used to tqfind the KNotify events (in the eventsrc file). * Set this to 0L if you want to add all events yourself with * addApplicationEvents(). */ @@ -83,7 +83,7 @@ public: * @param parent The parent widget for the dialog * @param name The widget name * @param aboutData A pointer to a KAboutData object. KAboutData::appName() - * will be used to find the KNotify events (in the eventsrc file). + * will be used to tqfind the KNotify events (in the eventsrc file). * @see exec for the return values. * @return The value of TQDialog::exec() */ @@ -169,7 +169,7 @@ namespace KNotify EventList *m_events; KConfig *kc; // The file that defines the events. - KConfig *config; // The file that contains the settings for the events + KConfig *config; // The file that tqcontains the settings for the events }; diff --git a/kio/kfile/knotifywidgetbase.ui b/kio/kfile/knotifywidgetbase.ui index 99fd07582..87eff311b 100644 --- a/kio/kfile/knotifywidgetbase.ui +++ b/kio/kfile/knotifywidgetbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KNotifyWidgetBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> @@ -155,7 +155,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>318</width> <height>16</height> @@ -286,7 +286,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> @@ -391,7 +391,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -464,6 +464,6 @@ <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kcombobox.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kio/kfile/kopenwith.cpp b/kio/kfile/kopenwith.cpp index 2a3e7e690..e9a13b7c5 100644 --- a/kio/kfile/kopenwith.cpp +++ b/kio/kfile/kopenwith.cpp @@ -279,8 +279,8 @@ void KApplicationTree::slotSelectionChanged(TQListViewItem* i) void KApplicationTree::resizeEvent( TQResizeEvent * e) { - setColumnWidth(0, width()-TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent) - -2*TQApplication::style().pixelMetric(TQStyle::PM_DefaultFrameWidth)); + setColumnWidth(0, width()-TQApplication::style().tqpixelMetric(TQStyle::PM_ScrollBarExtent) + -2*TQApplication::style().tqpixelMetric(TQStyle::PM_DefaultFrameWidth)); KListView::resizeEvent(e); } @@ -340,7 +340,7 @@ KOpenWithDlg::KOpenWithDlg( const KURL::List& _urls, const TQString&_text, { TQString caption = KStringHandler::csqueeze( _urls.first().prettyURL() ); if (_urls.count() > 1) - caption += TQString::fromLatin1("..."); + caption += TQString::tqfromLatin1("..."); setCaption(caption); setServiceType( _urls ); init( _text, _value ); @@ -376,7 +376,7 @@ void KOpenWithDlg::setServiceType( const KURL::List& _urls ) if ( _urls.count() == 1 ) { qServiceType = KMimeType::findByURL( _urls.first())->name(); - if (qServiceType == TQString::fromLatin1("application/octet-stream")) + if (qServiceType == TQString::tqfromLatin1("application/octet-stream")) qServiceType = TQString::null; } else @@ -401,7 +401,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) TQToolButton *clearButton = new TQToolButton( this ); clearButton->setIconSet( BarIcon( "locationbar_erase" ) ); - clearButton->setFixedSize( clearButton->sizeHint() ); + clearButton->setFixedSize( clearButton->tqsizeHint() ); connect( clearButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotClear() ) ); TQToolTip::add( clearButton, i18n( "Clear input field" ) ); @@ -413,13 +413,13 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) KHistoryCombo *combo = new KHistoryCombo(); combo->setDuplicatesEnabled( false ); KConfig *kc = KGlobal::config(); - KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") ); - int max = kc->readNumEntry( TQString::fromLatin1("Maximum history"), 15 ); + KConfigGroupSaver ks( kc, TQString::tqfromLatin1("Open-with settings") ); + int max = kc->readNumEntry( TQString::tqfromLatin1("Maximum history"), 15 ); combo->setMaxCount( max ); - int mode = kc->readNumEntry(TQString::fromLatin1("CompletionMode"), + int mode = kc->readNumEntry(TQString::tqfromLatin1("CompletionMode"), KGlobalSettings::completionMode()); combo->setCompletionMode((KGlobalSettings::Completion)mode); - TQStringList list = kc->readListEntry( TQString::fromLatin1("History") ); + TQStringList list = kc->readListEntry( TQString::tqfromLatin1("History") ); combo->setHistoryItems( list, true ); edit = new KURLRequester( combo, this ); } @@ -433,7 +433,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) edit->setURL( _value ); TQWhatsThis::add(edit,i18n( - "Following the command, you can have several place holders which will be replaced " + "Following the command, you can have several place holders which will be tqreplaced " "with the actual values when the actual program is run:\n" "%f - a single file name\n" "%F - a list of files; use for applications that can open several local files at once\n" @@ -483,8 +483,8 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) // check to see if we use konsole if not disable the nocloseonexit // because we don't know how to do this on other terminal applications - KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); - TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); + KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") ); + TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::tqfromLatin1("konsole")); if (bReadOnly || preferredTerminal != "konsole") nocloseonexit->hide(); @@ -512,13 +512,13 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) TQPushButton* cancel = b->addButton( KStdGuiItem::cancel() ); connect( cancel, TQT_SIGNAL( clicked() ), TQT_SLOT( reject() ) ); - b->layout(); + b->tqlayout(); topLayout->addWidget( b ); //edit->setText( _value ); // This is what caused "can't click on items before clicking on Name header". // Probably due to the resizeEvent handler using width(). - //resize( minimumWidth(), sizeHint().height() ); + //resize( minimumWidth(), tqsizeHint().height() ); edit->setFocus(); slotTextChanged(); } @@ -564,7 +564,7 @@ void KOpenWithDlg::slotHighlighted( const TQString& _name, const TQString& ) // ### indicate that default value was restored terminal->setChecked(d->curService->terminal()); TQString terminalOptions = d->curService->terminalOptions(); - nocloseonexit->setChecked( (terminalOptions.contains( "--noclose" ) > 0) ); + nocloseonexit->setChecked( (terminalOptions.tqcontains( "--noclose" ) > 0) ); m_terminaldirty = false; // slotTerminalToggled changed it } } @@ -629,17 +629,17 @@ void KOpenWithDlg::slotOK() kdDebug(250) << "looking for service " << serviceName << endl; KService::Ptr serv = KService::serviceByDesktopName( serviceName ); ok = !serv; // ok if no such service yet - // also ok if we find the exact same service (well, "kwrite" == "kwrite %U" + // also ok if we tqfind the exact same service (well, "kwrite" == "kwrite %U" if ( serv && serv->type() == "Application") { TQString exec = serv->exec(); fullExec = exec; - exec.replace("%u", "", false); - exec.replace("%f", "", false); - exec.replace("-caption %c", ""); - exec.replace("-caption \"%c\"", ""); - exec.replace("%i", ""); - exec.replace("%m", ""); + exec.tqreplace("%u", "", false); + exec.tqreplace("%f", "", false); + exec.tqreplace("-caption %c", ""); + exec.tqreplace("-caption \"%c\"", ""); + exec.tqreplace("%i", ""); + exec.tqreplace("%m", ""); exec = exec.simplifyWhiteSpace(); if (exec == typedExec) { @@ -666,13 +666,13 @@ void KOpenWithDlg::slotOK() if (terminal->isChecked()) { - KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); - preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); + KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") ); + preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::tqfromLatin1("konsole")); m_command = preferredTerminal; // only add --noclose when we are sure it is konsole we're using if (preferredTerminal == "konsole" && nocloseonexit->isChecked()) - m_command += TQString::fromLatin1(" --noclose"); - m_command += TQString::fromLatin1(" -e "); + m_command += TQString::tqfromLatin1(" --noclose"); + m_command += TQString::tqfromLatin1(" -e "); m_command += edit->url(); kdDebug(250) << "Setting m_command to " << m_command << endl; } @@ -702,7 +702,7 @@ void KOpenWithDlg::slotOK() return; } - // if we got here, we can't seem to find a service for what they + // if we got here, we can't seem to tqfind a service for what they // wanted. The other possibility is that they have asked for the // association to be remembered. Create/update service. @@ -740,7 +740,7 @@ void KOpenWithDlg::slotOK() { desktop = new KDesktopFile(newPath); } - desktop->writeEntry("Type", TQString::fromLatin1("Application")); + desktop->writeEntry("Type", TQString::tqfromLatin1("Application")); desktop->writeEntry("Name", initialServiceName); desktop->writePathEntry("Exec", fullExec); if (terminal->isChecked()) @@ -760,7 +760,7 @@ void KOpenWithDlg::slotOK() if (bRemember || d->saveNewApps) { TQStringList mimeList = desktop->readListEntry("MimeType", ';'); - if (!qServiceType.isEmpty() && !mimeList.contains(qServiceType)) + if (!qServiceType.isEmpty() && !mimeList.tqcontains(qServiceType)) mimeList.append(qServiceType); desktop->writeEntry("MimeType", mimeList, ';'); @@ -814,11 +814,11 @@ void KOpenWithDlg::accept() combo->addToHistory( edit->url() ); KConfig *kc = KGlobal::config(); - KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") ); - kc->writeEntry( TQString::fromLatin1("History"), combo->historyItems() ); - kc->writeEntry(TQString::fromLatin1("CompletionMode"), + KConfigGroupSaver ks( kc, TQString::tqfromLatin1("Open-with settings") ); + kc->writeEntry( TQString::tqfromLatin1("History"), combo->historyItems() ); + kc->writeEntry(TQString::tqfromLatin1("CompletionMode"), combo->completionMode()); - // don't store the completion-list, as it contains all of KURLCompletion's + // don't store the completion-list, as it tqcontains all of KURLCompletion's // executables kc->sync(); } diff --git a/kio/kfile/kpreviewwidgetbase.h b/kio/kfile/kpreviewwidgetbase.h index 3a2a49b31..f435fc3fd 100644 --- a/kio/kfile/kpreviewwidgetbase.h +++ b/kio/kfile/kpreviewwidgetbase.h @@ -84,7 +84,7 @@ protected: private: class KPreviewWidgetBasePrivate; KPreviewWidgetBasePrivate * d() const { - return s_private->find( const_cast<KPreviewWidgetBase*>( this ) ); + return s_private->tqfind( const_cast<KPreviewWidgetBase*>( this ) ); } static TQPtrDict<KPreviewWidgetBasePrivate> * s_private; }; diff --git a/kio/kfile/kpropertiesdesktopadvbase.ui b/kio/kfile/kpropertiesdesktopadvbase.ui index fe1122136..a146807f4 100644 --- a/kio/kfile/kpropertiesdesktopadvbase.ui +++ b/kio/kfile/kpropertiesdesktopadvbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>widget11</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -40,7 +40,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -119,7 +119,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -229,7 +229,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>50</width> <height>20</height> @@ -275,5 +275,5 @@ <includes> <include location="global" impldecl="in implementation">klineedit.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kio/kfile/kpropertiesdesktopbase.ui b/kio/kfile/kpropertiesdesktopbase.ui index 7809d5135..ad12885f5 100644 --- a/kio/kfile/kpropertiesdesktopbase.ui +++ b/kio/kfile/kpropertiesdesktopbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KPropertiesDesktopBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -174,7 +174,7 @@ <property name="whatsThis" stdset="0"> <string>Type the command to start this application here. -Following the command, you can have several place holders which will be replaced with the actual values when the actual program is run: +Following the command, you can have several place holders which will be tqreplaced with the actual values when the actual program is run: %f - a single file name %F - a list of files; use for applications that can open several local files at once %u - a single URL @@ -193,7 +193,7 @@ Following the command, you can have several place holders which will be replaced <property name="whatsThis" stdset="0"> <string>Type the command to start this application here. -Following the command, you can have several place holders which will be replaced with the actual values when the actual program is run: +Following the command, you can have several place holders which will be tqreplaced with the actual values when the actual program is run: %f - a single file name %F - a list of files; use for applications that can open several local files at once %u - a single URL @@ -213,7 +213,7 @@ Following the command, you can have several place holders which will be replaced <string>&Browse...</string> </property> <property name="whatsThis" stdset="0"> - <string>Click here to browse your file system in order to find the desired executable.</string> + <string>Click here to browse your file system in order to tqfind the desired executable.</string> </property> </widget> <widget class="QLabel" row="4" column="0" rowspan="1" colspan="2"> @@ -259,7 +259,7 @@ Following the command, you can have several place holders which will be replaced <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>53</width> <height>20</height> @@ -287,7 +287,7 @@ Following the command, you can have several place holders which will be replaced <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>53</width> <height>20</height> @@ -312,5 +312,5 @@ Following the command, you can have several place holders which will be replaced <include location="global" impldecl="in implementation">kurlrequester.h</include> <include location="global" impldecl="in implementation">klistview.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp index 0116123f1..b06e688ef 100644 --- a/kio/kfile/kpropertiesdialog.cpp +++ b/kio/kfile/kpropertiesdialog.cpp @@ -28,12 +28,12 @@ * * some FilePermissionsPropsPlugin-changes by * Henner Zeller <zeller@think.de> - * some layout management by + * some tqlayout management by * Bertrand Leconte <B.Leconte@mail.dotcom.fr> - * the rest of the layout management, bug fixes, adaptation to libkio, + * the rest of the tqlayout management, bug fixes, adaptation to libkio, * template feature by * David Faure <faure@kde.org> - * More layout, cleanups, and fixes by + * More tqlayout, cleanups, and fixes by * Preston Brown <pbrown@kde.org> * Plugin capability, cleanups and port to KDialogBase by * Simon Hausmann <hausmann@kde.org> @@ -203,7 +203,7 @@ KPropertiesDialog::KPropertiesDialog (KFileItemList _items, TQWidget* parent, const char* name, bool modal, bool autoShow) : KDialogBase (KDialogBase::Tabbed, - // TODO: replace <never used> with "Properties for 1 item". It's very confusing how it has to be translated otherwise + // TODO: tqreplace <never used> with "Properties for 1 item". It's very confusing how it has to be translated otherwise // (empty translation before the "\n" is not allowed by msgfmt...) _items.count()>1 ? i18n( "<never used>","Properties for %n Selected Items",_items.count()) : i18n( "Properties for %1" ).arg(KIO::decodeFileName(_items.first()->url().fileName())), @@ -516,7 +516,7 @@ void KPropertiesDialog::insertPages() if ( mimetype.isEmpty() ) return; - TQString query = TQString::fromLatin1( + TQString query = TQString::tqfromLatin1( "('KPropsDlg/Plugin' in ServiceTypes) and " "((not exist [X-KDE-Protocol]) or " " ([X-KDE-Protocol] == '%1' ) )" ).arg(item->url().protocol()); @@ -704,7 +704,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) d = new KFilePropsPluginPrivate; d->bMultiple = (properties->items().count() > 1); d->bIconChanged = false; - d->bKDesktopMode = (TQCString(qApp->name()) == "kdesktop"); // nasty heh? + d->bKDesktopMode = (TQCString(tqApp->name()) == "kdesktop"); // nasty heh? d->bDesktopFile = KDesktopPropsPlugin::supports(properties->items()); kdDebug(250) << "KFilePropsPlugin::KFilePropsPlugin bMultiple=" << d->bMultiple << endl; @@ -718,7 +718,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) kdDebug() << "url=" << url << " bDesktopFile=" << bDesktopFile << " isLocal=" << isLocal << " isReallyLocal=" << isReallyLocal << endl; mode_t mode = item->mode(); bool hasDirs = item->isDir() && !item->isLink(); - bool hasRoot = url.path() == TQString::fromLatin1("/"); + bool hasRoot = url.path() == TQString::tqfromLatin1("/"); TQString iconStr = KMimeType::iconForURL(url, mode); TQString directory = properties->kurl().directory(); TQString protocol = properties->kurl().protocol(); @@ -728,7 +728,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) KIO::filesize_t totalSize = item->size(hasTotalSize); TQString magicMimeComment; if ( isLocal ) { - KMimeType::Ptr magicMimeType = KMimeType::findByFileContent( url.path() ); + KMimeType::Ptr magicMimeType = KMimeType::tqfindByFileContent( url.path() ); if ( magicMimeType->name() != KMimeType::defaultMimeType() ) magicMimeComment = magicMimeType->comment(); } @@ -759,8 +759,8 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) { TQString path; if ( !m_bFromTemplate ) { - isTrash = ( properties->kurl().protocol().find( "trash", 0, false)==0 ); - if ( properties->kurl().protocol().find("device", 0, false)==0) + isTrash = ( properties->kurl().protocol().tqfind( "trash", 0, false)==0 ); + if ( properties->kurl().protocol().tqfind("device", 0, false)==0) isDevice = true; // Extract the full name, but without file: for local files if ( isReallyLocal ) @@ -826,12 +826,12 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) if ( !mimeComment.isNull() && (*it)->mimeComment() != mimeComment ) mimeComment = TQString::null; if ( isLocal && !magicMimeComment.isNull() ) { - KMimeType::Ptr magicMimeType = KMimeType::findByFileContent( url.path() ); + KMimeType::Ptr magicMimeType = KMimeType::tqfindByFileContent( url.path() ); if ( magicMimeType->comment() != magicMimeComment ) magicMimeComment = TQString::null; } - if ( url.path() == TQString::fromLatin1("/") ) + if ( url.path() == TQString::tqfromLatin1("/") ) hasRoot = true; if ( (*it)->isDir() && !(*it)->isLink() ) { @@ -859,7 +859,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) if ( !isDevice && !isTrash && (bDesktopFile || S_ISDIR(mode)) && !d->bMultiple /*not implemented for multiple*/ ) { KIconButton *iconButton = new KIconButton( d->m_frame ); - int bsize = 66 + 2 * iconButton->style().pixelMetric(TQStyle::PM_ButtonMargin); + int bsize = 66 + 2 * iconButton->style().tqpixelMetric(TQStyle::PM_ButtonMargin); iconButton->setFixedSize(bsize, bsize); iconButton->setIconSize(48); iconButton->setStrictIconSize(false); @@ -883,7 +883,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) this, TQT_SLOT( slotIconChanged() ) ); } else { TQLabel *iconLabel = new TQLabel( d->m_frame ); - int bsize = 66 + 2 * iconLabel->style().pixelMetric(TQStyle::PM_ButtonMargin); + int bsize = 66 + 2 * iconLabel->style().tqpixelMetric(TQStyle::PM_ButtonMargin); iconLabel->setFixedSize(bsize, bsize); iconLabel->setPixmap( KGlobal::iconLoader()->loadIcon( iconStr, KIcon::Desktop, 48) ); iconArea = iconLabel; @@ -907,12 +907,12 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) // Enhanced rename: Don't highlight the file extension. TQString pattern; - KServiceTypeFactory::self()->findFromPattern( filename, &pattern ); - if (!pattern.isEmpty() && pattern.at(0)=='*' && pattern.find('*',1)==-1) + KServiceTypeFactory::self()->tqfindFromPattern( filename, &pattern ); + if (!pattern.isEmpty() && pattern.at(0)=='*' && pattern.tqfind('*',1)==-1) d->m_lined->setSelection(0, filename.length()-pattern.stripWhiteSpace().length()+1); else { - int lastDot = filename.findRev('.'); + int lastDot = filename.tqfindRev('.'); if (lastDot > 0) d->m_lined->setSelection(0, lastDot); } @@ -942,7 +942,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) //TODO: wrap for win32 or mac? TQPushButton *button = new TQPushButton(box); - TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("configure")); + TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("configure")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); button->setIconSet( iconSet ); button->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); @@ -1074,7 +1074,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) grid->addMultiCellWidget(sep, curRow, curRow, 0, 2); ++curRow; - TQString mountPoint = KIO::findPathMountPoint( url.path() ); + TQString mountPoint = KIO::tqfindPathMountPoint( url.path() ); if (mountPoint != "/") { @@ -1127,7 +1127,7 @@ void KFilePropsPlugin::slotEditFileType() #ifdef Q_WS_X11 TQString mime; if ( d->mimeType == KMimeType::defaultMimeType() ) { - int pos = d->oldFileName.findRev( '.' ); + int pos = d->oldFileName.tqfindRev( '.' ); if ( pos != -1 ) mime = "*" + d->oldFileName.mid(pos); else @@ -1136,9 +1136,9 @@ void KFilePropsPlugin::slotEditFileType() else mime = d->mimeType; //TODO: wrap for win32 or mac? - TQString keditfiletype = TQString::fromLatin1("keditfiletype"); + TQString keditfiletype = TQString::tqfromLatin1("keditfiletype"); KRun::runCommand( keditfiletype - + " --parent " + TQString::number( (ulong)properties->topLevelWidget()->winId()) + + " --parent " + TQString::number( (ulong)properties->tqtopLevelWidget()->winId()) + " " + KProcess::quote(mime), keditfiletype, keditfiletype /*unused*/); #endif @@ -1234,7 +1234,7 @@ void KFilePropsPlugin::slotDirSizeFinished( KIO::Job * job ) KIO::filesize_t totalSize = static_cast<KDirSize*>(job)->totalSize(); KIO::filesize_t totalFiles = static_cast<KDirSize*>(job)->totalFiles(); KIO::filesize_t totalSubdirs = static_cast<KDirSize*>(job)->totalSubdirs(); - m_sizeLabel->setText( TQString::fromLatin1("%1 (%2)\n%3, %4") + m_sizeLabel->setText( TQString::tqfromLatin1("%1 (%2)\n%3, %4") .arg(KIO::convertSize(totalSize)) .arg(KGlobal::locale()->formatNumber(totalSize, 0)) .arg(i18n("1 file","%n files",totalFiles)) @@ -1270,7 +1270,7 @@ void KFilePropsPlugin::slotSizeDetermine() bool isLocal; KFileItem * item = properties->item(); KURL url = item->mostLocalURL( isLocal ); - TQString mountPoint = KIO::findPathMountPoint( url.path() ); + TQString mountPoint = KIO::tqfindPathMountPoint( url.path() ); KDiskFreeSp * job = new KDiskFreeSp; connect( job, TQT_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&, @@ -1364,7 +1364,7 @@ void KFilePropsPlugin::applyChanges() // wait for job TQWidget dummy(0,0,WType_Dialog|WShowModal); qt_enter_modal(&dummy); - qApp->enter_loop(); + tqApp->enter_loop(); qt_leave_modal(&dummy); return; } @@ -1384,7 +1384,7 @@ void KFilePropsPlugin::slotCopyFinished( KIO::Job * job ) if (job) { // allow apply() to return - qApp->exit_loop(); + tqApp->exit_loop(); if ( job->error() ) { job->showErrorDialog( d->m_frame ); @@ -1439,7 +1439,7 @@ void KFilePropsPlugin::applyIconChanges() if (S_ISDIR(properties->item()->mode())) { - path = url.path(1) + TQString::fromLatin1(".directory"); + path = url.path(1) + TQString::tqfromLatin1(".directory"); // don't call updateUrl because the other tabs (i.e. permissions) // apply to the directory, not the .directory file. } @@ -1563,7 +1563,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr TQString path = properties->kurl().path(-1); TQString fname = properties->kurl().fileName(); bool isLocal = properties->kurl().isLocalFile(); - bool isTrash = ( properties->kurl().protocol().find("trash", 0, false)==0 ); + bool isTrash = ( properties->kurl().protocol().tqfind("trash", 0, false)==0 ); bool IamRoot = (geteuid() == 0); KFileItem * item = properties->item(); @@ -1654,11 +1654,11 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr /* Group: Access Permissions */ gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Access Permissions"), d->m_frame ); - gb->layout()->setSpacing(KDialog::spacingHint()); - gb->layout()->setMargin(KDialog::marginHint()); + gb->tqlayout()->setSpacing(KDialog::spacingHint()); + gb->tqlayout()->setMargin(KDialog::marginHint()); box->addWidget (gb); - gl = new TQGridLayout (gb->layout(), 7, 2); + gl = new TQGridLayout (gb->tqlayout(), 7, 2); gl->setColStretch(1, 1); l = d->explanationLabel = new TQLabel( "", gb ); @@ -1723,11 +1723,11 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr /**** Group: Ownership ****/ gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Ownership"), d->m_frame ); - gb->layout()->setSpacing(KDialog::spacingHint()); - gb->layout()->setMargin(KDialog::marginHint()); + gb->tqlayout()->setSpacing(KDialog::spacingHint()); + gb->tqlayout()->setMargin(KDialog::marginHint()); box->addWidget (gb); - gl = new TQGridLayout (gb->layout(), 4, 3); + gl = new TQGridLayout (gb->tqlayout(), 4, 3); gl->addRowSpacing(0, 10); /*** Set Owner ***/ @@ -1753,7 +1753,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr kcom->setOrder(KCompletion::Sorted); setpwent(); for (i=0; ((user = getpwent()) != 0L) && (i < maxEntries); i++) - kcom->addItem(TQString::fromLatin1(user->pw_name)); + kcom->addItem(TQString::tqfromLatin1(user->pw_name)); endpwent(); usrEdit->setCompletionMode((i < maxEntries) ? KGlobalSettings::CompletionAuto : KGlobalSettings::CompletionNone); @@ -1781,7 +1781,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr for (i=0; ((ge = getgrent()) != 0L) && (i < maxEntries); i++) { if (IamRoot) - groupList += TQString::fromLatin1(ge->gr_name); + groupList += TQString::tqfromLatin1(ge->gr_name); else { /* pick the groups to which the user belongs */ @@ -1802,14 +1802,14 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr /* add the effective Group to the list .. */ ge = getgrgid (getegid()); if (ge) { - TQString name = TQString::fromLatin1(ge->gr_name); + TQString name = TQString::tqfromLatin1(ge->gr_name); if (name.isEmpty()) name.setNum(ge->gr_gid); - if (groupList.find(name) == groupList.end()) + if (groupList.tqfind(name) == groupList.end()) groupList += name; } - bool isMyGroup = groupList.contains(strGroup); + bool isMyGroup = groupList.tqcontains(strGroup); /* add the group the file currently belongs to .. * .. if its not there already @@ -1843,7 +1843,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr { grpCombo = new TQComboBox(gb, "combogrouplist"); grpCombo->insertStringList(groupList); - grpCombo->setCurrentItem(groupList.findIndex(strGroup)); + grpCombo->setCurrentItem(groupList.tqfindIndex(strGroup)); gl->addWidget(grpCombo, 2, 1); connect( grpCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SIGNAL( changed() ) ); @@ -1915,10 +1915,10 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions() { // Group: Access Permissions gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Access Permissions"), mainVBox ); - gb->layout()->setSpacing(KDialog::spacingHint()); - gb->layout()->setMargin(KDialog::marginHint()); + gb->tqlayout()->setSpacing(KDialog::spacingHint()); + gb->tqlayout()->setMargin(KDialog::marginHint()); - gl = new TQGridLayout (gb->layout(), 6, 6); + gl = new TQGridLayout (gb->tqlayout(), 6, 6); gl->addRowSpacing(0, 10); TQValueVector<TQWidget*> theNotSpecials; @@ -1966,7 +1966,7 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions() { TQWhatsThis::add(l, execWhatsThis); theNotSpecials.append( l ); // GJ: Add space between normal and special modes - TQSize size = l->sizeHint(); + TQSize size = l->tqsizeHint(); size.setWidth(size.width() + 15); l->setFixedSize(size); gl->addWidget (l, 1, 3); @@ -2368,7 +2368,7 @@ void KFilePermissionsPropsPlugin::updateAccessControls() { } } -// gets masks for files and dirs from the Access Control frame widgets +// gets tqmasks for files and dirs from the Access Control frame widgets void KFilePermissionsPropsPlugin::getPermissionMasks(mode_t &andFilePermissions, mode_t &andDirPermissions, mode_t &orFilePermissions, @@ -2520,7 +2520,7 @@ void KFilePermissionsPropsPlugin::applyChanges() // Wait for job TQWidget dummy(0,0,WType_Dialog|WShowModal); qt_enter_modal(&dummy); - qApp->enter_loop(); + tqApp->enter_loop(); qt_leave_modal(&dummy); } if (dirs.count() > 0) { @@ -2536,7 +2536,7 @@ void KFilePermissionsPropsPlugin::applyChanges() // Wait for job TQWidget dummy(0,0,WType_Dialog|WShowModal); qt_enter_modal(&dummy); - qApp->enter_loop(); + tqApp->enter_loop(); qt_leave_modal(&dummy); } } @@ -2547,7 +2547,7 @@ void KFilePermissionsPropsPlugin::slotChmodResult( KIO::Job * job ) if (job->error()) job->showErrorDialog( d->m_frame ); // allow apply() to return - qApp->exit_loop(); + tqApp->exit_loop(); } @@ -2571,15 +2571,15 @@ KURLPropsPlugin::KURLPropsPlugin( KPropertiesDialog *_props ) { d = new KURLPropsPluginPrivate; d->m_frame = properties->addPage(i18n("U&RL")); - TQVBoxLayout *layout = new TQVBoxLayout(d->m_frame, 0, KDialog::spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(d->m_frame, 0, KDialog::spacingHint()); TQLabel *l; l = new TQLabel( d->m_frame, "Label_1" ); l->setText( i18n("URL:") ); - layout->addWidget(l); + tqlayout->addWidget(l); URLEdit = new KURLRequester( d->m_frame, "URL Requester" ); - layout->addWidget(URLEdit); + tqlayout->addWidget(URLEdit); TQString path = properties->kurl().path(); @@ -2598,7 +2598,7 @@ KURLPropsPlugin::KURLPropsPlugin( KPropertiesDialog *_props ) connect( URLEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) ); - layout->addStretch (1); + tqlayout->addStretch (1); } KURLPropsPlugin::~KURLPropsPlugin() @@ -2639,7 +2639,7 @@ void KURLPropsPlugin::applyChanges() KSimpleConfig config( path ); config.setDesktopGroup(); - config.writeEntry( "Type", TQString::fromLatin1("Link")); + config.writeEntry( "Type", TQString::tqfromLatin1("Link")); config.writePathEntry( "URL", URLEdit->url() ); // Users can't create a Link .desktop file with a Name field, // but distributions can. Update the Name field in that case. @@ -2680,48 +2680,48 @@ KBindingPropsPlugin::KBindingPropsPlugin( KPropertiesDialog *_props ) : KPropsDl commentEdit = new KLineEdit( d->m_frame, "LineEdit_2" ); mimeEdit = new KLineEdit( d->m_frame, "LineEdit_3" ); - TQBoxLayout *mainlayout = new TQVBoxLayout(d->m_frame, 0, KDialog::spacingHint()); + TQBoxLayout *maintqlayout = new TQVBoxLayout(d->m_frame, 0, KDialog::spacingHint()); TQLabel* tmpQLabel; tmpQLabel = new TQLabel( d->m_frame, "Label_1" ); tmpQLabel->setText( i18n("Pattern ( example: *.html;*.htm )") ); - tmpQLabel->setMinimumSize(tmpQLabel->sizeHint()); - mainlayout->addWidget(tmpQLabel, 1); + tmpQLabel->setMinimumSize(tmpQLabel->tqsizeHint()); + maintqlayout->addWidget(tmpQLabel, 1); //patternEdit->setGeometry( 10, 40, 210, 30 ); //patternEdit->setText( "" ); patternEdit->setMaxLength( 512 ); - patternEdit->setMinimumSize( patternEdit->sizeHint() ); + patternEdit->setMinimumSize( patternEdit->tqsizeHint() ); patternEdit->setFixedHeight( fontHeight ); - mainlayout->addWidget(patternEdit, 1); + maintqlayout->addWidget(patternEdit, 1); tmpQLabel = new TQLabel( d->m_frame, "Label_2" ); tmpQLabel->setText( i18n("Mime Type") ); - tmpQLabel->setMinimumSize(tmpQLabel->sizeHint()); - mainlayout->addWidget(tmpQLabel, 1); + tmpQLabel->setMinimumSize(tmpQLabel->tqsizeHint()); + maintqlayout->addWidget(tmpQLabel, 1); //mimeEdit->setGeometry( 10, 160, 210, 30 ); mimeEdit->setMaxLength( 256 ); - mimeEdit->setMinimumSize( mimeEdit->sizeHint() ); + mimeEdit->setMinimumSize( mimeEdit->tqsizeHint() ); mimeEdit->setFixedHeight( fontHeight ); - mainlayout->addWidget(mimeEdit, 1); + maintqlayout->addWidget(mimeEdit, 1); tmpQLabel = new TQLabel( d->m_frame, "Label_3" ); tmpQLabel->setText( i18n("Comment") ); - tmpQLabel->setMinimumSize(tmpQLabel->sizeHint()); - mainlayout->addWidget(tmpQLabel, 1); + tmpQLabel->setMinimumSize(tmpQLabel->tqsizeHint()); + maintqlayout->addWidget(tmpQLabel, 1); //commentEdit->setGeometry( 10, 100, 210, 30 ); commentEdit->setMaxLength( 256 ); - commentEdit->setMinimumSize( commentEdit->sizeHint() ); + commentEdit->setMinimumSize( commentEdit->tqsizeHint() ); commentEdit->setFixedHeight( fontHeight ); - mainlayout->addWidget(commentEdit, 1); + maintqlayout->addWidget(commentEdit, 1); cbAutoEmbed = new TQCheckBox( i18n("Left click previews"), d->m_frame, "cbAutoEmbed" ); - mainlayout->addWidget(cbAutoEmbed, 1); + maintqlayout->addWidget(cbAutoEmbed, 1); - mainlayout->addStretch (10); - mainlayout->activate(); + maintqlayout->addStretch (10); + maintqlayout->activate(); TQFile f( _props->kurl().path() ); if ( !f.open( IO_ReadOnly ) ) @@ -2796,7 +2796,7 @@ void KBindingPropsPlugin::applyChanges() KSimpleConfig config( path ); config.setDesktopGroup(); - config.writeEntry( "Type", TQString::fromLatin1("MimeType") ); + config.writeEntry( "Type", TQString::tqfromLatin1("MimeType") ); config.writeEntry( "Patterns", patternEdit->text() ); config.writeEntry( "Comment", commentEdit->text() ); @@ -2852,60 +2852,60 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP if ((mountPoint != "-") && (mountPoint != "none") && !mountPoint.isEmpty() && device != "none") { - devices.append( device + TQString::fromLatin1(" (") - + mountPoint + TQString::fromLatin1(")") ); + devices.append( device + TQString::tqfromLatin1(" (") + + mountPoint + TQString::tqfromLatin1(")") ); m_devicelist.append(device); d->mountpointlist.append(mountPoint); } } - TQGridLayout *layout = new TQGridLayout( d->m_frame, 0, 2, 0, + TQGridLayout *tqlayout = new TQGridLayout( d->m_frame, 0, 2, 0, KDialog::spacingHint()); - layout->setColStretch(1, 1); + tqlayout->setColStretch(1, 1); TQLabel* label; label = new TQLabel( d->m_frame ); label->setText( devices.count() == 0 ? i18n("Device (/dev/fd0):") : // old style i18n("Device:") ); // new style (combobox) - layout->addWidget(label, 0, 0); + tqlayout->addWidget(label, 0, 0); device = new TQComboBox( true, d->m_frame, "ComboBox_device" ); device->insertStringList( devices ); - layout->addWidget(device, 0, 1); + tqlayout->addWidget(device, 0, 1); connect( device, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivated( int ) ) ); readonly = new TQCheckBox( d->m_frame, "CheckBox_readonly" ); readonly->setText( i18n("Read only") ); - layout->addWidget(readonly, 1, 1); + tqlayout->addWidget(readonly, 1, 1); label = new TQLabel( d->m_frame ); label->setText( i18n("File system:") ); - layout->addWidget(label, 2, 0); + tqlayout->addWidget(label, 2, 0); TQLabel *fileSystem = new TQLabel( d->m_frame ); - layout->addWidget(fileSystem, 2, 1); + tqlayout->addWidget(fileSystem, 2, 1); label = new TQLabel( d->m_frame ); label->setText( devices.count()==0 ? i18n("Mount point (/mnt/floppy):") : // old style i18n("Mount point:")); // new style (combobox) - layout->addWidget(label, 3, 0); + tqlayout->addWidget(label, 3, 0); mountpoint = new TQLabel( d->m_frame, "LineEdit_mountpoint" ); - layout->addWidget(mountpoint, 3, 1); + tqlayout->addWidget(mountpoint, 3, 1); // show disk free d->m_freeSpaceText = new TQLabel(i18n("Free disk space:"), d->m_frame ); - layout->addWidget(d->m_freeSpaceText, 4, 0); + tqlayout->addWidget(d->m_freeSpaceText, 4, 0); d->m_freeSpaceLabel = new TQLabel( d->m_frame ); - layout->addWidget( d->m_freeSpaceLabel, 4, 1 ); + tqlayout->addWidget( d->m_freeSpaceLabel, 4, 1 ); d->m_freeSpaceBar = new TQProgressBar( d->m_frame, "freeSpaceBar" ); - layout->addMultiCellWidget(d->m_freeSpaceBar, 5, 5, 0, 1); + tqlayout->addMultiCellWidget(d->m_freeSpaceBar, 5, 5, 0, 1); // we show it in the slot when we know the values d->m_freeSpaceText->hide(); @@ -2913,18 +2913,18 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP d->m_freeSpaceBar->hide(); KSeparator* sep = new KSeparator( KSeparator::HLine, d->m_frame); - layout->addMultiCellWidget(sep, 6, 6, 0, 1); + tqlayout->addMultiCellWidget(sep, 6, 6, 0, 1); unmounted = new KIconButton( d->m_frame ); - int bsize = 66 + 2 * unmounted->style().pixelMetric(TQStyle::PM_ButtonMargin); + int bsize = 66 + 2 * unmounted->style().tqpixelMetric(TQStyle::PM_ButtonMargin); unmounted->setFixedSize(bsize, bsize); unmounted->setIconType(KIcon::Desktop, KIcon::Device); - layout->addWidget(unmounted, 7, 0); + tqlayout->addWidget(unmounted, 7, 0); label = new TQLabel( i18n("Unmounted Icon"), d->m_frame ); - layout->addWidget(label, 7, 1); + tqlayout->addWidget(label, 7, 1); - layout->setRowStretch(8, 1); + tqlayout->setRowStretch(8, 1); TQString path( _props->kurl().path() ); @@ -2945,7 +2945,7 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP device->setEditText( deviceStr ); if ( !deviceStr.isEmpty() ) { // Set default options for this device (first matching entry) - int index = m_devicelist.findIndex(deviceStr); + int index = m_devicelist.tqfindIndex(deviceStr); if (index != -1) { //kdDebug(250) << "found it " << index << endl; @@ -3020,7 +3020,7 @@ void KDevicePropsPlugin::slotActivated( int index ) void KDevicePropsPlugin::slotDeviceChanged() { // Update mountpoint so that it matches the typed device - int index = m_devicelist.findIndex( device->currentText() ); + int index = m_devicelist.tqfindIndex( device->currentText() ); if ( index != -1 ) mountpoint->setText( d->mountpointlist[index] ); else @@ -3077,7 +3077,7 @@ void KDevicePropsPlugin::applyChanges() KSimpleConfig config( path ); config.setDesktopGroup(); - config.writeEntry( "Type", TQString::fromLatin1("FSDevice") ); + config.writeEntry( "Type", TQString::tqfromLatin1("FSDevice") ); config.writeEntry( "Dev", device->currentText() ); config.writeEntry( "MountPoint", mountpoint->text() ); @@ -3102,12 +3102,12 @@ KDesktopPropsPlugin::KDesktopPropsPlugin( KPropertiesDialog *_props ) : KPropsDlgPlugin( _props ) { TQFrame *frame = properties->addPage(i18n("&Application")); - TQVBoxLayout *mainlayout = new TQVBoxLayout( frame, 0, KDialog::spacingHint() ); + TQVBoxLayout *maintqlayout = new TQVBoxLayout( frame, 0, KDialog::spacingHint() ); w = new KPropertiesDesktopBase(frame); - mainlayout->addWidget(w); + maintqlayout->addWidget(w); - bool bKDesktopMode = (TQCString(qApp->name()) == "kdesktop"); // nasty heh? + bool bKDesktopMode = (TQCString(tqApp->name()) == "kdesktop"); // nasty heh? if (bKDesktopMode) { @@ -3255,11 +3255,11 @@ void KDesktopPropsPlugin::slotAddFiletype() TQString mimetype = (*it)->name(); if (mimetype == KMimeType::defaultMimeType()) continue; - int index = mimetype.find("/"); + int index = mimetype.tqfind("/"); TQString maj = mimetype.left(index); TQString min = mimetype.mid(index+1); - TQMapIterator<TQString,TQListViewItem*> mit = majorMap.find( maj ); + TQMapIterator<TQString,TQListViewItem*> mit = majorMap.tqfind( maj ); if ( mit == majorMap.end() ) { majorGroup = new TQListViewItem( mw->listView, maj ); majorGroup->setExpandable(true); @@ -3274,7 +3274,7 @@ void KDesktopPropsPlugin::slotAddFiletype() TQListViewItem *item = new TQListViewItem(majorGroup, min, (*it)->comment()); item->setPixmap(0, (*it)->pixmap(KIcon::Small, IconSize(KIcon::Small))); } - TQMapIterator<TQString,TQListViewItem*> mit = majorMap.find( "all" ); + TQMapIterator<TQString,TQListViewItem*> mit = majorMap.tqfind( "all" ); if ( mit != majorMap.end()) { mw->listView->setCurrentItem(mit.data()); @@ -3362,7 +3362,7 @@ void KDesktopPropsPlugin::applyChanges() KSimpleConfig config( path ); config.setDesktopGroup(); - config.writeEntry( "Type", TQString::fromLatin1("Application")); + config.writeEntry( "Type", TQString::tqfromLatin1("Application")); config.writeEntry( "Comment", w->commentEdit->text() ); config.writeEntry( "Comment", w->commentEdit->text(), true, false, true ); // for compat config.writeEntry( "GenericName", w->genNameEdit->text() ); @@ -3446,17 +3446,17 @@ void KDesktopPropsPlugin::slotAdvanced() // check to see if we use konsole if not do not add the nocloseonexit // because we don't know how to do this on other terminal applications - KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") ); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", - TQString::fromLatin1("konsole")); + TQString::tqfromLatin1("konsole")); bool terminalCloseBool = false; if (preferredTerminal == "konsole") { - terminalCloseBool = (m_terminalOptionStr.contains( "--noclose" ) > 0); + terminalCloseBool = (m_terminalOptionStr.tqcontains( "--noclose" ) > 0); w->terminalCloseCheck->setChecked(terminalCloseBool); - m_terminalOptionStr.replace( "--noclose", ""); + m_terminalOptionStr.tqreplace( "--noclose", ""); } else { @@ -3493,7 +3493,7 @@ void KDesktopPropsPlugin::slotAdvanced() int i, maxEntries = 1000; setpwent(); for (i=0; ((pw = getpwent()) != 0L) && (i < maxEntries); i++) - kcom->addItem(TQString::fromLatin1(pw->pw_name)); + kcom->addItem(TQString::tqfromLatin1(pw->pw_name)); endpwent(); if (i < maxEntries) { @@ -3594,22 +3594,22 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) { d = new KExecPropsPluginPrivate; d->m_frame = properties->addPage(i18n("E&xecute")); - TQVBoxLayout * mainlayout = new TQVBoxLayout( d->m_frame, 0, + TQVBoxLayout * maintqlayout = new TQVBoxLayout( d->m_frame, 0, KDialog::spacingHint()); - // Now the widgets in the top layout + // Now the widgets in the top tqlayout TQLabel* l; l = new TQLabel( i18n( "Comman&d:" ), d->m_frame ); - mainlayout->addWidget(l); + maintqlayout->addWidget(l); - TQHBoxLayout * hlayout; - hlayout = new TQHBoxLayout(KDialog::spacingHint()); - mainlayout->addLayout(hlayout); + TQHBoxLayout * htqlayout; + htqlayout = new TQHBoxLayout(KDialog::spacingHint()); + maintqlayout->addLayout(htqlayout); execEdit = new KLineEdit( d->m_frame ); TQWhatsThis::add(execEdit,i18n( - "Following the command, you can have several place holders which will be replaced " + "Following the command, you can have several place holders which will be tqreplaced " "with the actual values when the actual program is run:\n" "%f - a single file name\n" "%F - a list of files; use for applications that can open several local files at once\n" @@ -3620,22 +3620,22 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) "%i - the icon\n" "%m - the mini-icon\n" "%c - the caption")); - hlayout->addWidget(execEdit, 1); + htqlayout->addWidget(execEdit, 1); l->setBuddy( execEdit ); execBrowse = new TQPushButton( d->m_frame ); execBrowse->setText( i18n("&Browse...") ); - hlayout->addWidget(execBrowse); + htqlayout->addWidget(execBrowse); // The groupbox about swallowing TQGroupBox* tmpQGroupBox; tmpQGroupBox = new TQGroupBox( i18n("Panel Embedding"), d->m_frame ); tmpQGroupBox->setColumnLayout( 0, Qt::Horizontal ); - mainlayout->addWidget(tmpQGroupBox); + maintqlayout->addWidget(tmpQGroupBox); - TQGridLayout *grid = new TQGridLayout(tmpQGroupBox->layout(), 2, 2); + TQGridLayout *grid = new TQGridLayout(tmpQGroupBox->tqlayout(), 2, 2); grid->setSpacing( KDialog::spacingHint() ); grid->setColStretch(1, 1); @@ -3660,9 +3660,9 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) tmpQGroupBox = new TQGroupBox( d->m_frame ); tmpQGroupBox->setColumnLayout( 0, Qt::Horizontal ); - mainlayout->addWidget(tmpQGroupBox); + maintqlayout->addWidget(tmpQGroupBox); - grid = new TQGridLayout(tmpQGroupBox->layout(), 3, 2); + grid = new TQGridLayout(tmpQGroupBox->tqlayout(), 3, 2); grid->setSpacing( KDialog::spacingHint() ); grid->setColStretch(1, 1); @@ -3672,9 +3672,9 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) // check to see if we use konsole if not do not add the nocloseonexit // because we don't know how to do this on other terminal applications - KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") ); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", - TQString::fromLatin1("konsole")); + TQString::tqfromLatin1("konsole")); int posOptions = 1; d->nocloseonexitCheck = 0L; @@ -3699,9 +3699,9 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) tmpQGroupBox = new TQGroupBox( d->m_frame ); tmpQGroupBox->setColumnLayout( 0, Qt::Horizontal ); - mainlayout->addWidget(tmpQGroupBox); + maintqlayout->addWidget(tmpQGroupBox); - grid = new TQGridLayout(tmpQGroupBox->layout(), 2, 2); + grid = new TQGridLayout(tmpQGroupBox->tqlayout(), 2, 2); grid->setSpacing(KDialog::spacingHint()); grid->setColStretch(1, 1); @@ -3717,7 +3717,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) suidLabel->setBuddy( suidEdit ); - mainlayout->addStretch(1); + maintqlayout->addStretch(1); // now populate the page TQString path = _props->kurl().path(); @@ -3747,8 +3747,8 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) if ( d->nocloseonexitCheck ) { - d->nocloseonexitCheck->setChecked( (termOptionsStr.contains( "--noclose" ) > 0) ); - termOptionsStr.replace( "--noclose", ""); + d->nocloseonexitCheck->setChecked( (termOptionsStr.tqcontains( "--noclose" ) > 0) ); + termOptionsStr.tqreplace( "--noclose", ""); } if ( !termOptionsStr.isNull() ) terminalEdit->setText( termOptionsStr ); @@ -3767,7 +3767,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) int i, maxEntries = 1000; setpwent(); for (i=0; ((pw = getpwent()) != 0L) && (i < maxEntries); i++) - kcom->addItem(TQString::fromLatin1(pw->pw_name)); + kcom->addItem(TQString::tqfromLatin1(pw->pw_name)); endpwent(); if (i < maxEntries) { @@ -3854,7 +3854,7 @@ void KExecPropsPlugin::applyChanges() KSimpleConfig config( path ); config.setDesktopGroup(); - config.writeEntry( "Type", TQString::fromLatin1("Application")); + config.writeEntry( "Type", TQString::tqfromLatin1("Application")); config.writePathEntry( "Exec", execEdit->text() ); config.writePathEntry( "SwallowExec", swallowExecEdit->text() ); config.writeEntry( "SwallowTitle", swallowTitleEdit->text() ); @@ -3862,7 +3862,7 @@ void KExecPropsPlugin::applyChanges() TQString temp = terminalEdit->text(); if (d->nocloseonexitCheck ) if ( d->nocloseonexitCheck->isChecked() ) - temp += TQString::fromLatin1("--noclose "); + temp += TQString::tqfromLatin1("--noclose "); temp = temp.stripWhiteSpace(); config.writeEntry( "TerminalOptions", temp ); config.writeEntry( "X-KDE-SubstituteUID", suidCheck->isChecked() ); @@ -3892,7 +3892,7 @@ class KApplicationPropsPlugin::KApplicationPropsPluginPrivate public: KApplicationPropsPluginPrivate() { - m_kdesktopMode = TQCString(qApp->name()) == "kdesktop"; // nasty heh? + m_kdesktopMode = TQCString(tqApp->name()) == "kdesktop"; // nasty heh? } ~KApplicationPropsPluginPrivate() { @@ -3907,7 +3907,7 @@ KApplicationPropsPlugin::KApplicationPropsPlugin( KPropertiesDialog *_props ) { d = new KApplicationPropsPluginPrivate; d->m_frame = properties->addPage(i18n("&Application")); - TQVBoxLayout *toplayout = new TQVBoxLayout( d->m_frame, 0, KDialog::spacingHint()); + TQVBoxLayout *toptqlayout = new TQVBoxLayout( d->m_frame, 0, KDialog::spacingHint()); TQIconSet iconSet; TQPixmap pixMap; @@ -3931,7 +3931,7 @@ KApplicationPropsPlugin::KApplicationPropsPlugin( KPropertiesDialog *_props ) TQGridLayout *grid = new TQGridLayout(2, 2); grid->setColStretch(1, 1); - toplayout->addLayout(grid); + toptqlayout->addLayout(grid); if ( d->m_kdesktopMode ) { @@ -3960,14 +3960,14 @@ KApplicationPropsPlugin::KApplicationPropsPlugin( KPropertiesDialog *_props ) grid->addWidget(commentEdit, 2, 1); l = new TQLabel(i18n("File types:"), d->m_frame); - toplayout->addWidget(l, 0, AlignLeft); + toptqlayout->addWidget(l, 0, AlignLeft); grid = new TQGridLayout(4, 3); grid->setColStretch(0, 1); grid->setColStretch(2, 1); grid->setRowStretch( 0, 1 ); grid->setRowStretch( 3, 1 ); - toplayout->addLayout(grid, 2); + toptqlayout->addLayout(grid, 2); extensionsList = new TQListBox( d->m_frame ); extensionsList->setSelectionMode( TQListBox::Extended ); @@ -4097,7 +4097,7 @@ void KApplicationPropsPlugin::applyChanges() KSimpleConfig config( path ); config.setDesktopGroup(); - config.writeEntry( "Type", TQString::fromLatin1("Application")); + config.writeEntry( "Type", TQString::tqfromLatin1("Application")); config.writeEntry( "Comment", commentEdit->text() ); config.writeEntry( "Comment", commentEdit->text(), true, false, true ); // for compat config.writeEntry( "GenericName", genNameEdit->text() ); diff --git a/kio/kfile/kpropertiesdialog.h b/kio/kfile/kpropertiesdialog.h index dc6a621f9..4c734b13b 100644 --- a/kio/kfile/kpropertiesdialog.h +++ b/kio/kfile/kpropertiesdialog.h @@ -434,7 +434,7 @@ private: * You can also include X-KDE-Protocol=file if you want that plugin * to be loaded only for local files, for instance. */ -class KIO_EXPORT KPropsDlgPlugin : public QObject +class KIO_EXPORT KPropsDlgPlugin : public TQObject { Q_OBJECT public: @@ -819,7 +819,7 @@ private: * * Such files are used to represent a program in kicker and konqueror. * @internal - * @deprecated replaced with KDesktopPropsPlugin + * @deprecated tqreplaced with KDesktopPropsPlugin */ /// Remove in KDE4 class KIO_EXPORT_DEPRECATED KExecPropsPlugin : public KPropsDlgPlugin @@ -875,7 +875,7 @@ private: * * Such files are used to represent a program in kicker and konqueror. * @internal - * @deprecated replaced with KDesktopPropsPlugin + * @deprecated tqreplaced with KDesktopPropsPlugin */ /// Remove in KDE4 class KIO_EXPORT_DEPRECATED KApplicationPropsPlugin : public KPropsDlgPlugin diff --git a/kio/kfile/kpropertiesmimetypebase.ui b/kio/kfile/kpropertiesmimetypebase.ui index 0223f22a6..d67d8eaaf 100644 --- a/kio/kfile/kpropertiesmimetypebase.ui +++ b/kio/kfile/kpropertiesmimetypebase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>widget2</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -66,5 +66,5 @@ <includes> <include location="global" impldecl="in implementation">klistview.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kio/kfile/krecentdirs.cpp b/kio/kfile/krecentdirs.cpp index 22b4cd477..85cdebb02 100644 --- a/kio/kfile/krecentdirs.cpp +++ b/kio/kfile/krecentdirs.cpp @@ -52,13 +52,13 @@ static KConfig *recentdirs_readList(TQString &key, TQStringList &result, bool re if (key[1] == ':') { key = key.mid(2); - config = new KSimpleConfig(TQString::fromLatin1("krecentdirsrc"), readOnly); + config = new KSimpleConfig(TQString::tqfromLatin1("krecentdirsrc"), readOnly); } else { key = key.mid(1); config = KGlobal::config(); - config->setGroup(TQString::fromLatin1("Recent Dirs")); + config->setGroup(TQString::tqfromLatin1("Recent Dirs")); } result=config->readPathListEntry(key); diff --git a/kio/kfile/krecentdocument.cpp b/kio/kfile/krecentdocument.cpp index 69fd63df5..b54bdf325 100644 --- a/kio/kfile/krecentdocument.cpp +++ b/kio/kfile/krecentdocument.cpp @@ -45,7 +45,7 @@ TQString KRecentDocument::recentDocumentDirectory() { // need to change this path, not sure where - return locateLocal("data", TQString::fromLatin1("RecentDocuments/")); + return locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")); } TQStringList KRecentDocument::recentDocuments() @@ -74,7 +74,7 @@ TQStringList KRecentDocument::recentDocuments() void KRecentDocument::add(const KURL& url) { - KRecentDocument::add(url, qApp->argv()[0]); // ### argv[0] might not match the service filename! + KRecentDocument::add(url, tqApp->argv()[0]); // ### argv[0] might not match the service filename! } void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) @@ -83,14 +83,14 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) return; TQString openStr = url.url(); - openStr.replace( TQRegExp("\\$"), "$$" ); // Desktop files with type "Link" are $-variable expanded + openStr.tqreplace( TQRegExp("\\$"), "$$" ); // Desktop files with type "Link" are $-variable expanded kdDebug(250) << "KRecentDocument::add for " << openStr << endl; KConfig *config = KGlobal::config(); TQString oldGrp = config->group(); - config->setGroup(TQString::fromLatin1("RecentDocuments")); - bool useRecent = config->readBoolEntry(TQString::fromLatin1("UseRecent"), true); - int maxEntries = config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10); + config->setGroup(TQString::tqfromLatin1("RecentDocuments")); + bool useRecent = config->readBoolEntry(TQString::tqfromLatin1("UseRecent"), true); + int maxEntries = config->readNumEntry(TQString::tqfromLatin1("MaxEntries"), 10); config->setGroup(oldGrp); if(!useRecent) @@ -100,7 +100,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) TQString dStr = path + url.fileName(); - TQString ddesktop = dStr + TQString::fromLatin1(".desktop"); + TQString ddesktop = dStr + TQString::tqfromLatin1(".desktop"); int i=1; // check for duplicates @@ -108,7 +108,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) // see if it points to the same file and application KSimpleConfig tmp(ddesktop); tmp.setDesktopGroup(); - if(tmp.readEntry(TQString::fromLatin1("X-KDE-LastOpenedWith")) + if(tmp.readEntry(TQString::tqfromLatin1("X-KDE-LastOpenedWith")) == desktopEntryName) { utime(TQFile::encodeName(ddesktop), NULL); @@ -118,7 +118,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) ++i; if ( i > maxEntries ) break; - ddesktop = dStr + TQString::fromLatin1("[%1].desktop").arg(i); + ddesktop = dStr + TQString::tqfromLatin1("[%1].desktop").arg(i); } TQDir dir(path); @@ -129,7 +129,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) TQStringList::Iterator it; it = list.begin(); while(i > maxEntries-1){ - TQFile::remove(dir.absPath() + TQString::fromLatin1("/") + (*it)); + TQFile::remove(dir.absPath() + TQString::tqfromLatin1("/") + (*it)); --i, ++it; } } @@ -137,15 +137,15 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) // create the applnk KSimpleConfig conf(ddesktop); conf.setDesktopGroup(); - conf.writeEntry( TQString::fromLatin1("Type"), TQString::fromLatin1("Link") ); - conf.writePathEntry( TQString::fromLatin1("URL"), openStr ); + conf.writeEntry( TQString::tqfromLatin1("Type"), TQString::tqfromLatin1("Link") ); + conf.writePathEntry( TQString::tqfromLatin1("URL"), openStr ); // If you change the line below, change the test in the above loop - conf.writeEntry( TQString::fromLatin1("X-KDE-LastOpenedWith"), desktopEntryName ); + conf.writeEntry( TQString::tqfromLatin1("X-KDE-LastOpenedWith"), desktopEntryName ); TQString name = url.fileName(); if (name.isEmpty()) name = openStr; - conf.writeEntry( TQString::fromLatin1("Name"), name ); - conf.writeEntry( TQString::fromLatin1("Icon"), KMimeType::iconForURL( url ) ); + conf.writeEntry( TQString::tqfromLatin1("Name"), name ); + conf.writeEntry( TQString::tqfromLatin1("Icon"), KMimeType::iconForURL( url ) ); } void KRecentDocument::add(const TQString &openStr, bool isUrl) @@ -170,8 +170,8 @@ void KRecentDocument::clear() int KRecentDocument::maximumItems() { KConfig *config = KGlobal::config(); - KConfigGroupSaver sa(config, TQString::fromLatin1("RecentDocuments")); - return config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10); + KConfigGroupSaver sa(config, TQString::tqfromLatin1("RecentDocuments")); + return config->readNumEntry(TQString::tqfromLatin1("MaxEntries"), 10); } diff --git a/kio/kfile/kurlbar.cpp b/kio/kfile/kurlbar.cpp index d1a9de4ea..2d6edc0b9 100644 --- a/kio/kfile/kurlbar.cpp +++ b/kio/kfile/kurlbar.cpp @@ -64,7 +64,7 @@ protected: if ( item ) { TQString text = static_cast<KURLBarItem*>( item )->toolTip(); if ( !text.isEmpty() ) - tip( m_view->itemRect( item ), text ); + tip( m_view->tqitemRect( item ), text ); } } @@ -188,11 +188,11 @@ void KURLBarItem::paint( TQPainter *p ) if ( isCurrent() || isSelected() ) { int h = height( box ); - TQBrush brush = box->colorGroup().brush( TQColorGroup::Highlight ); + TQBrush brush = box->tqcolorGroup().brush( TQColorGroup::Highlight ); p->fillRect( 0, 0, w, h, brush ); TQPen pen = p->pen(); TQPen oldPen = pen; - pen.setColor( box->colorGroup().mid() ); + pen.setColor( box->tqcolorGroup().mid() ); p->setPen( pen ); p->drawPoint( 0, 0 ); @@ -225,10 +225,10 @@ void KURLBarItem::paint( TQPainter *p ) int xPos = pm->width() + margin + 2; if ( isCurrent() || isSelected() ) { - p->setPen( box->colorGroup().highlight().dark(115) ); + p->setPen( box->tqcolorGroup().highlight().dark(115) ); p->drawText( xPos + ( TQApplication::reverseLayout() ? -1 : 1), yPos + 1, visibleText ); - p->setPen( box->colorGroup().highlightedText() ); + p->setPen( box->tqcolorGroup().highlightedText() ); } p->drawText( xPos, yPos, visibleText ); @@ -257,10 +257,10 @@ void KURLBarItem::paint( TQPainter *p ) x = QMAX( x, margin ); if ( isCurrent() || isSelected() ) { - p->setPen( box->colorGroup().highlight().dark(115) ); + p->setPen( box->tqcolorGroup().highlight().dark(115) ); p->drawText( x + ( TQApplication::reverseLayout() ? -1 : 1), y + 1, visibleText ); - p->setPen( box->colorGroup().highlightedText() ); + p->setPen( box->tqcolorGroup().highlightedText() ); } p->drawText( x, y, visibleText ); @@ -268,7 +268,7 @@ void KURLBarItem::paint( TQPainter *p ) } } -TQSize KURLBarItem::sizeHint() const +TQSize KURLBarItem::tqsizeHint() const { int wmin = 0; int hmin = 0; @@ -284,9 +284,9 @@ TQSize KURLBarItem::sizeHint() const } if ( lb->isVertical() ) - wmin = QMIN( wmin, lb->viewport()->sizeHint().width() ); + wmin = QMIN( wmin, lb->viewport()->tqsizeHint().width() ); else - hmin = QMIN( hmin, lb->viewport()->sizeHint().height() ); + hmin = QMIN( hmin, lb->viewport()->tqsizeHint().height() ); return TQSize( wmin, hmin ); } @@ -294,17 +294,17 @@ TQSize KURLBarItem::sizeHint() const int KURLBarItem::width( const TQListBox *lb ) const { if ( static_cast<const KURLBarListBox *>( lb )->isVertical() ) - return QMAX( sizeHint().width(), lb->viewport()->width() ); + return QMAX( tqsizeHint().width(), lb->viewport()->width() ); else - return sizeHint().width(); + return tqsizeHint().width(); } int KURLBarItem::height( const TQListBox *lb ) const { if ( static_cast<const KURLBarListBox *>( lb )->isVertical() ) - return sizeHint().height(); + return tqsizeHint().height(); else - return QMAX( sizeHint().height(), lb->viewport()->height() ); + return QMAX( tqsizeHint().height(), lb->viewport()->height() ); } bool KURLBarItem::isPersistent() const @@ -341,7 +341,7 @@ KURLBar::KURLBar( bool useGlobalItems, TQWidget *parent, const char *name, WFlag d = new KURLBarPrivate(); setListBox( 0L ); - setSizePolicy( TQSizePolicy( isVertical() ? + tqsetSizePolicy( TQSizePolicy( isVertical() ? TQSizePolicy::Maximum : TQSizePolicy::Preferred, isVertical() ? @@ -378,7 +378,7 @@ KURLBarItem * KURLBar::insertDynamicItem(const KURL& url, const TQString& descri void KURLBar::setOrientation( Qt::Orientation orient ) { m_listBox->setOrientation( orient ); - setSizePolicy( TQSizePolicy( isVertical() ? + tqsetSizePolicy( TQSizePolicy( isVertical() ? TQSizePolicy::Maximum : TQSizePolicy::Preferred, isVertical() ? @@ -401,7 +401,7 @@ void KURLBar::setListBox( KURLBarListBox *view ) } else { m_listBox = view; - if ( m_listBox->parentWidget() != this ) + if ( m_listBox->tqparentWidget() != this ) m_listBox->reparent( this, TQPoint(0,0) ); m_listBox->resize( width(), height() ); } @@ -435,7 +435,7 @@ void KURLBar::setIconSize( int size ) item = static_cast<KURLBarItem*>( item->next() ); } - resize( sizeHint() ); + resize( tqsizeHint() ); updateGeometry(); } @@ -466,14 +466,14 @@ void KURLBar::paletteChange( const TQPalette & ) setPalette( pal ); } -TQSize KURLBar::sizeHint() const +TQSize KURLBar::tqsizeHint() const { - return m_listBox->sizeHint(); + return m_listBox->tqsizeHint(); #if 0 // this code causes vertical and or horizontal scrollbars appearing // depending on the text, font, moonphase and earth rotation. Just using - // m_listBox->sizeHint() fixes this (although the widget can then be + // m_listBox->tqsizeHint() fixes this (although the widget can then be // resized to a smaller size so that scrollbars appear). int w = 0; int h = 0; @@ -484,7 +484,7 @@ TQSize KURLBar::sizeHint() const item; item = static_cast<KURLBarItem*>( item->next() ) ) { - TQSize sh = item->sizeHint(); + TQSize sh = item->tqsizeHint(); if ( vertical ) { w = QMAX( w, sh.width() ); @@ -508,9 +508,9 @@ TQSize KURLBar::sizeHint() const #endif } -TQSize KURLBar::minimumSizeHint() const +TQSize KURLBar::tqminimumSizeHint() const { - TQSize s = sizeHint(); // ### + TQSize s = tqsizeHint(); // ### int w = s.width() + m_listBox->verticalScrollBar()->width(); int h = s.height() + m_listBox->horizontalScrollBar()->height(); return TQSize( w, h ); @@ -844,7 +844,7 @@ KURLBarListBox::~KURLBarListBox() void KURLBarListBox::paintEvent( TQPaintEvent* ) { TQPainter p(this); - p.setPen( colorGroup().mid() ); + p.setPen( tqcolorGroup().mid() ); p.drawRect( 0, 0, width(), height() ); } @@ -980,7 +980,7 @@ KURLBarItemDialog::KURLBarItemDialog( bool allowGlobal, const KURL& url, if ( KGlobal::instance()->aboutData() ) appName = KGlobal::instance()->aboutData()->programName(); if ( appName.isEmpty() ) - appName = TQString::fromLatin1( KGlobal::instance()->instanceName() ); + appName = TQString::tqfromLatin1( KGlobal::instance()->instanceName() ); m_appLocal = new TQCheckBox( i18n("&Only show when using this application (%1)").arg( appName ), box ); m_appLocal->setChecked( appLocal ); TQWhatsThis::add( m_appLocal, diff --git a/kio/kfile/kurlbar.h b/kio/kfile/kurlbar.h index 8da43ff15..8f247623b 100644 --- a/kio/kfile/kurlbar.h +++ b/kio/kfile/kurlbar.h @@ -109,7 +109,7 @@ public: * returns the preferred size of this item * @since 3.1 */ - TQSize sizeHint() const; + TQSize tqsizeHint() const; /** * returns the width of this item. @@ -319,12 +319,12 @@ public: * @returns a proper sizehint, depending on the orientation and the number * of items available. */ - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; /** * @returns a proper minimum size (reimplemented) */ - virtual TQSize minimumSizeHint() const; + virtual TQSize tqminimumSizeHint() const; /** * Call this method to read a saved configuration from @p config, diff --git a/kio/kfile/kurlcombobox.cpp b/kio/kfile/kurlcombobox.cpp index 72c7cbd07..f7bf58bc0 100644 --- a/kio/kfile/kurlcombobox.cpp +++ b/kio/kfile/kurlcombobox.cpp @@ -31,7 +31,7 @@ class KURLComboBox::KURLComboBoxPrivate { public: KURLComboBoxPrivate() { - dirpix = SmallIcon(TQString::fromLatin1("folder")); + dirpix = SmallIcon(TQString::tqfromLatin1("folder")); } TQPixmap dirpix; @@ -70,9 +70,9 @@ void KURLComboBox::init( Mode mode ) defaultList.setAutoDelete( true ); setInsertionPolicy( NoInsertion ); setTrapReturnKey( true ); - setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); - opendirPix = SmallIcon(TQString::fromLatin1("folder_open")); + opendirPix = SmallIcon(TQString::tqfromLatin1("folder_open")); connect( this, TQT_SIGNAL( activated( int )), TQT_SLOT( slotActivated( int ))); } @@ -152,7 +152,7 @@ void KURLComboBox::setURLs( TQStringList urls, OverLoadResolving remove ) // kill duplicates TQString text; while ( it != urls.end() ) { - while ( urls.contains( *it ) > 1 ) { + while ( urls.tqcontains( *it ) > 1 ) { it = urls.remove( it ); continue; } diff --git a/kio/kfile/kurlcombobox.h b/kio/kfile/kurlcombobox.h index d65cd91f5..60db16dce 100644 --- a/kio/kfile/kurlcombobox.h +++ b/kio/kfile/kurlcombobox.h @@ -83,7 +83,7 @@ public: /** * Sets the current url. This combo handles exactly one url additionally * to the default items and those set via setURLs(). So you can call - * setURL() as often as you want, it will always replace the previous one + * setURL() as often as you want, it will always tqreplace the previous one * set via setURL(). * If @p url is already in the combo, the last item will stay there * and the existing item becomes the current item. @@ -98,7 +98,7 @@ public: * Inserts @p urls into the combobox below the "default urls" (see * addDefaultURL). * - * If the list of urls contains more items than maxItems, the first items + * If the list of urls tqcontains more items than maxItems, the first items * will be stripped. */ void setURLs( TQStringList urls ); @@ -107,13 +107,13 @@ public: * Inserts @p urls into the combobox below the "default urls" (see * addDefaultURL). * - * If the list of urls contains more items than maxItems, the @p remove + * If the list of urls tqcontains more items than maxItems, the @p remove * parameter determines whether the first or last items will be stripped. */ void setURLs( TQStringList urls, OverLoadResolving remove ); /** - * @returns a list of all urls currently handled. The list contains at most + * @returns a list of all urls currently handled. The list tqcontains at most * maxItems() items. * Use this to save the list of urls in a config-file and reinsert them * via setURLs() next time. diff --git a/kio/kfile/kurlrequester.cpp b/kio/kfile/kurlrequester.cpp index ae8f5b623..aa102548a 100644 --- a/kio/kfile/kurlrequester.cpp +++ b/kio/kfile/kurlrequester.cpp @@ -132,7 +132,7 @@ public: } /** - * replaces ~user or $FOO, if necessary + * tqreplaces ~user or $FOO, if necessary */ TQString url() { TQString txt = combo ? combo->currentText() : edit->text(); @@ -143,7 +143,7 @@ public: comp = dynamic_cast<KURLCompletion*>(edit->completionObject()); if ( comp ) - return comp->replacedPath( txt ); + return comp->tqreplacedPath( txt ); else return txt; } @@ -206,7 +206,7 @@ void KURLRequester::init() d->edit = new KLineEdit( this, "line edit" ); myButton = new KURLDragPushButton( this, "kfile button"); - TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("fileopen")); + TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("fileopen")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); myButton->setIconSet( iconSet ); myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); @@ -340,7 +340,7 @@ TQString KURLRequester::filter( ) const KFileDialog * KURLRequester::fileDialog() const { if ( !myFileDialog ) { - TQWidget *p = parentWidget(); + TQWidget *p = tqparentWidget(); myFileDialog = new KFileDialog( TQString::null, d->fileDialogFilter, p, "file dialog", true ); @@ -402,7 +402,7 @@ KPushButton * KURLRequester::button() const KEditListBox::CustomEditor KURLRequester::customEditor() { - setSizePolicy(TQSizePolicy( TQSizePolicy::Preferred, + tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed)); KLineEdit *edit = d->edit; diff --git a/kio/kfile/kurlrequester.h b/kio/kfile/kurlrequester.h index 1bdbeee3e..7322d309b 100644 --- a/kio/kfile/kurlrequester.h +++ b/kio/kfile/kurlrequester.h @@ -76,7 +76,7 @@ public: /** * Special constructor, which creates a KURLRequester widget with a custom * edit-widget. The edit-widget can be either a KComboBox or a KLineEdit - * (or inherited thereof). Note: for geometry management reasons, the + * (or inherited thereof). Note: for tqgeometry management reasons, the * edit-widget is reparented to have the KURLRequester as parent. */ KURLRequester( TQWidget *editWidget, TQWidget *parent, const char *name=0 ); @@ -218,7 +218,7 @@ signals: // forwards from LineEdit /** * Emitted when the text in the lineedit changes. - * The parameter contains the contents of the lineedit. + * The parameter tqcontains the contents of the lineedit. * @since 3.1 */ void textChanged( const TQString& ); @@ -230,7 +230,7 @@ signals: /** * Emitted when return or enter was pressed in the lineedit. - * The parameter contains the contents of the lineedit. + * The parameter tqcontains the contents of the lineedit. */ void returnPressed( const TQString& ); @@ -249,7 +249,7 @@ signals: /** * Emitted when the user changed the URL via the file dialog. - * The parameter contains the contents of the lineedit. + * The parameter tqcontains the contents of the lineedit. * // TODO KDE4: Use KURL instead */ void urlSelected( const TQString& ); diff --git a/kio/kfile/kurlrequesterdlg.cpp b/kio/kfile/kurlrequesterdlg.cpp index 19409afdc..defa09264 100644 --- a/kio/kfile/kurlrequesterdlg.cpp +++ b/kio/kfile/kurlrequesterdlg.cpp @@ -67,7 +67,7 @@ void KURLRequesterDlg::initDialog(const TQString &text,const TQString &urlName) topLayout->addWidget( label ); urlRequester_ = new KURLRequester( urlName, plainPage(), "urlRequester" ); - urlRequester_->setMinimumWidth( urlRequester_->sizeHint().width() * 3 ); + urlRequester_->setMinimumWidth( urlRequester_->tqsizeHint().width() * 3 ); topLayout->addWidget( urlRequester_ ); urlRequester_->setFocus(); connect( urlRequester_->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), diff --git a/kio/kfile/tests/kdirselectdialogtest.cpp b/kio/kfile/tests/kdirselectdialogtest.cpp index 47fcd02ca..c66ed3ff2 100644 --- a/kio/kfile/tests/kdirselectdialogtest.cpp +++ b/kio/kfile/tests/kdirselectdialogtest.cpp @@ -10,7 +10,7 @@ int main( int argc, char **argv ) KURL u = KDirSelectDialog::selectDirectory( (argc >= 1) ? argv[1] : TQString::null ); if ( u.isValid() ) KMessageBox::information( 0L, - TQString::fromLatin1("You selected the url: %1") + TQString::tqfromLatin1("You selected the url: %1") .arg( u.prettyURL() ), "Selected URL" ); return 0; diff --git a/kio/kfile/tests/kfdtest.cpp b/kio/kfile/tests/kfdtest.cpp index 25e2da949..43dbb4fd0 100644 --- a/kio/kfile/tests/kfdtest.cpp +++ b/kio/kfile/tests/kfdtest.cpp @@ -25,10 +25,10 @@ void KFDTest::doit() if ( dlg->exec() == KDialog::Accepted ) { - KMessageBox::information(0, TQString::fromLatin1("You selected the file: %1").arg( dlg->selectedURL().prettyURL() )); + KMessageBox::information(0, TQString::tqfromLatin1("You selected the file: %1").arg( dlg->selectedURL().prettyURL() )); } -// qApp->quit(); +// tqApp->quit(); } #include "kfdtest.moc" diff --git a/kio/kfile/tests/kfdtest.h b/kio/kfile/tests/kfdtest.h index 3f980bc94..6c59550b8 100644 --- a/kio/kfile/tests/kfdtest.h +++ b/kio/kfile/tests/kfdtest.h @@ -10,7 +10,7 @@ #include <tqobject.h> -class KFDTest : public QObject +class KFDTest : public TQObject { Q_OBJECT diff --git a/kio/kfile/tests/kfiletreeviewtest.cpp b/kio/kfile/tests/kfiletreeviewtest.cpp index 5c520dd5d..bad100809 100644 --- a/kio/kfile/tests/kfiletreeviewtest.cpp +++ b/kio/kfile/tests/kfiletreeviewtest.cpp @@ -148,7 +148,7 @@ int main(int argc, char **argv) { for( int i = 1; i < argc; i++ ) { - argv1 = TQString::fromLatin1(argv[i]); + argv1 = TQString::tqfromLatin1(argv[i]); kdDebug() << "Opening " << argv1 << endl; if( argv1 == "-d" ) tf->setDirOnly(); diff --git a/kio/kfile/tests/kfstest.cpp b/kio/kfile/tests/kfstest.cpp index b84cbc967..48c8a1a2b 100644 --- a/kio/kfile/tests/kfstest.cpp +++ b/kio/kfile/tests/kfstest.cpp @@ -51,11 +51,11 @@ int main(int argc, char **argv) TQString argv1; TQString startDir; if (argc > 1) - argv1 = TQString::fromLatin1(argv[1]); + argv1 = TQString::tqfromLatin1(argv[1]); if ( argc > 2 ) - startDir = TQString::fromLatin1( argv[2]); + startDir = TQString::tqfromLatin1( argv[2]); - if (argv1 == TQString::fromLatin1("diroperator")) { + if (argv1 == TQString::tqfromLatin1("diroperator")) { KDirOperator *op = new KDirOperator(startDir, 0, "operator"); op->setViewConfig( KGlobal::config(), "TestGroup" ); op->setView(KFile::Simple); @@ -64,24 +64,24 @@ int main(int argc, char **argv) a.exec(); } - else if (argv1 == TQString::fromLatin1("justone")) { + else if (argv1 == TQString::tqfromLatin1("justone")) { TQString name = KFileDialog::getOpenFileName(startDir); qDebug("filename=%s",name.latin1()); } - else if (argv1 == TQString::fromLatin1("existingURL")) { + else if (argv1 == TQString::tqfromLatin1("existingURL")) { KURL url = KFileDialog::getExistingURL(); qDebug("URL=%s",url.url().latin1()); name1 = url.url(); } - else if (argv1 == TQString::fromLatin1("preview")) { + else if (argv1 == TQString::tqfromLatin1("preview")) { KURL u = KFileDialog::getImageOpenURL(); qDebug("filename=%s", u.url().latin1()); } - else if (argv1 == TQString::fromLatin1("preselect")) { - names = KFileDialog::getOpenFileNames(TQString::fromLatin1("/etc/passwd")); + else if (argv1 == TQString::tqfromLatin1("preselect")) { + names = KFileDialog::getOpenFileNames(TQString::tqfromLatin1("/etc/passwd")); TQStringList::Iterator it = names.begin(); while ( it != names.end() ) { qDebug("selected file: %s", (*it).latin1()); @@ -89,10 +89,10 @@ int main(int argc, char **argv) } } - else if (argv1 == TQString::fromLatin1("dirs")) + else if (argv1 == TQString::tqfromLatin1("dirs")) name1 = KFileDialog::getExistingDirectory(); - else if (argv1 == TQString::fromLatin1("heap")) { + else if (argv1 == TQString::tqfromLatin1("heap")) { KFileDialog *dlg = new KFileDialog( startDir, TQString::null, 0L, "file dialog", true ); dlg->setMode( KFile::File); @@ -104,33 +104,33 @@ int main(int argc, char **argv) if ( urlBar ) { urlBar->insertDynamicItem( KURL("ftp://ftp.kde.org"), - TQString::fromLatin1("KDE FTP Server") ); + TQString::tqfromLatin1("KDE FTP Server") ); } if ( dlg->exec() == KDialog::Accepted ) name1 = dlg->selectedURL().url(); } - else if ( argv1 == TQString::fromLatin1("eventloop") ) + else if ( argv1 == TQString::tqfromLatin1("eventloop") ) { KFDTest *test = new KFDTest( startDir ); return a.exec(); } - else if (argv1 == TQString::fromLatin1("save")) { + else if (argv1 == TQString::tqfromLatin1("save")) { KURL u = KFileDialog::getSaveURL(); -// TQString(TQDir::homeDirPath() + TQString::fromLatin1("/testfile")), +// TQString(TQDir::homeDirPath() + TQString::tqfromLatin1("/testfile")), // TQString::null, 0L); name1 = u.url(); } - else if (argv1 == TQString::fromLatin1("icon")) { + else if (argv1 == TQString::tqfromLatin1("icon")) { KIconDialog dlg; TQString icon = dlg.selectIcon(); kdDebug() << icon << endl; } -// else if ( argv1 == TQString::fromLatin1("dirselect") ) { +// else if ( argv1 == TQString::tqfromLatin1("dirselect") ) { // KURL url; // url.setPath( "/" ); // KURL selected = KDirSelectDialog::selectDirectory( url ); @@ -140,7 +140,7 @@ int main(int argc, char **argv) else { KFileDialog dlg(startDir, - TQString::fromLatin1("*|All Files\n" + TQString::tqfromLatin1("*|All Files\n" "*.lo *.o *.la|All libtool Files"), 0, 0, true); // dlg.setFilter( "*.kdevelop" ); @@ -177,7 +177,7 @@ int main(int argc, char **argv) } if (!(name1.isNull())) - KMessageBox::information(0, TQString::fromLatin1("You selected the file " ) + name1, - TQString::fromLatin1("Your Choice")); + KMessageBox::information(0, TQString::tqfromLatin1("You selected the file " ) + name1, + TQString::tqfromLatin1("Your Choice")); return 0; } diff --git a/kio/kfile/tests/kurlrequestertest.cpp b/kio/kfile/tests/kurlrequestertest.cpp index 9248eec5d..4a1d4bec0 100644 --- a/kio/kfile/tests/kurlrequestertest.cpp +++ b/kio/kfile/tests/kurlrequestertest.cpp @@ -10,7 +10,7 @@ int main( int argc, char **argv ) qDebug( "Selected url: %s", url.url().latin1()); KURLRequester *req = new KURLRequester(); - KEditListBox *el = new KEditListBox( TQString::fromLatin1("Test"), req->customEditor() ); + KEditListBox *el = new KEditListBox( TQString::tqfromLatin1("Test"), req->customEditor() ); el->show(); return app.exec(); } |