diff --git a/kerry/src/kcm/backends.cpp b/kerry/src/kcm/backends.cpp index 2e7ea3f..0174792 100644 --- a/kerry/src/kcm/backends.cpp +++ b/kerry/src/kcm/backends.cpp @@ -36,7 +36,7 @@ KCMBeagleBackends::KCMBeagleBackends(TQWidget *parent, const char * ) general_layout->addWidget( new TQLabel(i18n( "Select which of the available Beagle backends you want to have enabled." ), this) ); - listview = new KListView(this); + listview = new TDEListView(this); listview->addColumn(i18n("Backends")); listview->setResizeMode( TQListView::LastColumn ); listview->setFullWidth( true ); diff --git a/kerry/src/kcm/backends.h b/kerry/src/kcm/backends.h index eb912ee..de5863b 100644 --- a/kerry/src/kcm/backends.h +++ b/kerry/src/kcm/backends.h @@ -46,7 +46,7 @@ protected slots: void changedValue(); private: - KListView* listview; + TDEListView* listview; TQStringList readDisabledBackends(); bool saveDisabledBackends(TQStringList disabledBackends); diff --git a/kerry/src/kcm/indexing.cpp b/kerry/src/kcm/indexing.cpp index 047f327..3c3c35b 100644 --- a/kerry/src/kcm/indexing.cpp +++ b/kerry/src/kcm/indexing.cpp @@ -71,9 +71,9 @@ KCMBeagleIndexing::KCMBeagleIndexing(TQWidget *parent, const char * ) TQGridLayout* grid_index = new TQGridLayout( gb_index_layout, 1, 1, KDialog::spacingHint()); - index_list = new KListView( gb_index ); + index_list = new TDEListView( gb_index ); index_list->addColumn( i18n( "Name" ) ); - index_list->setResizeMode( KListView::LastColumn ); + index_list->setResizeMode( TDEListView::LastColumn ); index_list->setFullWidth( true ); grid_index->addMultiCellWidget( index_list, 0, 2, 0, 0 ); label_index->setBuddy(index_list); @@ -103,10 +103,10 @@ KCMBeagleIndexing::KCMBeagleIndexing(TQWidget *parent, const char * ) TQGridLayout* grid_privacy = new TQGridLayout( gb_privacy_layout, 1, 1, KDialog::spacingHint()); - privacy_list = new KListView( gb_privacy ); + privacy_list = new TDEListView( gb_privacy ); privacy_list->addColumn( i18n( "Type" ) ); privacy_list->addColumn( i18n( "Name" ) ); - privacy_list->setResizeMode( KListView::LastColumn ); + privacy_list->setResizeMode( TDEListView::LastColumn ); privacy_list->setFullWidth( true ); privacy_list->setAllColumnsShowFocus( true ); grid_privacy->addMultiCellWidget( privacy_list, 0, 2, 0, 0 ); @@ -178,14 +178,14 @@ void KCMBeagleIndexing::load( bool useDefaults ) index_list->clear(); remove_index->setEnabled(false); for ( TQStringList::Iterator it = roots.begin(); it != roots.end(); ++it ) { - new KListViewItem(index_list,*it); + new TDEListViewItem(index_list,*it); } privacy_list->clear(); remove_privacy->setEnabled(false); TQStringList::Iterator it_values = excludeValues.begin(); for ( TQStringList::Iterator it_types = excludeTypes.begin(); it_types != excludeTypes.end(); ++it_types ) { - new KListViewItem(privacy_list,*it_types,*it_values); + new TDEListViewItem(privacy_list,*it_types,*it_values); it_values++; } @@ -224,7 +224,7 @@ void KCMBeagleIndexing::save() void KCMBeagleIndexing::slotAddSearch() { KURL path = KDirSelectDialog::selectDirectory( TQDir::home().absPath(), true, this, i18n("Select Folder")); - new KListViewItem(index_list,path.path()); + new TDEListViewItem(index_list,path.path()); changedValue(); } @@ -261,11 +261,11 @@ void KCMBeagleIndexing::slotAddPrivacy() { if ( w.radioButtonFolder->isChecked()) { if (!w.folderRequester->lineEdit()->text().isEmpty()) - new KListViewItem(privacy_list,"Path",w.folderRequester->lineEdit()->text()); + new TDEListViewItem(privacy_list,"Path",w.folderRequester->lineEdit()->text()); } else if (!w.patternEdit->text().isEmpty()) - new KListViewItem(privacy_list,"Pattern",w.patternEdit->text()); + new TDEListViewItem(privacy_list,"Pattern",w.patternEdit->text()); changedValue(); } } diff --git a/kerry/src/kcm/indexing.h b/kerry/src/kcm/indexing.h index adac845..07e1bed 100644 --- a/kerry/src/kcm/indexing.h +++ b/kerry/src/kcm/indexing.h @@ -54,7 +54,7 @@ private: TQCheckBox *startBeagle; TQCheckBox *indexOnBattery; TQCheckBox *indexHome; - KListView* index_list, *privacy_list; + TDEListView* index_list, *privacy_list; TQPushButton* remove_index, *remove_privacy; void readIndexConfig(bool &indexHomeDir, bool &indexOnBattery, TQStringList &roots, TQStringList &excludeTypes, TQStringList &excludeValues); diff --git a/kerry/src/kcm/search.cpp b/kerry/src/kcm/search.cpp index 94b64a9..3c81933 100644 --- a/kerry/src/kcm/search.cpp +++ b/kerry/src/kcm/search.cpp @@ -67,7 +67,7 @@ KCMKerrySearch::KCMKerrySearch(TQWidget *parent, const char * ) globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this)); globalKeys->insert( "Program:kerry", i18n("Kerry Beagle Search") ); - KShortcut showDialogShortcut = KShortcut(ALT+Key_Space); + TDEShortcut showDialogShortcut = TDEShortcut(ALT+Key_Space); showDialogShortcut.append( KKey( Key_F12 ) ); globalKeys->insert( "Show Kerry Dialog", i18n("Show Search Dialog"), TQString(), showDialogShortcut, showDialogShortcut, 0, 0); globalKeys->insert( "Search Primary Selection with Kerry", i18n("Search Primary Selection"), TQString(), CTRL+ALT+Key_Space, CTRL+ALT+Key_Space, 0, 0); diff --git a/kerry/src/kerryapp.cpp b/kerry/src/kerryapp.cpp index ba542e8..4e7151b 100644 --- a/kerry/src/kerryapp.cpp +++ b/kerry/src/kerryapp.cpp @@ -103,7 +103,7 @@ void KerryApplication::init(const TDEAboutData* /*about*/) hitListWindow->configChanged(); sysTrayIcon = new KSystemTray(hitListWindow); - KPopupMenu *menu = sysTrayIcon->contextMenu(); + TDEPopupMenu *menu = sysTrayIcon->contextMenu(); connect(menu,TQT_SIGNAL(aboutToShow()),TQT_SLOT(aboutToShowSysTrayMenu())); connect(menu,TQT_SIGNAL(activated(int)),TQT_SLOT(historySelected(int))); @@ -122,7 +122,7 @@ void KerryApplication::init(const TDEAboutData* /*about*/) globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this)); globalKeys->insert( "Program:kerry", i18n("Kerry Beagle Search") ); - KShortcut showDialogShortcut = KShortcut(ALT+Key_Space); + TDEShortcut showDialogShortcut = TDEShortcut(ALT+Key_Space); showDialogShortcut.append( KKey( Key_F12 ) ); globalKeys->insert( "Show Kerry Dialog", i18n("Show Search Dialog"), TQString(), showDialogShortcut, showDialogShortcut, TQT_TQOBJECT(hitListWindow), TQT_SLOT(showSearchDialog()) ); globalKeys->insert( "Search Primary Selection with Kerry", i18n("Search Primary Selection"), TQString(), CTRL+ALT+Key_Space, CTRL+ALT+Key_Space, TQT_TQOBJECT(this), TQT_SLOT(searchPrimarySelection()) ); @@ -133,7 +133,7 @@ void KerryApplication::init(const TDEAboutData* /*about*/) sysTrayIcon->show(); - sysTrayIcon->actionCollection()->action("file_quit")->setShortcut(KShortcut()); + sysTrayIcon->actionCollection()->action("file_quit")->setShortcut(TDEShortcut()); disconnect(sysTrayIcon->actionCollection()->action("file_quit"), TQT_SIGNAL(activated()), sysTrayIcon, TQT_SLOT(maybeQuit())); connect(sysTrayIcon->actionCollection()->action("file_quit"), TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(quitKerry())); @@ -148,7 +148,7 @@ void KerryApplication::search(const TQString& text) void KerryApplication::aboutToShowSysTrayMenu() { - KPopupMenu *menu = sysTrayIcon->contextMenu(); + TDEPopupMenu *menu = sysTrayIcon->contextMenu(); for (int id=HISTORY_ITEMS_START_ID;id<=HISTORY_ITEMS_START_ID+MAX_HISTORY_ITEMS;id++) menu->removeItem(id); diff --git a/kerry/src/kerrylabel.cpp b/kerry/src/kerrylabel.cpp index bc8b9b7..9a10144 100644 --- a/kerry/src/kerrylabel.cpp +++ b/kerry/src/kerrylabel.cpp @@ -92,7 +92,7 @@ void KerryLabel::popupMenu( const TQPoint &_global ) _items.append( &item ); const KURL kurl(url()); - KActionCollection act(this); + TDEActionCollection act(this); KonqPopupMenu * popupMenu = new KonqPopupMenu( KonqBookmarkManager::self(), _items, kurl, act, (KNewMenu*)NULL, this, diff --git a/kerry/src/searchdlg.cpp b/kerry/src/searchdlg.cpp index f2f105e..ecc5e69 100644 --- a/kerry/src/searchdlg.cpp +++ b/kerry/src/searchdlg.cpp @@ -1604,7 +1604,7 @@ void SearchDlg::showEvent(TQShowEvent *e ) void SearchDlg::slotContextMenu( int /*row*/, int /*col*/, const TQPoint & pos ) { - KPopupMenu *popup = new KPopupMenu(this); + TDEPopupMenu *popup = new TDEPopupMenu(this); popup->insertTitle(i18n("Collapse") + " / " + i18n("Expand")); popup->insertItem(i18n("Collapse All"), 1); popup->insertItem(i18n("Expand All"), 2);