From fd5d099065a748cac49e20a13481f85666c53c71 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:14:12 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- tderesources/birthdays/resourcekabcconfig.cpp | 2 +- tderesources/birthdays/resourcekabcconfig.h | 2 +- tderesources/groupware/kabc_resourcegroupwareconfig.cpp | 4 ++-- tderesources/groupware/kabc_resourcegroupwareconfig.h | 4 ++-- tderesources/groupwise/groupwisesettingswidgetbase.ui | 2 +- tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp | 4 ++-- tderesources/groupwise/kabc_resourcegroupwiseconfig.h | 4 ++-- tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp | 4 ++-- tderesources/lib/folderconfig.h | 2 +- tderesources/lib/folderlistview.cpp | 6 +++--- tderesources/lib/folderlistview.h | 2 +- tderesources/lib/folderselectdialog.cpp | 2 +- tderesources/lib/folderselectdialog.h | 2 +- tderesources/scalix/scalixadmin/delegateview.cpp | 2 +- tderesources/scalix/scalixadmin/delegateview.h | 2 +- tderesources/scalix/scalixadmin/ldapview.cpp | 2 +- tderesources/scalix/scalixadmin/ldapview.h | 2 +- tderesources/scalix/scalixadmin/mainwindow.cpp | 2 +- tderesources/scalix/scalixadmin/mainwindow.h | 2 +- tderesources/scalix/scalixadmin/otheruserview.cpp | 2 +- tderesources/scalix/scalixadmin/otheruserview.h | 2 +- tderesources/slox/sloxfolder.h | 4 ++-- tderesources/slox/sloxfolderdialog.cpp | 8 ++++---- tderesources/slox/sloxfolderdialog.h | 4 ++-- 24 files changed, 36 insertions(+), 36 deletions(-) (limited to 'tderesources') diff --git a/tderesources/birthdays/resourcekabcconfig.cpp b/tderesources/birthdays/resourcekabcconfig.cpp index 2f7671dc7..24a79bf2b 100644 --- a/tderesources/birthdays/resourcekabcconfig.cpp +++ b/tderesources/birthdays/resourcekabcconfig.cpp @@ -55,7 +55,7 @@ ResourceKABCConfig::ResourceKABCConfig( TQWidget* parent, const char* name ) mUseCategories = new TQCheckBox( i18n( "Filter by categories" ), this ); topLayout->addMultiCellWidget( mUseCategories, 3, 3, 0, 1 ); - mCategoryView = new KListView( this ); + mCategoryView = new TDEListView( this ); mCategoryView->addColumn( "" ); mCategoryView->header()->hide(); mCategoryView->setEnabled( false ); diff --git a/tderesources/birthdays/resourcekabcconfig.h b/tderesources/birthdays/resourcekabcconfig.h index ff6178b70..4016c727c 100644 --- a/tderesources/birthdays/resourcekabcconfig.h +++ b/tderesources/birthdays/resourcekabcconfig.h @@ -57,7 +57,7 @@ class ResourceKABCConfig : public KRES::ConfigWidget KRestrictedLine *mAlarmTimeEdit; TQLabel *mALabel; TQCheckBox *mUseCategories; - KListView *mCategoryView; + TDEListView *mCategoryView; class Private; Private *d; diff --git a/tderesources/groupware/kabc_resourcegroupwareconfig.cpp b/tderesources/groupware/kabc_resourcegroupwareconfig.cpp index 956ee4321..4634495e9 100644 --- a/tderesources/groupware/kabc_resourcegroupwareconfig.cpp +++ b/tderesources/groupware/kabc_resourcegroupwareconfig.cpp @@ -39,7 +39,7 @@ using namespace KABC; class AddressBookItem : public TQCheckListItem { public: - AddressBookItem( KListView *parent, const TQString &id ) + AddressBookItem( TDEListView *parent, const TQString &id ) : TQCheckListItem( parent, "", CheckBox ), mId( id ) { @@ -90,7 +90,7 @@ ResourceGroupwareConfig::ResourceGroupwareConfig( TQWidget* parent, const char* TQPushButton *updateButton = new TQPushButton( i18n( "Retrieve Address Book List From Server" ), this ); mainLayout->addMultiCellWidget( updateButton, 4, 4, 0, 1 ); - mAddressBookView = new KListView( this ); + mAddressBookView = new TDEListView( this ); mAddressBookView->addColumn( i18n( "Address Book" ) ); #if 0 mAddressBookView->addColumn( i18n( "Personal" ) ); diff --git a/tderesources/groupware/kabc_resourcegroupwareconfig.h b/tderesources/groupware/kabc_resourcegroupwareconfig.h index bad560d17..c07c4d0b4 100644 --- a/tderesources/groupware/kabc_resourcegroupwareconfig.h +++ b/tderesources/groupware/kabc_resourcegroupwareconfig.h @@ -26,7 +26,7 @@ class KComboBox; class KLineEdit; -class KListView; +class TDEListView; class KURLRequester; namespace KABC { @@ -58,7 +58,7 @@ class ResourceGroupwareConfig : public KRES::ConfigWidget KLineEdit *mUser; KLineEdit *mPassword; - KListView *mAddressBookView; + TDEListView *mAddressBookView; KComboBox *mAddressBookBox; TQStringList mWriteAddressBookIds; diff --git a/tderesources/groupwise/groupwisesettingswidgetbase.ui b/tderesources/groupwise/groupwisesettingswidgetbase.ui index 49437ef4c..8ad33ea3b 100644 --- a/tderesources/groupwise/groupwisesettingswidgetbase.ui +++ b/tderesources/groupwise/groupwisesettingswidgetbase.ui @@ -16,7 +16,7 @@ unnamed - + Group diff --git a/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp b/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp index 483268cc2..9f00dab9e 100644 --- a/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp +++ b/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp @@ -39,7 +39,7 @@ using namespace KABC; class AddressBookItem : public TQCheckListItem { public: - AddressBookItem( KListView *parent, GroupWise::AddressBook ab ) + AddressBookItem( TDEListView *parent, GroupWise::AddressBook ab ) : TQCheckListItem( parent, "", CheckBox ), mId( ab.id ) { @@ -88,7 +88,7 @@ ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* parent, const char* TQPushButton *updateButton = new TQPushButton( i18n( "Retrieve Address Book List From Server" ), this ); mainLayout->addMultiCellWidget( updateButton, 4, 4, 0, 1 ); - mAddressBookView = new KListView( this ); + mAddressBookView = new TDEListView( this ); mAddressBookView->addColumn( i18n( "Address Book" ) ); mAddressBookView->addColumn( i18n( "Personal" ) ); mAddressBookView->addColumn( i18n( "Frequent Contacts" ) ); diff --git a/tderesources/groupwise/kabc_resourcegroupwiseconfig.h b/tderesources/groupwise/kabc_resourcegroupwiseconfig.h index a377ec681..eb54803c0 100644 --- a/tderesources/groupwise/kabc_resourcegroupwiseconfig.h +++ b/tderesources/groupwise/kabc_resourcegroupwiseconfig.h @@ -29,7 +29,7 @@ class KComboBox; class KLineEdit; -class KListView; +class TDEListView; class KURLRequester; namespace KABC { @@ -61,7 +61,7 @@ class KDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget KLineEdit *mUser; KLineEdit *mPassword; - KListView *mAddressBookView; + TDEListView *mAddressBookView; KComboBox *mAddressBookBox; TQStringList mWriteAddressBookIds; diff --git a/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp index b23a81a1b..747b33547 100644 --- a/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp +++ b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp @@ -139,7 +139,7 @@ void ResourceGroupwiseConfig::slotViewUserSettings() groupName = TQString::fromUtf8( group->type->c_str() ); kdDebug() << "GROUP: " << groupName << endl;; } - KListViewItem * groupLVI = new KListViewItem( settingsWidget->m_settingsList, groupName ); + TDEListViewItem * groupLVI = new TDEListViewItem( settingsWidget->m_settingsList, groupName ); std::vector setting = group->setting; std::vector::const_iterator it2; for( it2 = setting.begin(); it2 != setting.end(); ++it2 ) @@ -155,7 +155,7 @@ void ResourceGroupwiseConfig::slotViewUserSettings() locked = *((*it2)->locked); kdDebug() << " SETTING: " << setting << " value : " << value << (locked ? "locked" : " not locked " ) << endl; - KListViewItem * settingLVI = new KListViewItem( groupLVI, TQString(), setting, value, (locked ? "locked" : " not locked " ) ); + TDEListViewItem * settingLVI = new TDEListViewItem( groupLVI, TQString(), setting, value, (locked ? "locked" : " not locked " ) ); if ( !locked ) settingLVI->setRenameEnabled( 2, true ); } diff --git a/tderesources/lib/folderconfig.h b/tderesources/lib/folderconfig.h index 36a8d31a0..a9b4c714c 100644 --- a/tderesources/lib/folderconfig.h +++ b/tderesources/lib/folderconfig.h @@ -27,7 +27,7 @@ #include #include -// class KListView; +// class TDEListView; class TQComboBox; class FolderListView; diff --git a/tderesources/lib/folderlistview.cpp b/tderesources/lib/folderlistview.cpp index b29e61c9d..68995aef2 100644 --- a/tderesources/lib/folderlistview.cpp +++ b/tderesources/lib/folderlistview.cpp @@ -39,7 +39,7 @@ static const int BoxSize = 16; //BEGIN FolderListView FolderListView::FolderListView( TQWidget *parent, const TQValueList &types ) - : KListView( parent ) + : TDEListView( parent ) { setEnabledTypes( types ); @@ -95,7 +95,7 @@ void FolderListView::showPopupMenu( FolderListItem *i, const TQPoint &globalPos if ( !i ) return; KPIM::FolderLister::Entry folder( i->folder() ); - KPopupMenu m( this ); + TDEPopupMenu m( this ); int id; m.insertTitle( folder.name, 9999 ); @@ -154,7 +154,7 @@ void FolderListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& // map pos to item/column and call FolderListItem::activate(col, pos) ((FolderListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(i).top() ) ); // } else { -// KListView::slotMousePressed( btn, i, pos, c ); +// TDEListView::slotMousePressed( btn, i, pos, c ); } } } diff --git a/tderesources/lib/folderlistview.h b/tderesources/lib/folderlistview.h index 32f01199b..f4837ecf6 100644 --- a/tderesources/lib/folderlistview.h +++ b/tderesources/lib/folderlistview.h @@ -35,7 +35,7 @@ class FolderListCaption; TQListView that automatically adds columns for FolderListItems for selecting the default destination and a slot to edit the destinations using the keyboard. */ -class FolderListView : public KListView +class FolderListView : public TDEListView { Q_OBJECT diff --git a/tderesources/lib/folderselectdialog.cpp b/tderesources/lib/folderselectdialog.cpp index 9d0f48a5e..ab5991531 100644 --- a/tderesources/lib/folderselectdialog.cpp +++ b/tderesources/lib/folderselectdialog.cpp @@ -47,7 +47,7 @@ FolderSelectDialog::FolderSelectDialog( const TQString& caption, const TQString& TQLabel* labelWidget = new TQLabel( label, frame ); layout->addWidget( labelWidget ); - mListBox = new KListBox( frame ); + mListBox = new TDEListBox( frame ); mListBox->insertStringList( list ); mListBox->setSelected( 0, true ); mListBox->ensureCurrentVisible(); diff --git a/tderesources/lib/folderselectdialog.h b/tderesources/lib/folderselectdialog.h index e33ac80a4..5f04cd019 100644 --- a/tderesources/lib/folderselectdialog.h +++ b/tderesources/lib/folderselectdialog.h @@ -51,7 +51,7 @@ protected: virtual void closeEvent(TQCloseEvent *event); void reject(); private: - KListBox* mListBox; + TDEListBox* mListBox; }; } diff --git a/tderesources/scalix/scalixadmin/delegateview.cpp b/tderesources/scalix/scalixadmin/delegateview.cpp index 1031f460e..440fb66fa 100644 --- a/tderesources/scalix/scalixadmin/delegateview.cpp +++ b/tderesources/scalix/scalixadmin/delegateview.cpp @@ -41,7 +41,7 @@ class DelegateItem : public TQListViewItem }; DelegateView::DelegateView( DelegateManager *manager, TQWidget *parent ) - : KListView( parent ), mManager( manager ) + : TDEListView( parent ), mManager( manager ) { addColumn( i18n( "Delegate" ) ); addColumn( i18n( "Rights" ) ); diff --git a/tderesources/scalix/scalixadmin/delegateview.h b/tderesources/scalix/scalixadmin/delegateview.h index 5dfa379f7..aef034059 100644 --- a/tderesources/scalix/scalixadmin/delegateview.h +++ b/tderesources/scalix/scalixadmin/delegateview.h @@ -29,7 +29,7 @@ class Delegate; class DelegateManager; -class DelegateView : public KListView +class DelegateView : public TDEListView { Q_OBJECT diff --git a/tderesources/scalix/scalixadmin/ldapview.cpp b/tderesources/scalix/scalixadmin/ldapview.cpp index adf2fe3fa..0cdca1819 100644 --- a/tderesources/scalix/scalixadmin/ldapview.cpp +++ b/tderesources/scalix/scalixadmin/ldapview.cpp @@ -39,7 +39,7 @@ class LdapItem : public TQListViewItem LdapView::LdapView( TQWidget *parent ) - : KListView( parent ) + : TDEListView( parent ) { addColumn( i18n( "User" ) ); setFullWidth( true ); diff --git a/tderesources/scalix/scalixadmin/ldapview.h b/tderesources/scalix/scalixadmin/ldapview.h index 6af41aa75..cd71a17f6 100644 --- a/tderesources/scalix/scalixadmin/ldapview.h +++ b/tderesources/scalix/scalixadmin/ldapview.h @@ -27,7 +27,7 @@ class LdapClient; class LdapObject; } -class LdapView : public KListView +class LdapView : public TDEListView { Q_OBJECT diff --git a/tderesources/scalix/scalixadmin/mainwindow.cpp b/tderesources/scalix/scalixadmin/mainwindow.cpp index 04e396d78..a6a31a3df 100644 --- a/tderesources/scalix/scalixadmin/mainwindow.cpp +++ b/tderesources/scalix/scalixadmin/mainwindow.cpp @@ -33,7 +33,7 @@ #include "mainwindow.h" MainWindow::MainWindow() - : KMainWindow( 0 ) + : TDEMainWindow( 0 ) { KJanusWidget *wdg = new KJanusWidget( this, "", KJanusWidget::IconList ); diff --git a/tderesources/scalix/scalixadmin/mainwindow.h b/tderesources/scalix/scalixadmin/mainwindow.h index 38c955980..a682ec065 100644 --- a/tderesources/scalix/scalixadmin/mainwindow.h +++ b/tderesources/scalix/scalixadmin/mainwindow.h @@ -23,7 +23,7 @@ #include -class MainWindow : public KMainWindow +class MainWindow : public TDEMainWindow { public: MainWindow(); diff --git a/tderesources/scalix/scalixadmin/otheruserview.cpp b/tderesources/scalix/scalixadmin/otheruserview.cpp index 25a694287..06e69d41c 100644 --- a/tderesources/scalix/scalixadmin/otheruserview.cpp +++ b/tderesources/scalix/scalixadmin/otheruserview.cpp @@ -40,7 +40,7 @@ class OtherUserItem : public TQListViewItem }; OtherUserView::OtherUserView( OtherUserManager *manager, TQWidget *parent ) - : KListView( parent ), mManager( manager ) + : TDEListView( parent ), mManager( manager ) { addColumn( i18n( "Registered Accounts" ) ); setFullWidth( true ); diff --git a/tderesources/scalix/scalixadmin/otheruserview.h b/tderesources/scalix/scalixadmin/otheruserview.h index b5d3ff00e..89dbd8c0e 100644 --- a/tderesources/scalix/scalixadmin/otheruserview.h +++ b/tderesources/scalix/scalixadmin/otheruserview.h @@ -25,7 +25,7 @@ class OtherUserManager; -class OtherUserView : public KListView +class OtherUserView : public TDEListView { Q_OBJECT diff --git a/tderesources/slox/sloxfolder.h b/tderesources/slox/sloxfolder.h index e722dfd4c..6f6a6c938 100644 --- a/tderesources/slox/sloxfolder.h +++ b/tderesources/slox/sloxfolder.h @@ -23,7 +23,7 @@ #include #include -class KListViewItem; +class TDEListViewItem; enum FolderType { Unbound, @@ -43,7 +43,7 @@ class KDE_EXPORT SloxFolder TQString name() const; bool isDefault() const { return mDefault; } - KListViewItem *item; + TDEListViewItem *item; private: TQString mId, mParentId; diff --git a/tderesources/slox/sloxfolderdialog.cpp b/tderesources/slox/sloxfolderdialog.cpp index 4d21c2307..0d6a756bb 100644 --- a/tderesources/slox/sloxfolderdialog.cpp +++ b/tderesources/slox/sloxfolderdialog.cpp @@ -30,7 +30,7 @@ SloxFolderDialog::SloxFolderDialog( SloxFolderManager *manager, FolderType type, mManager( manager ), mFolderType( type ) { - mListView = new KListView( this ); + mListView = new TDEListView( this ); mListView->setRootIsDecorated( true ); mListView->setShowSortIndicator( true ); mListView->addColumn( i18n("Folder") ); @@ -74,11 +74,11 @@ void SloxFolderDialog::createFolderViewItem( SloxFolder *folder ) SloxFolder *parent = mManager->folders()[folder->parentId()]; createFolderViewItem( parent ); if ( parent->item ) - folder->item = new KListViewItem( parent->item ); + folder->item = new TDEListViewItem( parent->item ); else - folder->item = new KListViewItem( mListView ); + folder->item = new TDEListViewItem( mListView ); } else { - folder->item = new KListViewItem( mListView ); + folder->item = new TDEListViewItem( mListView ); } folder->item->setText( 0, folder->name() ); folder->item->setText( 1, folder->id() ); diff --git a/tderesources/slox/sloxfolderdialog.h b/tderesources/slox/sloxfolderdialog.h index 69b8126bd..1a0749eaa 100644 --- a/tderesources/slox/sloxfolderdialog.h +++ b/tderesources/slox/sloxfolderdialog.h @@ -24,7 +24,7 @@ #include "sloxfolder.h" -class KListView; +class TDEListView; class SloxFolder; class SloxFolderManager; @@ -47,7 +47,7 @@ class SloxFolderDialog : public KDialogBase void createFolderViewItem( SloxFolder *folder ); private: - KListView *mListView; + TDEListView *mListView; SloxFolderManager *mManager; TQString mFolderId; FolderType mFolderType; -- cgit v1.2.1