diff options
418 files changed, 2193 insertions, 2193 deletions
diff --git a/doc/userguide/tde-for-admins.docbook b/doc/userguide/tde-for-admins.docbook index 665f3c287..197dab390 100644 --- a/doc/userguide/tde-for-admins.docbook +++ b/doc/userguide/tde-for-admins.docbook @@ -1009,7 +1009,7 @@ applications communicate with <command>tdelauncher</command> over &DCOP; in order to start new applications or services.</para> <para>Best known from the error message: <computeroutput><errortext> -KLauncher could not be reached via DCOP </errortext></computeroutput> which +TDELauncher could not be reached via DCOP </errortext></computeroutput> which either indicates a serious problem with the <command>dcopserver</command> or that <command>tdelauncher</command> crashed.</para> diff --git a/kappfinder/toplevel.cpp b/kappfinder/toplevel.cpp index 317906e95..6270add55 100644 --- a/kappfinder/toplevel.cpp +++ b/kappfinder/toplevel.cpp @@ -107,7 +107,7 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name TQAccel *accel = new TQAccel( this ); accel->connectItem( accel->insertItem( Key_Q + CTRL ), kapp, TQT_SLOT( quit() ) ); - KAcceleratorManager::manage( this ); + TDEAcceleratorManager::manage( this ); } diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp index 62d070e41..d9471db36 100644 --- a/kate/app/kateapp.cpp +++ b/kate/app/kateapp.cpp @@ -154,7 +154,7 @@ void KateApp::restoreKate () Kate::Document::setOpenErrorDialogsActivated (true); // restore all windows ;) - for (int n=1; KMainWindow::canBeRestored(n); n++) + for (int n=1; TDEMainWindow::canBeRestored(n); n++) newMainWindow(sessionConfig(), TQString ("%1").arg(n)); // oh, no mainwindow, create one, should not happen, but make sure ;) diff --git a/kate/app/kateconfigplugindialogpage.cpp b/kate/app/kateconfigplugindialogpage.cpp index 7fecffcc5..1b5c29aac 100644 --- a/kate/app/kateconfigplugindialogpage.cpp +++ b/kate/app/kateconfigplugindialogpage.cpp @@ -64,7 +64,7 @@ void KatePluginListItem::stateChange(bool b) } KatePluginListView::KatePluginListView(TQWidget *parent, const char *name) - : KListView(parent, name) + : TDEListView(parent, name) { } diff --git a/kate/app/kateconfigplugindialogpage.h b/kate/app/kateconfigplugindialogpage.h index afdfc7911..c0294b0e9 100644 --- a/kate/app/kateconfigplugindialogpage.h +++ b/kate/app/kateconfigplugindialogpage.h @@ -29,7 +29,7 @@ class KatePluginListItem; -class KatePluginListView : public KListView +class KatePluginListView : public TDEListView { Q_OBJECT diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp index 78cf6b6fd..2f2ae3487 100644 --- a/kate/app/kateexternaltools.cpp +++ b/kate/app/kateexternaltools.cpp @@ -204,7 +204,7 @@ bool KateExternalToolsCommand::exec (Kate::View *view, const TQString &cmd, TQSt tqt_dynamic_cast<KateExternalToolsMenuAction*>(dmw->action("tools_external")); if (!a) return false; // kdDebug(13001)<<"trying to find action"<<endl; - KAction *a1=a->actionCollection()->action(static_cast<const char *>(actionName.utf8())); + TDEAction *a1=a->actionCollection()->action(static_cast<const char *>(actionName.utf8())); if (!a1) return false; // kdDebug(13001)<<"activating action"<<endl; a1->activate(); @@ -219,7 +219,7 @@ bool KateExternalToolsCommand::help (Kate::View *, const TQString &, TQString &) //BEGIN KateExternalToolAction KateExternalToolAction::KateExternalToolAction( TQObject *parent, const char *name, KateExternalTool *t) - : KAction( parent, name ), + : TDEAction( parent, name ), tool ( t ) { setText( t->name ); @@ -295,11 +295,11 @@ KateExternalToolsMenuAction::KateExternalToolsMenuAction( const TQString &text, TQObject *parent, const char* name, KateMainWindow *mw ) - : KActionMenu( text, parent, name ), + : TDEActionMenu( text, parent, name ), mainwindow( mw ) { - m_actionCollection = new KActionCollection( mainwindow ); + m_actionCollection = new TDEActionCollection( mainwindow ); connect(KateDocManager::self(),TQT_SIGNAL(documentChanged()),this,TQT_SLOT(slotDocumentChanged())); @@ -387,8 +387,8 @@ void KateExternalToolsMenuAction::slotDocumentChanged() TQStringList l; bool b; - KActionPtrList actions = m_actionCollection->actions(); - for (KActionPtrList::iterator it = actions.begin(); it != actions.end(); ++it ) + TDEActionPtrList actions = m_actionCollection->actions(); + for (TDEActionPtrList::iterator it = actions.begin(); it != actions.end(); ++it ) { KateExternalToolAction *action = tqt_dynamic_cast<KateExternalToolAction*>(*it); if ( action ) @@ -561,7 +561,7 @@ KateExternalToolsConfigWidget::KateExternalToolsConfigWidget( TQWidget *parent, { TQGridLayout *lo = new TQGridLayout( this, 5, 5, 0, KDialog::spacingHint() ); - lbTools = new KListBox( this ); + lbTools = new TDEListBox( this ); lo->addMultiCellWidget( lbTools, 1, 4, 0, 3 ); connect( lbTools, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) ); diff --git a/kate/app/kateexternaltools.h b/kate/app/kateexternaltools.h index 1d88ab847..1cee371f3 100644 --- a/kate/app/kateexternaltools.h +++ b/kate/app/kateexternaltools.h @@ -51,7 +51,7 @@ * hidden if the current file is not of one of the indicated types. * */ -class KateExternalToolsMenuAction : public KActionMenu +class KateExternalToolsMenuAction : public TDEActionMenu { friend class KateExternalToolAction; @@ -65,20 +65,20 @@ class KateExternalToolsMenuAction : public KActionMenu */ void reload(); - class KActionCollection *actionCollection() { return m_actionCollection; } + class TDEActionCollection *actionCollection() { return m_actionCollection; } private slots: void slotDocumentChanged(); private: - class KActionCollection *m_actionCollection; + class TDEActionCollection *m_actionCollection; class KateMainWindow *mainwindow; // for the actions to access view/doc managers }; /** * This Action contains a KateExternalTool */ -class KateExternalToolAction : public KAction, public KWordMacroExpander +class KateExternalToolAction : public TDEAction, public KWordMacroExpander { Q_OBJECT public: @@ -168,7 +168,7 @@ class KateExternalToolsConfigWidget : public Kate::ConfigPage TQStringList m_removed; - class KListBox *lbTools; + class TDEListBox *lbTools; class TQPushButton *btnNew, *btnRemove, *btnEdit, *btnMoveUp, *btnMoveDwn; class TDEConfig *config; diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp index 7ddd1b7b1..9a900e6e8 100644 --- a/kate/app/katefilelist.cpp +++ b/kate/app/katefilelist.cpp @@ -83,7 +83,7 @@ class ToolTip : public TQToolTip KateFileList::KateFileList (KateMainWindow *main, KateViewManager *_viewManager, TQWidget * parent, const char * name ) - : KListView (parent, name) + : TDEListView (parent, name) , m_sort( KateFileList::sortByID ) { m_main = main; @@ -138,12 +138,12 @@ void KateFileList::setupActions () { windowNext = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(slotPrevDocument()), m_main->actionCollection()); windowPrev = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(slotNextDocument()), m_main->actionCollection()); - sortAction = new KSelectAction( i18n("Sort &By"), 0, + sortAction = new TDESelectAction( i18n("Sort &By"), 0, m_main->actionCollection(), "filelist_sortby" ); - listMoveFileUp = new KAction( i18n("Move File Up"), 0, m_main->actionCollection(), "filelist_move_up" ); - //listMoveFileUp->setShortcut(KShortcut(CTRL + SHIFT + Key_Comma)); - listMoveFileDown = new KAction( i18n("Move File Down"), 0, m_main->actionCollection(), "filelist_move_down" ); - //listMoveFileDown->setShortcut(KShortcut(CTRL + SHIFT + Key_Period)); + listMoveFileUp = new TDEAction( i18n("Move File Up"), 0, m_main->actionCollection(), "filelist_move_up" ); + //listMoveFileUp->setShortcut(TDEShortcut(CTRL + SHIFT + Key_Comma)); + listMoveFileDown = new TDEAction( i18n("Move File Down"), 0, m_main->actionCollection(), "filelist_move_down" ); + //listMoveFileDown->setShortcut(TDEShortcut(CTRL + SHIFT + Key_Period)); connect( listMoveFileUp, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(moveFileUp()) ); connect( listMoveFileDown, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(moveFileDown()) ); TQStringList l; @@ -166,7 +166,7 @@ void KateFileList::keyPressEvent(TQKeyEvent *e) { } else { - KListView::keyPressEvent(e); + TDEListView::keyPressEvent(e); } } @@ -179,12 +179,12 @@ void KateFileList::contentsMousePressEvent( TQMouseEvent *e ) if ( ! itemAt( contentsToViewport( e->pos() ) ) ) return; - KListView::contentsMousePressEvent( e ); + TDEListView::contentsMousePressEvent( e ); } void KateFileList::resizeEvent( TQResizeEvent *e ) { - KListView::resizeEvent( e ); + TDEListView::resizeEvent( e ); // ### We may want to actually calculate the widest field, // since it's not automatically scrinked. If I add support for diff --git a/kate/app/katefilelist.h b/kate/app/katefilelist.h index dd166b460..f310562bc 100644 --- a/kate/app/katefilelist.h +++ b/kate/app/katefilelist.h @@ -35,8 +35,8 @@ class KateMainWindow; -class KAction; -class KSelectAction; +class TDEAction; +class TDESelectAction; class KateFileListItem : public TQListViewItem { @@ -74,7 +74,7 @@ class KateFileListItem : public TQListViewItem uint m_docNumber; }; -class KateFileList : public KListView +class KateFileList : public TDEListView { Q_OBJECT @@ -152,11 +152,11 @@ class KateFileList : public KListView int m_sort; bool notify; - KAction* windowNext; - KAction* windowPrev; - KSelectAction* sortAction; - KAction* listMoveFileUp; - KAction* listMoveFileDown; + TDEAction* windowNext; + TDEAction* windowPrev; + TDESelectAction* sortAction; + TDEAction* listMoveFileUp; + TDEAction* listMoveFileDown; TQPtrList<KateFileListItem> m_viewHistory; TQPtrList<KateFileListItem> m_editHistory; diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp index beeed2082..7a0e429f8 100644 --- a/kate/app/katefileselector.cpp +++ b/kate/app/katefileselector.cpp @@ -71,7 +71,7 @@ static void silenceQToolBar(TQtMsgType, const char *){} // helper classes to be able to have a toolbar without move handle KateFileSelectorToolBar::KateFileSelectorToolBar(TQWidget *parent) - : KToolBar( parent, "Kate FileSelector Toolbar", true ) + : TDEToolBar( parent, "Kate FileSelector Toolbar", true ) { setMinimumWidth(10); } @@ -80,7 +80,7 @@ KateFileSelectorToolBar::~KateFileSelectorToolBar(){} void KateFileSelectorToolBar::setMovingEnabled( bool) { - KToolBar::setMovingEnabled(false); + TDEToolBar::setMovingEnabled(false); } @@ -111,7 +111,7 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow, mainwin(mainWindow), viewmanager(viewManager) { - mActionCollection = new KActionCollection( this ); + mActionCollection = new TDEActionCollection( this ); TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceQToolBar ); @@ -136,18 +136,18 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow, this, TQT_SLOT( selectorViewChanged(KFileView *) ) ); setStretchFactor(dir, 2); - KActionCollection *coll = dir->actionCollection(); + TDEActionCollection *coll = dir->actionCollection(); // some shortcuts of diroperator that clashes with Kate - coll->action( "delete" )->setShortcut( KShortcut( ALT + Key_Delete ) ); - coll->action( "reload" )->setShortcut( KShortcut( ALT + Key_F5 ) ); - coll->action( "back" )->setShortcut( KShortcut( ALT + SHIFT + Key_Left ) ); - coll->action( "forward" )->setShortcut( KShortcut( ALT + SHIFT + Key_Right ) ); + coll->action( "delete" )->setShortcut( TDEShortcut( ALT + Key_Delete ) ); + coll->action( "reload" )->setShortcut( TDEShortcut( ALT + Key_F5 ) ); + coll->action( "back" )->setShortcut( TDEShortcut( ALT + SHIFT + Key_Left ) ); + coll->action( "forward" )->setShortcut( TDEShortcut( ALT + SHIFT + Key_Right ) ); // some consistency - reset up for dir too - coll->action( "up" )->setShortcut( KShortcut( ALT + SHIFT + Key_Up ) ); - coll->action( "home" )->setShortcut( KShortcut( CTRL + ALT + Key_Home ) ); + coll->action( "up" )->setShortcut( TDEShortcut( ALT + SHIFT + Key_Up ) ); + coll->action( "home" )->setShortcut( TDEShortcut( CTRL + ALT + Key_Home ) ); // bookmarks action! - KActionMenu *acmBookmarks = new KActionMenu( i18n("Bookmarks"), "bookmark", + TDEActionMenu *acmBookmarks = new TDEActionMenu( i18n("Bookmarks"), "bookmark", mActionCollection, "bookmarks" ); acmBookmarks->setDelayed( false ); bookmarkHandler = new KBookmarkHandler( this, acmBookmarks->popupMenu() ); @@ -167,9 +167,9 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow, filter, TQT_SLOT( addToHistory(const TQString&) ) ); // kaction for the dir sync method - acSyncDir = new KAction( i18n("Current Document Folder"), "curfiledir", 0, + acSyncDir = new TDEAction( i18n("Current Document Folder"), "curfiledir", 0, TQT_TQOBJECT(this), TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" ); - toolbar->setIconText( KToolBar::IconOnly ); + toolbar->setIconText( TDEToolBar::IconOnly ); toolbar->setIconSize( 16 ); toolbar->setEnableContextMenu( false ); @@ -268,7 +268,7 @@ void KateFileSelector::setupToolbar( TDEConfig *config ) "short view" << "detailed view" << "bookmarks" << "sync_dir"; } - KAction *ac; + TDEAction *ac; for ( TQStringList::Iterator it=tbactions.begin(); it != tbactions.end(); ++it ) { if ( *it == "bookmarks" || *it == "sync_dir" ) ac = mActionCollection->action( (*it).latin1() ); @@ -534,7 +534,7 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KateFileSelect // Toolbar - a lot for a little... TQGroupBox *gbToolbar = new TQGroupBox( 1, Qt::Vertical, i18n("Toolbar"), this ); - acSel = new KActionSelector( gbToolbar ); + acSel = new TDEActionSelector( gbToolbar ); acSel->setAvailableLabel( i18n("A&vailable actions:") ); acSel->setSelectedLabel( i18n("S&elected actions:") ); lo->addWidget( gbToolbar ); @@ -689,7 +689,7 @@ void KFSConfigPage::init() "show hidden" << "properties"*/ << "bookmarks" << "sync_dir"; TQRegExp re("&(?=[^&])"); - KAction *ac; + TDEAction *ac; TQListBox *lb; for ( TQStringList::Iterator it=allActions.begin(); it != allActions.end(); ++it ) { lb = l.contains( *it ) ? acSel->selectedListBox() : acSel->availableListBox(); diff --git a/kate/app/katefileselector.h b/kate/app/katefileselector.h index 8028b3ede..ddacb6422 100644 --- a/kate/app/katefileselector.h +++ b/kate/app/katefileselector.h @@ -33,8 +33,8 @@ class KateMainWindow; class KateViewManager; -class KActionCollection; -class KActionSelector; +class TDEActionCollection; +class TDEActionSelector; class KFileView; /* @@ -46,7 +46,7 @@ class KFileView; */ /* I think this fix for not moving toolbars is better */ -class KateFileSelectorToolBar: public KToolBar +class KateFileSelectorToolBar: public TDEToolBar { Q_OBJECT public: @@ -88,7 +88,7 @@ class KateFileSelector : public TQVBox void setupToolbar( TDEConfig * ); void setView( KFile::FileView ); KDirOperator *dirOperator(){ return dir; } - KActionCollection *actionCollection() { return mActionCollection; }; + TDEActionCollection *actionCollection() { return mActionCollection; }; public slots: void slotFilterChange(const TQString&); @@ -113,11 +113,11 @@ class KateFileSelector : public TQVBox private: class KateFileSelectorToolBar *toolbar; - KActionCollection *mActionCollection; + TDEActionCollection *mActionCollection; class KBookmarkHandler *bookmarkHandler; KURLComboBox *cmbPath; KDirOperator * dir; - class KAction *acSyncDir; + class TDEAction *acSyncDir; KHistoryCombo * filter; class TQToolButton *btnFilter; @@ -159,7 +159,7 @@ class KFSConfigPage : public Kate::ConfigPage { void init(); KateFileSelector *fileSelector; - KActionSelector *acSel; + TDEActionSelector *acSel; class TQSpinBox *sbPathHistLength, *sbFilterHistLength; class TQCheckBox *cbSyncActive, *cbSyncShow; class TQCheckBox *cbSesLocation, *cbSesFilter; diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp index bd2e82749..a1f4cac1a 100644 --- a/kate/app/kategrepdialog.cpp +++ b/kate/app/kategrepdialog.cpp @@ -195,7 +195,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name) layout->activate(); - KAcceleratorManager::manage( this ); + TDEAcceleratorManager::manage( this ); TQWhatsThis::add(lPattern, i18n("<p>Enter the expression you want to search for here." diff --git a/kate/app/katemailfilesdialog.cpp b/kate/app/katemailfilesdialog.cpp index 79a1e19c6..651269bb7 100644 --- a/kate/app/katemailfilesdialog.cpp +++ b/kate/app/katemailfilesdialog.cpp @@ -57,7 +57,7 @@ KateMailDialog::KateMailDialog( TQWidget *parent, KateMainWindow *mainwin ) "<p>Press <strong>Mail...</strong> to email the current document." "<p>To select more documents to send, press <strong>Show All Documents >></strong>."), mw ); // TODO avoid untill needed - later - list = new KListView( mw ); + list = new TDEListView( mw ); list->addColumn( i18n("Name") ); list->addColumn( i18n("URL") ); Kate::Document *currentDoc = mainWindow->viewManager()->activeView()->getDoc(); diff --git a/kate/app/katemailfilesdialog.h b/kate/app/katemailfilesdialog.h index b083de471..a2de4e504 100644 --- a/kate/app/katemailfilesdialog.h +++ b/kate/app/katemailfilesdialog.h @@ -49,7 +49,7 @@ class KateMailDialog : public KDialogBase { private slots: void slotShowButton(); private: - class KListView *list; + class TDEListView *list; class TQLabel *lInfo; KateMainWindow *mainWindow; class TQVBox *mw; diff --git a/kate/app/katemain.h b/kate/app/katemain.h index 6a6eaedbc..374b834cc 100644 --- a/kate/app/katemain.h +++ b/kate/app/katemain.h @@ -36,21 +36,21 @@ class TQVBoxLayout; class TQString; class TQWidgetStack; -class KAction; -class KActionMenu; +class TDEAction; +class TDEActionMenu; class TDEConfig; class KDirOperator; class KEditToolbar; class KFileViewItem; class KHistoryCombo; class KLineEdit; -class KListBox; +class TDEListBox; class TDEProcess; class KPushButton; -class KRecentFilesAction; -class KSelectAction; +class TDERecentFilesAction; +class TDESelectAction; class KStatusBar; -class KToggleAction; +class TDEToggleAction; class KURL; class KURLComboBox; diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp index 5ef3c78e8..949166c86 100644 --- a/kate/app/katemainwindow.cpp +++ b/kate/app/katemainwindow.cpp @@ -237,7 +237,7 @@ void KateMainWindow::setupMainWindow () void KateMainWindow::setupActions() { - KAction *a; + TDEAction *a; KStdAction::openNew( TQT_TQOBJECT(m_viewManager), TQT_SLOT( slotDocumentNew() ), actionCollection(), "file_new" )->setWhatsThis(i18n("Create a new document")); KStdAction::open( TQT_TQOBJECT(m_viewManager), TQT_SLOT( slotDocumentOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Open an existing document for editing")); @@ -245,19 +245,19 @@ void KateMainWindow::setupActions() fileOpenRecent = KStdAction::openRecent (TQT_TQOBJECT(m_viewManager), TQT_SLOT(openURL (const KURL&)), actionCollection()); fileOpenRecent->setWhatsThis(i18n("This lists files which you have opened recently, and allows you to easily open them again.")); - a=new KAction( i18n("Save A&ll"),"save_all", CTRL+Key_L, KateDocManager::self(), TQT_SLOT( saveAll() ), actionCollection(), "file_save_all" ); + a=new TDEAction( i18n("Save A&ll"),"save_all", CTRL+Key_L, KateDocManager::self(), TQT_SLOT( saveAll() ), actionCollection(), "file_save_all" ); a->setWhatsThis(i18n("Save all open, modified documents to disk.")); KStdAction::close( TQT_TQOBJECT(m_viewManager), TQT_SLOT( slotDocumentClose() ), actionCollection(), "file_close" )->setWhatsThis(i18n("Close the current document.")); - a=new KAction( i18n( "Clos&e All" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotDocumentCloseAll() ), actionCollection(), "file_close_all" ); + a=new TDEAction( i18n( "Clos&e All" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotDocumentCloseAll() ), actionCollection(), "file_close_all" ); a->setWhatsThis(i18n("Close all open documents.")); KStdAction::mail( TQT_TQOBJECT(this), TQT_SLOT(slotMail()), actionCollection() )->setWhatsThis(i18n("Send one or more of the open documents as email attachments.")); KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotFileQuit() ), actionCollection(), "file_quit" )->setWhatsThis(i18n("Close this window")); - a=new KAction(i18n("&New Window"), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT(newWindow()), actionCollection(), "view_new_view"); + a=new TDEAction(i18n("&New Window"), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT(newWindow()), actionCollection(), "view_new_view"); a->setWhatsThis(i18n("Create a new Kate view (a new window with the same document list).")); if ( KateApp::self()->authorize("shell_access") ) @@ -266,10 +266,10 @@ void KateMainWindow::setupActions() externalTools->setWhatsThis( i18n("Launch external helper applications") ); } - KToggleAction* showFullScreenAction = KStdAction::fullScreen( 0, 0, actionCollection(),this); + TDEToggleAction* showFullScreenAction = KStdAction::fullScreen( 0, 0, actionCollection(),this); connect( showFullScreenAction,TQT_SIGNAL(toggled(bool)), this,TQT_SLOT(slotFullScreen(bool))); - documentOpenWith = new KActionMenu(i18n("Open W&ith"), actionCollection(), "file_open_with"); + documentOpenWith = new TDEActionMenu(i18n("Open W&ith"), actionCollection(), "file_open_with"); documentOpenWith->setWhatsThis(i18n("Open the current document using another application registered for its file type, or an application of your choice.")); connect(documentOpenWith->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(mSlotFixOpenWithMenu())); connect(documentOpenWith->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotOpenWithMenuAction(int))); @@ -280,19 +280,19 @@ void KateMainWindow::setupActions() a=KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection()); a->setWhatsThis(i18n("Configure which items should appear in the toolbar(s).")); - KAction* settingsConfigure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection(), "settings_configure"); + TDEAction* settingsConfigure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection(), "settings_configure"); settingsConfigure->setWhatsThis(i18n("Configure various aspects of this application and the editing component.")); // pipe to terminal action if (KateApp::self()->authorize("shell_access")) - new KAction(i18n("&Pipe to Console"), "pipe", 0, TQT_TQOBJECT(console), TQT_SLOT(slotPipeToConsole()), actionCollection(), "tools_pipe_to_terminal"); + new TDEAction(i18n("&Pipe to Console"), "pipe", 0, TQT_TQOBJECT(console), TQT_SLOT(slotPipeToConsole()), actionCollection(), "tools_pipe_to_terminal"); // tip of the day :-) KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( tipOfTheDay() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application.")); if (KatePluginManager::self()->pluginList().count() > 0) { - a=new KAction(i18n("&Plugins Handbook"), 0, TQT_TQOBJECT(this), TQT_SLOT(pluginHelp()), actionCollection(), "help_plugins_contents"); + a=new TDEAction(i18n("&Plugins Handbook"), 0, TQT_TQOBJECT(this), TQT_SLOT(pluginHelp()), actionCollection(), "help_plugins_contents"); a->setWhatsThis(i18n("This shows help files for various available plugins.")); } @@ -302,11 +302,11 @@ void KateMainWindow::setupActions() slotWindowActivated (); // session actions - new KAction(i18n("Menu entry Session->New", "&New"), "filenew", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionNew()), actionCollection(), "sessions_new"); - new KAction(i18n("&Open..."), "fileopen", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionOpen()), actionCollection(), "sessions_open"); - new KAction(i18n("&Save"), "filesave", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionSave()), actionCollection(), "sessions_save"); - new KAction(i18n("Save &As..."), "filesaveas", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionSaveAs()), actionCollection(), "sessions_save_as"); - new KAction(i18n("&Manage..."), "view_choose", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionManage()), actionCollection(), "sessions_manage"); + new TDEAction(i18n("Menu entry Session->New", "&New"), "filenew", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionNew()), actionCollection(), "sessions_new"); + new TDEAction(i18n("&Open..."), "fileopen", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionOpen()), actionCollection(), "sessions_open"); + new TDEAction(i18n("&Save"), "filesave", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionSave()), actionCollection(), "sessions_save"); + new TDEAction(i18n("Save &As..."), "filesaveas", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionSaveAs()), actionCollection(), "sessions_save_as"); + new TDEAction(i18n("&Manage..."), "view_choose", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionManage()), actionCollection(), "sessions_manage"); // quick open menu ;) new KateSessionsAction (i18n("&Quick Open"), actionCollection(), "sessions_list"); diff --git a/kate/app/katemainwindow.h b/kate/app/katemainwindow.h index ac31671db..0905f2b6a 100644 --- a/kate/app/katemainwindow.h +++ b/kate/app/katemainwindow.h @@ -40,7 +40,7 @@ namespace Kate { } class KFileItem; -class KRecentFilesAction; +class TDERecentFilesAction; class DCOPObject; class KateExternalToolsMenuAction; @@ -192,17 +192,17 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa // management items KateViewManager *m_viewManager; - KRecentFilesAction *fileOpenRecent; + TDERecentFilesAction *fileOpenRecent; KateFileList *filelist; KateFileSelector *fileselector; - KActionMenu* documentOpenWith; + TDEActionMenu* documentOpenWith; TQPopupMenu *documentMenu; - KToggleAction* settingsShowFilelist; - KToggleAction* settingsShowFileselector; + TDEToggleAction* settingsShowFilelist; + TDEToggleAction* settingsShowFileselector; KateExternalToolsMenuAction *externalTools; GrepTool * greptool; diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp index 8a001cdeb..6138915ab 100644 --- a/kate/app/katemdi.cpp +++ b/kate/app/katemdi.cpp @@ -66,9 +66,9 @@ int Splitter::idAfter ( TQWidget * w ) const //BEGIN TOGGLETOOLVIEWACTION -ToggleToolViewAction::ToggleToolViewAction ( const TQString& text, const KShortcut& cut, ToolView *tv, +ToggleToolViewAction::ToggleToolViewAction ( const TQString& text, const TDEShortcut& cut, ToolView *tv, TQObject* parent, const char* name ) - : KToggleAction(text,cut,parent,name) + : TDEToggleAction(text,cut,parent,name) , m_tv(tv) { connect(this,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotToggled(bool))); @@ -137,8 +137,8 @@ GUIClient::GUIClient ( MainWindow *mw ) if (actionCollection()->kaccel()==0) actionCollection()->setWidget(m_mw); - m_toolMenu = new KActionMenu(i18n("Tool &Views"),actionCollection(),"kate_mdi_toolview_menu"); - m_showSidebarsAction = new KToggleAction( i18n("Show Side&bars"), + m_toolMenu = new TDEActionMenu(i18n("Tool &Views"),actionCollection(),"kate_mdi_toolview_menu"); + m_showSidebarsAction = new TDEToggleAction( i18n("Show Side&bars"), CTRL|ALT|SHIFT|Key_F, actionCollection(), "kate_mdi_sidebar_visibility" ); m_showSidebarsAction->setCheckedState(i18n("Hide Side&bars")); m_showSidebarsAction->setChecked( m_mw->sidebarsVisible() ); @@ -146,7 +146,7 @@ GUIClient::GUIClient ( MainWindow *mw ) m_mw, TQT_SLOT( setSidebarsVisible( bool ) ) ); m_toolMenu->insert( m_showSidebarsAction ); - m_toolMenu->insert( new KActionSeparator( m_toolMenu ) ); + m_toolMenu->insert( new TDEActionSeparator( m_toolMenu ) ); // read shortcuts actionCollection()->readShortcutSettings( "Shortcuts", kapp->config() ); @@ -166,14 +166,14 @@ void GUIClient::registerToolView (ToolView *tv) TQString aname = TQString("kate_mdi_toolview_") + tv->id; // try to read the action shortcut - KShortcut sc; + TDEShortcut sc; TDEConfig *cfg = kapp->config(); TQString _grp = cfg->group(); cfg->setGroup("Shortcuts"); - sc = KShortcut( cfg->readEntry( aname, "" ) ); + sc = TDEShortcut( cfg->readEntry( aname, "" ) ); cfg->setGroup( _grp ); - KToggleAction *a = new ToggleToolViewAction(i18n("Show %1").arg(tv->text), + TDEToggleAction *a = new ToggleToolViewAction(i18n("Show %1").arg(tv->text), sc,tv, actionCollection(), aname.latin1() ); a->setCheckedState(TQString(i18n("Hide %1").arg(tv->text))); @@ -188,7 +188,7 @@ void GUIClient::registerToolView (ToolView *tv) void GUIClient::unregisterToolView (ToolView *tv) { - KAction *a = m_toolToAction[tv]; + TDEAction *a = m_toolToAction[tv]; if (!a) return; @@ -214,7 +214,7 @@ void GUIClient::updateActions() unplugActionList( actionListName ); - TQPtrList<KAction> addList; + TQPtrList<TDEAction> addList; addList.append(m_toolMenu); plugActionList( actionListName, addList ); @@ -460,7 +460,7 @@ bool Sidebar::eventFilter(TQObject *obj, TQEvent *ev) if (w) { - KPopupMenu *p = new KPopupMenu (this); + TDEPopupMenu *p = new TDEPopupMenu (this); p->insertTitle(SmallIcon("view_remove"), i18n("Behavior"), 50); diff --git a/kate/app/katemdi.h b/kate/app/katemdi.h index 148d57ea9..4cc63abac 100644 --- a/kate/app/katemdi.h +++ b/kate/app/katemdi.h @@ -58,13 +58,13 @@ class Splitter : public TQSplitter int idAfter ( TQWidget * w ) const; }; -class ToggleToolViewAction : public KToggleAction +class ToggleToolViewAction : public TDEToggleAction { Q_OBJECT public: - ToggleToolViewAction ( const TQString& text, const KShortcut& cut, + ToggleToolViewAction ( const TQString& text, const TDEShortcut& cut, class ToolView *tv, TQObject* parent = 0, const char* name = 0 ); virtual ~ToggleToolViewAction(); @@ -96,10 +96,10 @@ class GUIClient : public TQObject, public KXMLGUIClient private: MainWindow *m_mw; - KToggleAction *m_showSidebarsAction; - TQPtrList<KAction> m_toolViewActions; - TQMap<ToolView*, KAction*> m_toolToAction; - KActionMenu *m_toolMenu; + TDEToggleAction *m_showSidebarsAction; + TQPtrList<TDEAction> m_toolViewActions; + TQMap<ToolView*, TDEAction*> m_toolToAction; + TDEActionMenu *m_toolMenu; }; class ToolView : public TQVBox diff --git a/kate/app/katemwmodonhddialog.cpp b/kate/app/katemwmodonhddialog.cpp index e8bee5a35..d81e0de60 100644 --- a/kate/app/katemwmodonhddialog.cpp +++ b/kate/app/katemwmodonhddialog.cpp @@ -43,7 +43,7 @@ class KateDocItem : public TQCheckListItem { public: - KateDocItem( Kate::Document *doc, const TQString &status, KListView *lv ) + KateDocItem( Kate::Document *doc, const TQString &status, TDEListView *lv ) : TQCheckListItem( lv, doc->url().prettyURL(), CheckBox ), document( doc ) { @@ -89,7 +89,7 @@ KateMwModOnHdDialog::KateMwModOnHdDialog( DocVector docs, TQWidget *parent, cons lo1->setStretchFactor( t, 1000 ); // document list - lvDocuments = new KListView( w ); + lvDocuments = new TDEListView( w ); lvDocuments->addColumn( i18n("Filename") ); lvDocuments->addColumn( i18n("Status on Disk") ); lvDocuments->setSelectionMode( TQListView::Single ); diff --git a/kate/app/katemwmodonhddialog.h b/kate/app/katemwmodonhddialog.h index 5cc406e92..3ae4d072a 100644 --- a/kate/app/katemwmodonhddialog.h +++ b/kate/app/katemwmodonhddialog.h @@ -52,7 +52,7 @@ class KateMwModOnHdDialog : public KDialogBase private: enum Action { Ignore, Overwrite, Reload }; void handleSelected( int action ); - class KListView *lvDocuments; + class TDEListView *lvDocuments; class TQPushButton *btnDiff; class KTempFile *m_tmpfile; }; diff --git a/kate/app/katesavemodifieddialog.cpp b/kate/app/katesavemodifieddialog.cpp index 2f0fe3aa5..144e701e2 100644 --- a/kate/app/katesavemodifieddialog.cpp +++ b/kate/app/katesavemodifieddialog.cpp @@ -140,7 +140,7 @@ KateSaveModifiedDialog::KateSaveModifiedDialog(TQWidget *parent, TQPtrList<Kate: TQVBox *box=makeVBoxMainWidget(); new KActiveLabel(i18n("<qt>The following documents have been modified. Do you want to save them before closing?</qt>"),box); - m_list=new KListView(box); + m_list=new TDEListView(box); m_list->addColumn(i18n("Title")); m_list->addColumn(i18n("Location")); m_list->setRootIsDecorated(true); diff --git a/kate/app/katesavemodifieddialog.h b/kate/app/katesavemodifieddialog.h index 73062f563..92036c63c 100644 --- a/kate/app/katesavemodifieddialog.h +++ b/kate/app/katesavemodifieddialog.h @@ -23,7 +23,7 @@ #include <kate/document.h> class TQListViewItem; -class KListView; +class TDEListView; class KateSaveModifiedDialog: public KDialogBase { Q_OBJECT @@ -42,7 +42,7 @@ protected slots: private: TQListViewItem *m_projectRoot; TQListViewItem *m_documentRoot; - KListView *m_list; + TDEListView *m_list; }; #endif diff --git a/kate/app/katesession.cpp b/kate/app/katesession.cpp index 104c4abda..168b760f1 100644 --- a/kate/app/katesession.cpp +++ b/kate/app/katesession.cpp @@ -599,7 +599,7 @@ void KateSessionManager::sessionManage () class KateSessionChooserItem : public TQListViewItem { public: - KateSessionChooserItem (KListView *lv, KateSession::Ptr s) + KateSessionChooserItem (TDEListView *lv, KateSession::Ptr s) : TQListViewItem (lv, s->sessionName()) , session (s) { @@ -638,7 +638,7 @@ KateSessionChooser::KateSessionChooser (TQWidget *parent, const TQString &lastSe TQVBox *vb = new TQVBox (hb); vb->setSpacing (KDialog::spacingHint()); - m_sessions = new KListView (vb); + m_sessions = new TDEListView (vb); m_sessions->addColumn (i18n("Session Name")); m_sessions->addColumn (i18n("Open Documents")); m_sessions->setResizeMode (TQListView::AllColumns); @@ -728,7 +728,7 @@ KateSessionOpenDialog::KateSessionOpenDialog (TQWidget *parent) TQVBox *vb = new TQVBox (hb); - m_sessions = new KListView (vb); + m_sessions = new TDEListView (vb); m_sessions->addColumn (i18n("Session Name")); m_sessions->addColumn (i18n("Open Documents")); m_sessions->setResizeMode (TQListView::AllColumns); @@ -792,7 +792,7 @@ KateSessionManageDialog::KateSessionManageDialog (TQWidget *parent) TQHBox *hb = new TQHBox (page); hb->setSpacing (KDialog::spacingHint()); - m_sessions = new KListView (hb); + m_sessions = new TDEListView (hb); m_sessions->addColumn (i18n("Session Name")); m_sessions->addColumn (i18n("Open Documents")); m_sessions->setResizeMode (TQListView::AllColumns); @@ -889,7 +889,7 @@ void KateSessionManageDialog::updateSessionList () KateSessionsAction::KateSessionsAction(const TQString& text, TQObject* parent, const char* name ) - : KActionMenu(text, parent, name) + : TDEActionMenu(text, parent, name) { connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow())); } diff --git a/kate/app/katesession.h b/kate/app/katesession.h index d96ed740b..1b3c4a966 100644 --- a/kate/app/katesession.h +++ b/kate/app/katesession.h @@ -32,7 +32,7 @@ class KateSessionManager; class KDirWatch; -class KListView; +class TDEListView; class KPushButton; class TQCheckBox; @@ -326,7 +326,7 @@ class KateSessionChooser : public KDialogBase void selectionChanged (); private: - KListView *m_sessions; + TDEListView *m_sessions; TQCheckBox *m_useLast; }; @@ -357,7 +357,7 @@ class KateSessionOpenDialog : public KDialogBase void slotUser2 (); private: - KListView *m_sessions; + TDEListView *m_sessions; }; class KateSessionManageDialog : public KDialogBase @@ -396,12 +396,12 @@ class KateSessionManageDialog : public KDialogBase void updateSessionList (); private: - KListView *m_sessions; + TDEListView *m_sessions; KPushButton *m_rename; KPushButton *m_del; }; -class KateSessionsAction : public KActionMenu +class KateSessionsAction : public TDEActionMenu { Q_OBJECT diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp index 0e7e15cb5..39a969b6f 100644 --- a/kate/app/kateviewmanager.cpp +++ b/kate/app/kateviewmanager.cpp @@ -89,52 +89,52 @@ KateViewManager::~KateViewManager () void KateViewManager::setupActions () { - KAction *a; + TDEAction *a; /** * tabbing */ - a=new KAction ( i18n("New Tab"),"tab_new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewTab()), + a=new TDEAction ( i18n("New Tab"),"tab_new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewTab()), m_mainWindow->actionCollection(), "view_new_tab" ); - m_closeTab = new KAction ( i18n("Close Current Tab"),"tab_remove",0,TQT_TQOBJECT(this),TQT_SLOT(slotCloseTab()), + m_closeTab = new TDEAction ( i18n("Close Current Tab"),"tab_remove",0,TQT_TQOBJECT(this),TQT_SLOT(slotCloseTab()), m_mainWindow->actionCollection(),"view_close_tab"); m_activateNextTab - = new KAction( i18n( "Activate Next Tab" ), - TQApplication::reverseLayout() ? KStdAccel::tabPrev() : KStdAccel::tabNext(), + = new TDEAction( i18n( "Activate Next Tab" ), + TQApplication::reverseLayout() ? TDEStdAccel::tabPrev() : TDEStdAccel::tabNext(), TQT_TQOBJECT(this), TQT_SLOT( activateNextTab() ), m_mainWindow->actionCollection(), "view_next_tab" ); m_activatePrevTab - = new KAction( i18n( "Activate Previous Tab" ), - TQApplication::reverseLayout() ? KStdAccel::tabNext() : KStdAccel::tabPrev(), + = new TDEAction( i18n( "Activate Previous Tab" ), + TQApplication::reverseLayout() ? TDEStdAccel::tabNext() : TDEStdAccel::tabPrev(), TQT_TQOBJECT(this), TQT_SLOT( activatePrevTab() ), m_mainWindow->actionCollection(), "view_prev_tab" ); /** * view splitting */ - a=new KAction ( i18n("Split Ve&rtical"), "view_right", CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), TQT_SLOT( + a=new TDEAction ( i18n("Split Ve&rtical"), "view_right", CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), TQT_SLOT( slotSplitViewSpaceVert() ), m_mainWindow->actionCollection(), "view_split_vert"); a->setWhatsThis(i18n("Split the currently active view vertically into two views.")); - a=new KAction ( i18n("Split &Horizontal"), "view_bottom", CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), TQT_SLOT( + a=new TDEAction ( i18n("Split &Horizontal"), "view_bottom", CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), TQT_SLOT( slotSplitViewSpaceHoriz() ), m_mainWindow->actionCollection(), "view_split_horiz"); a->setWhatsThis(i18n("Split the currently active view horizontally into two views.")); - m_closeView = new KAction ( i18n("Cl&ose Current View"), "view_remove", CTRL+SHIFT+Key_R, TQT_TQOBJECT(this), + m_closeView = new TDEAction ( i18n("Cl&ose Current View"), "view_remove", CTRL+SHIFT+Key_R, TQT_TQOBJECT(this), TQT_SLOT( slotCloseCurrentViewSpace() ), m_mainWindow->actionCollection(), "view_close_current_space" ); m_closeView->setWhatsThis(i18n("Close the currently active splitted view")); - goNext=new KAction(i18n("Next View"),Key_F8,TQT_TQOBJECT(this), + goNext=new TDEAction(i18n("Next View"),Key_F8,TQT_TQOBJECT(this), TQT_SLOT(activateNextView()),m_mainWindow->actionCollection(),"go_next"); goNext->setWhatsThis(i18n("Make the next split view the active one.")); - goPrev=new KAction(i18n("Previous View"),SHIFT+Key_F8, TQT_TQOBJECT(this), TQT_SLOT(activatePrevView()),m_mainWindow->actionCollection(),"go_prev"); + goPrev=new TDEAction(i18n("Previous View"),SHIFT+Key_F8, TQT_TQOBJECT(this), TQT_SLOT(activatePrevView()),m_mainWindow->actionCollection(),"go_prev"); goPrev->setWhatsThis(i18n("Make the previous split view the active one.")); diff --git a/kate/app/kateviewmanager.h b/kate/app/kateviewmanager.h index 01df13492..d16b59dc2 100644 --- a/kate/app/kateviewmanager.h +++ b/kate/app/kateviewmanager.h @@ -32,7 +32,7 @@ class KateMainWindow; class KateViewSpaceContainer; class TDEConfig; -class KAction; +class TDEAction; class TQToolButton; @@ -143,12 +143,12 @@ class KateViewManager : public TQObject bool m_init; TQToolButton *m_closeTabButton; - KAction *m_closeView; - KAction *m_closeTab; - KAction *m_activateNextTab; - KAction *m_activatePrevTab; - KAction *goNext; - KAction *goPrev; + TDEAction *m_closeView; + TDEAction *m_closeTab; + TDEAction *m_activateNextTab; + TDEAction *m_activatePrevTab; + TDEAction *goNext; + TDEAction *goPrev; }; #endif diff --git a/kate/app/kateviewspace.cpp b/kate/app/kateviewspace.cpp index 1d37c6f1d..5bbd544de 100644 --- a/kate/app/kateviewspace.cpp +++ b/kate/app/kateviewspace.cpp @@ -397,7 +397,7 @@ void KateVSStatusBar::modifiedChanged() void KateVSStatusBar::showMenu() { - KMainWindow* mainWindow = static_cast<KMainWindow*>( topLevelWidget() ); + TDEMainWindow* mainWindow = static_cast<TDEMainWindow*>( topLevelWidget() ); TQPopupMenu* menu = static_cast<TQPopupMenu*>( mainWindow->factory()->container("viewspace_popup", mainWindow ) ); if (menu) diff --git a/kate/app/kbookmarkhandler.cpp b/kate/app/kbookmarkhandler.cpp index bdb85130b..35fa87fec 100644 --- a/kate/app/kbookmarkhandler.cpp +++ b/kate/app/kbookmarkhandler.cpp @@ -35,7 +35,7 @@ #include "kbookmarkhandler.moc" -KBookmarkHandler::KBookmarkHandler( KateFileSelector *parent, KPopupMenu* kpopupmenu ) +KBookmarkHandler::KBookmarkHandler( KateFileSelector *parent, TDEPopupMenu* kpopupmenu ) : TQObject( parent, "KBookmarkHandler" ), KBookmarkOwner(), mParent( parent ), @@ -43,7 +43,7 @@ KBookmarkHandler::KBookmarkHandler( KateFileSelector *parent, KPopupMenu* kpopup m_importStream( 0L ) { if (!m_menu) - m_menu = new KPopupMenu( parent, "bookmark menu" ); + m_menu = new TDEPopupMenu( parent, "bookmark menu" ); TQString file = locate( "data", "kate/fsbookmarks.xml" ); if ( file.isEmpty() ) diff --git a/kate/app/kbookmarkhandler.h b/kate/app/kbookmarkhandler.h index 254231921..6147a9d73 100644 --- a/kate/app/kbookmarkhandler.h +++ b/kate/app/kbookmarkhandler.h @@ -25,24 +25,24 @@ class KateFileSelector; -class KActionMenu; +class TDEActionMenu; class TQTextStream; -class KPopupMenu; +class TDEPopupMenu; class KBookmarkHandler : public TQObject, public KBookmarkOwner { Q_OBJECT public: - KBookmarkHandler( KateFileSelector *parent, KPopupMenu *kpopupmenu=0 ); + KBookmarkHandler( KateFileSelector *parent, TDEPopupMenu *kpopupmenu=0 ); ~KBookmarkHandler(); // KBookmarkOwner interface: virtual void openBookmarkURL( const TQString& url ) { emit openURL( url ); } virtual TQString currentURL() const; - KPopupMenu *menu() const { return m_menu; } + TDEPopupMenu *menu() const { return m_menu; } signals: void openURL( const TQString& url ); @@ -60,7 +60,7 @@ protected: private: KateFileSelector *mParent; - KPopupMenu *m_menu; + TDEPopupMenu *m_menu; KBookmarkMenu *m_bookmarkMenu; TQTextStream *m_importStream; diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp index e5c0689e5..641db4865 100644 --- a/kate/app/kwritemain.cpp +++ b/kate/app/kwritemain.cpp @@ -150,11 +150,11 @@ void KWrite::setupActions() actionCollection()); m_recentFiles->setWhatsThis(i18n("This lists files which you have opened recently, and allows you to easily open them again.")); - KAction *a=new KAction(i18n("&New Window"), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT(newView()), + TDEAction *a=new TDEAction(i18n("&New Window"), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT(newView()), actionCollection(), "view_new_view"); a->setWhatsThis(i18n("Create another view containing the current document")); - a=new KAction(i18n("Choose Editor Component..."),0,TQT_TQOBJECT(this),TQT_SLOT(changeEditor()), + a=new TDEAction(i18n("Choose Editor Component..."),0,TQT_TQOBJECT(this),TQT_SLOT(changeEditor()), actionCollection(),"settings_choose_editor"); a->setWhatsThis(i18n("Override the system wide setting for the default editing component")); @@ -166,7 +166,7 @@ void KWrite::setupActions() m_paShowStatusBar = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(toggleStatusBar()), actionCollection(), "settings_show_statusbar"); m_paShowStatusBar->setWhatsThis(i18n("Use this command to show or hide the view's statusbar")); - m_paShowPath = new KToggleAction(i18n("Sho&w Path"), 0, TQT_TQOBJECT(this), TQT_SLOT(newCaption()), + m_paShowPath = new TDEToggleAction(i18n("Sho&w Path"), 0, TQT_TQOBJECT(this), TQT_SLOT(newCaption()), actionCollection(), "set_showPath"); m_paShowPath->setCheckedState(i18n("Hide Path")); m_paShowPath->setWhatsThis(i18n("Show the complete document path in the window caption")); @@ -379,9 +379,9 @@ void KWrite::slotDropEvent( TQDropEvent *event ) void KWrite::slotEnableActions( bool enable ) { - TQValueList<KAction *> actions = actionCollection()->actions(); - TQValueList<KAction *>::ConstIterator it = actions.begin(); - TQValueList<KAction *>::ConstIterator end = actions.end(); + TQValueList<TDEAction *> actions = actionCollection()->actions(); + TQValueList<TDEAction *>::ConstIterator it = actions.begin(); + TQValueList<TDEAction *>::ConstIterator end = actions.end(); for (; it != end; ++it ) (*it)->setEnabled( enable ); diff --git a/kate/app/kwritemain.h b/kate/app/kwritemain.h index 52e34c568..fc47c6522 100644 --- a/kate/app/kwritemain.h +++ b/kate/app/kwritemain.h @@ -30,10 +30,10 @@ namespace KTextEditor { class EditorChooser; } -class KAction; -class KToggleAction; -class KSelectAction; -class KRecentFilesAction; +class TDEAction; +class TDEToggleAction; +class TDESelectAction; +class TDERecentFilesAction; class KWrite : public KParts::MainWindow { @@ -110,9 +110,9 @@ class KWrite : public KParts::MainWindow private: KTextEditor::View * m_view; - KRecentFilesAction * m_recentFiles; - KToggleAction * m_paShowPath; - KToggleAction * m_paShowStatusBar; + TDERecentFilesAction * m_recentFiles; + TDEToggleAction * m_paShowPath; + TDEToggleAction * m_paShowStatusBar; TQString encoding; diff --git a/kate/utils/listboxview.cpp b/kate/utils/listboxview.cpp index a71ea038b..a3f56700f 100644 --- a/kate/utils/listboxview.cpp +++ b/kate/utils/listboxview.cpp @@ -26,7 +26,7 @@ namespace Kate { // private storage class ListboxViewPrivate { public: - KListBox *listbox; + TDEListBox *listbox; }; } @@ -35,14 +35,14 @@ Kate::ListboxView::ListboxView( TQWidget *parent, const char *name ) : Kate::DockViewBase( parent, name), d( new Kate::ListboxViewPrivate) { - d->listbox = new KListBox( this ); + d->listbox = new TDEListBox( this ); } Kate::ListboxView::ListboxView( const TQString &titlePrefix, const TQString &title, TQWidget *parent, const char *name ) : Kate::DockViewBase( titlePrefix, title, parent, name), d( new Kate::ListboxViewPrivate) { - d->listbox = new KListBox( this ); + d->listbox = new TDEListBox( this ); } Kate::ListboxView::~ListboxView() @@ -50,7 +50,7 @@ Kate::ListboxView::~ListboxView() delete d; } -KListBox *Kate::ListboxView::listbox() +TDEListBox *Kate::ListboxView::listbox() { return d->listbox; } diff --git a/kate/utils/listboxview.h b/kate/utils/listboxview.h index 7fee0d808..a9194632d 100644 --- a/kate/utils/listboxview.h +++ b/kate/utils/listboxview.h @@ -21,7 +21,7 @@ #include "dockviewbase.h" -class KListBox; +class TDEListBox; namespace Kate { @@ -33,7 +33,7 @@ class ListboxView : public DockViewBase { ListboxView( const TQString &titlePrefix, const TQString &title, TQWidget *parent=0, const char *name=0 ); ~ListboxView(); - KListBox * listbox(); + TDEListBox * listbox(); private: class ListboxViewPrivate *d; diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp index baf56c5c3..6bb368fe2 100644 --- a/kcontrol/colors/colorscm.cpp +++ b/kcontrol/colors/colorscm.cpp @@ -145,7 +145,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis TQGroupBox *group = new TQVGroupBox( i18n("Color Scheme"), this ); topLayout->addWidget( group, 1, 0 ); - sList = new KListBox( group ); + sList = new TDEListBox( group ); mSchemeList = new KColorSchemeList(); readSchemeNames(); sList->setCurrentItem( 0 ); diff --git a/kcontrol/colors/colorscm.h b/kcontrol/colors/colorscm.h index abfd3d403..ca8718f74 100644 --- a/kcontrol/colors/colorscm.h +++ b/kcontrol/colors/colorscm.h @@ -25,7 +25,7 @@ class TQCheckBox; class TQResizeEvent; class KLineEdit; class TQPalette; -class KListBox; +class TDEListBox; class KColorButton; class TDEConfig; class KStdDirs; @@ -76,7 +76,7 @@ private: TQSlider *sb; TQComboBox *wcCombo; TQPushButton *addBt, *removeBt, *importBt; - KListBox *sList; + TDEListBox *sList; KColorSchemeList *mSchemeList; TQString sCurrentScheme; diff --git a/kcontrol/componentchooser/componentchooser_ui.ui b/kcontrol/componentchooser/componentchooser_ui.ui index fb5915f1b..697759af4 100644 --- a/kcontrol/componentchooser/componentchooser_ui.ui +++ b/kcontrol/componentchooser/componentchooser_ui.ui @@ -97,7 +97,7 @@ </widget> </vbox> </widget> - <widget class="KListBox" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TDEListBox" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>ServiceChooser</cstring> </property> diff --git a/kcontrol/css/kcmcss.cpp b/kcontrol/css/kcmcss.cpp index b35c9c04c..d69023db5 100644 --- a/kcontrol/css/kcmcss.cpp +++ b/kcontrol/css/kcmcss.cpp @@ -47,7 +47,7 @@ CSSConfig::CSSConfig(TQWidget *parent, const char *name, const TQStringList &) TQStringList fonts; - KFontChooser::getFontList(fonts, 0); + TDEFontChooser::getFontList(fonts, 0); customDialog->fontFamily->insertStringList(fonts); connect(configDialog->useDefault, TQT_SIGNAL(clicked()), diff --git a/kcontrol/displayconfig/displayconfig.h b/kcontrol/displayconfig/displayconfig.h index 3591bd93d..a52ebb3fc 100644 --- a/kcontrol/displayconfig/displayconfig.h +++ b/kcontrol/displayconfig/displayconfig.h @@ -41,8 +41,8 @@ #include "displayconfigbase.h" class TDEConfig; -class KPopupMenu; -class KListViewItem; +class TDEPopupMenu; +class TDEListViewItem; typedef TQMap< TQString, TQPtrList< SingleScreenData > > ScreenConfigurationMap; diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui b/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui index f036dd6be..5e9545270 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui +++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui @@ -168,7 +168,7 @@ Select the search engine to use for input boxes that provide automatic lookup se </size> </property> </spacer> - <widget class="KListView" row="0" column="0" rowspan="4" colspan="2"> + <widget class="TDEListView" row="0" column="0" rowspan="4" colspan="2"> <column> <property name="text"> <string>Name</string> diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp index 89310a137..e898bd0db 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp +++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp @@ -69,7 +69,7 @@ static bool isValidShortURL( const TQString& cmd, bool verbose = false ) if ( cmd.contains( exp ) ) { if (verbose) - kdDebug() << "KShortURIFilter::isValidShortURL: " << cmd + kdDebug() << "TDEShortURIFilter::isValidShortURL: " << cmd << " matches FQDN_PATTERN" << endl; // bug 133687 @@ -88,7 +88,7 @@ static bool isValidShortURL( const TQString& cmd, bool verbose = false ) if ( cmd.contains( exp ) ) { if (verbose) - kdDebug() << "KShortURIFilter::isValidShortURL: " << cmd + kdDebug() << "TDEShortURIFilter::isValidShortURL: " << cmd << " matches IPv4_PATTERN" << endl; return true; } @@ -98,13 +98,13 @@ static bool isValidShortURL( const TQString& cmd, bool verbose = false ) if ( cmd.contains( exp ) ) { if (verbose) - kdDebug() << "KShortURIFilter::isValidShortURL: " << cmd + kdDebug() << "TDEShortURIFilter::isValidShortURL: " << cmd << " matches IPv6_PATTERN" << endl; return true; } if (verbose) - kdDebug() << "KShortURIFilter::isValidShortURL: '" << cmd + kdDebug() << "TDEShortURIFilter::isValidShortURL: '" << cmd << "' is not a short URL." << endl; return false; @@ -134,15 +134,15 @@ static TQString removeArgs( const TQString& _cmd ) return cmd; } -KShortURIFilter::KShortURIFilter( TQObject *parent, const char *name, +TDEShortURIFilter::TDEShortURIFilter( TQObject *parent, const char *name, const TQStringList & /*args*/ ) :KURIFilterPlugin( parent, name ? name : "kshorturifilter", 1.0), - DCOPObject("KShortURIFilterIface") + DCOPObject("TDEShortURIFilterIface") { configure(); } -bool KShortURIFilter::filterURI( KURIFilterData& data ) const +bool TDEShortURIFilter::filterURI( KURIFilterData& data ) const { /* * Here is a description of how the shortURI deals with the supplied @@ -533,23 +533,23 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const return false; } -TDECModule* KShortURIFilter::configModule( TQWidget*, const char* ) const +TDECModule* TDEShortURIFilter::configModule( TQWidget*, const char* ) const { - return 0; //new KShortURIOptions( parent, name ); + return 0; //new TDEShortURIOptions( parent, name ); } -TQString KShortURIFilter::configName() const +TQString TDEShortURIFilter::configName() const { return i18n("&ShortURLs"); } -void KShortURIFilter::configure() +void TDEShortURIFilter::configure() { TDEConfig config( name() + QFL1("rc"), false, false ); m_bVerbose = config.readBoolEntry( "Verbose", false ); if ( m_bVerbose ) - kdDebug() << "KShortURIFilter::configure: Config reload request..." << endl; + kdDebug() << "TDEShortURIFilter::configure: Config reload request..." << endl; m_strDefaultProtocol = config.readEntry( "DefaultProtocol", QFL1("http://") ); EntryMap patterns = config.entryMap( QFL1("Pattern") ); @@ -571,6 +571,6 @@ void KShortURIFilter::configure() } K_EXPORT_COMPONENT_FACTORY( libkshorturifilter, - KGenericFactory<KShortURIFilter>( "kcmkurifilt" ) ) + KGenericFactory<TDEShortURIFilter>( "kcmkurifilt" ) ) #include "kshorturifilter.moc" diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h index 33ba20cad..16eb0cd02 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h +++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h @@ -37,7 +37,7 @@ class TDEInstance; * @author Dawit Alemayehu <[email protected]> * @author Malte Starostik <[email protected]> */ -class KShortURIFilter : public KURIFilterPlugin , public DCOPObject +class TDEShortURIFilter : public KURIFilterPlugin , public DCOPObject { K_DCOP Q_OBJECT @@ -49,13 +49,13 @@ public: * @param parent the parent of this class. * @param name the internal name for this object. */ - KShortURIFilter( TQObject *parent = 0, const char *name = 0, + TDEShortURIFilter( TQObject *parent = 0, const char *name = 0, const TQStringList &args = TQStringList() ); /** * Destructor */ - virtual ~KShortURIFilter() {}; + virtual ~TDEShortURIFilter() {}; /** * Converts short URIs into fully qualified valid URIs diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp index bf8551fb7..a47743bc6 100644 --- a/kcontrol/filetypes/filetypesview.cpp +++ b/kcontrol/filetypes/filetypesview.cpp @@ -75,7 +75,7 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name) TQWhatsThis::add( patternFilterLE, wtstr ); TQWhatsThis::add( patternFilterLBL, wtstr ); - typesLV = new KListView(this); + typesLV = new TDEListView(this); typesLV->setRootIsDecorated(true); typesLV->setFullWidth(true); diff --git a/kcontrol/filetypes/filetypesview.h b/kcontrol/filetypes/filetypesview.h index 63909d718..405238e0e 100644 --- a/kcontrol/filetypes/filetypesview.h +++ b/kcontrol/filetypes/filetypesview.h @@ -10,7 +10,7 @@ #include "typeslistitem.h" class TQLabel; -class KListView; +class TDEListView; class TQListViewItem; class TQListBox; class TQPushButton; @@ -51,7 +51,7 @@ protected: bool sync( TQValueList<TypesListItem *>& itemsModified ); private: - KListView *typesLV; + TDEListView *typesLV; TQPushButton *m_removeTypeB; TQWidgetStack * m_widgetStack; diff --git a/kcontrol/filetypes/kserviceselectdlg.cpp b/kcontrol/filetypes/kserviceselectdlg.cpp index c8b203d84..b0cf1e3b1 100644 --- a/kcontrol/filetypes/kserviceselectdlg.cpp +++ b/kcontrol/filetypes/kserviceselectdlg.cpp @@ -33,7 +33,7 @@ KServiceSelectDlg::KServiceSelectDlg( const TQString& /*serviceType*/, const TQS vbox->setSpacing( KDialog::spacingHint() ); new TQLabel( i18n( "Select service:" ), vbox ); - m_listbox=new KListBox( vbox ); + m_listbox=new TDEListBox( vbox ); // Can't make a TDETrader query since we don't have a servicetype to give, // we want all services that are not applications....... diff --git a/kcontrol/filetypes/kserviceselectdlg.h b/kcontrol/filetypes/kserviceselectdlg.h index 6f9bbe568..3b3ea87e7 100644 --- a/kcontrol/filetypes/kserviceselectdlg.h +++ b/kcontrol/filetypes/kserviceselectdlg.h @@ -41,7 +41,7 @@ public: */ KService::Ptr service(); private: - KListBox * m_listbox; + TDEListBox * m_listbox; }; #endif diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp index 7efe76b6d..e450629f1 100644 --- a/kcontrol/fonts/fonts.cpp +++ b/kcontrol/fonts/fonts.cpp @@ -126,7 +126,7 @@ static const char *aa_vbgr_xpm[]={ static const char** aaPixmaps[]={ aa_rgb_xpm, aa_bgr_xpm, aa_vrgb_xpm, aa_vbgr_xpm }; /**** DLL Interface ****/ -typedef KGenericFactory<KFonts, TQWidget> FontFactory; +typedef KGenericFactory<TDEFonts, TQWidget> FontFactory; K_EXPORT_COMPONENT_FACTORY( kcm_fonts, FontFactory("kcmfonts") ) /**** FontUseItem ****/ @@ -140,13 +140,13 @@ FontUseItem::FontUseItem( const TQFont &default_fnt, bool f ) - : KFontRequester(parent, 0L, f), + : TDEFontRequester(parent, 0L, f), _rcfile(rc), _rcgroup(grp), _rckey(key), _default(default_fnt) { - KAcceleratorManager::setNoAccel( this ); + TDEAcceleratorManager::setNoAccel( this ); setTitle( name ); readFont( false ); } @@ -198,13 +198,13 @@ void FontUseItem::applyFontDiff( const TQFont &fnt, int fontDiffFlags ) { TQFont _font( font() ); - if (fontDiffFlags & KFontChooser::FontDiffSize) { + if (fontDiffFlags & TDEFontChooser::FontDiffSize) { _font.setPointSize( fnt.pointSize() ); } - if (fontDiffFlags & KFontChooser::FontDiffFamily) { + if (fontDiffFlags & TDEFontChooser::FontDiffFamily) { if (!isFixedOnly()) _font.setFamily( fnt.family() ); } - if (fontDiffFlags & KFontChooser::FontDiffStyle) { + if (fontDiffFlags & TDEFontChooser::FontDiffStyle) { _font.setBold( fnt.bold() ); _font.setItalic( fnt.italic() ); _font.setUnderline( fnt.underline() ); @@ -490,7 +490,7 @@ int FontAASettings::exec() return i && changesMade; } -/**** KFonts ****/ +/**** TDEFonts ****/ static TQCString desktopConfigName() { @@ -506,7 +506,7 @@ static TQCString desktopConfigName() return name; } -KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &) +TDEFonts::TDEFonts(TQWidget *parent, const char *name, const TQStringList &) : TDECModule(FontFactory::instance(), parent, name) { TQStringList nameGroupKeyRc; @@ -662,30 +662,30 @@ KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &) load(); } -KFonts::~KFonts() +TDEFonts::~TDEFonts() { fontUseList.setAutoDelete(true); fontUseList.clear(); } -void KFonts::fontSelected() +void TDEFonts::fontSelected() { emit changed(true); } -void KFonts::defaults() +void TDEFonts::defaults() { load( true ); aaSettings->defaults(); } -void KFonts::load() +void TDEFonts::load() { load( false ); } -void KFonts::load( bool useDefaults ) +void TDEFonts::load( bool useDefaults ) { for ( uint i = 0; i < fontUseList.count(); i++ ) fontUseList.at( i )->readFont( useDefaults ); @@ -708,7 +708,7 @@ void KFonts::load( bool useDefaults ) emit changed( useDefaults ); } -void KFonts::save() +void TDEFonts::save() { for ( FontUseItem* i = fontUseList.first(); i; i = fontUseList.next() ) @@ -770,11 +770,11 @@ void KFonts::save() } -void KFonts::slotApplyFontDiff() +void TDEFonts::slotApplyFontDiff() { TQFont font = TQFont(fontUseList.first()->font()); int fontDiffFlags = 0; - int ret = KFontDialog::getFontDiff(font,fontDiffFlags); + int ret = TDEFontDialog::getFontDiff(font,fontDiffFlags); if (ret == KDialog::Accepted && fontDiffFlags) { @@ -784,14 +784,14 @@ void KFonts::slotApplyFontDiff() } } -void KFonts::slotUseAntiAliasing() +void TDEFonts::slotUseAntiAliasing() { useAA = static_cast< AASetting >( cbAA->currentItem()); aaSettingsButton->setEnabled( cbAA->currentItem() == AAEnabled ); emit changed(true); } -void KFonts::slotCfgAa() +void TDEFonts::slotCfgAa() { if(aaSettings->exec()) { diff --git a/kcontrol/fonts/fonts.h b/kcontrol/fonts/fonts.h index f8b5e8fe6..db933d8a0 100644 --- a/kcontrol/fonts/fonts.h +++ b/kcontrol/fonts/fonts.h @@ -22,7 +22,7 @@ class TQComboBox; class KDoubleNumInput; class FontAASettings; -class FontUseItem : public KFontRequester +class FontUseItem : public TDEFontRequester { Q_OBJECT @@ -89,13 +89,13 @@ private: /** * The Desktop/fonts tab in kcontrol. */ -class KFonts : public TDECModule +class TDEFonts : public TDECModule { Q_OBJECT public: - KFonts(TQWidget *parent, const char *name, const TQStringList &); - ~KFonts(); + TDEFonts(TQWidget *parent, const char *name, const TQStringList &); + ~TDEFonts(); virtual void load(); virtual void load( bool useDefaults ); diff --git a/kcontrol/hwmanager/deviceiconview.cpp b/kcontrol/hwmanager/deviceiconview.cpp index f38f35460..d5ebbabce 100644 --- a/kcontrol/hwmanager/deviceiconview.cpp +++ b/kcontrol/hwmanager/deviceiconview.cpp @@ -33,7 +33,7 @@ #include "deviceiconview.moc" DeviceIconView::DeviceIconView(TQWidget * parent, const char * name) - : KListView(parent, name) + : TDEListView(parent, name) { setSorting(0, true); addColumn(TQString::null); @@ -88,7 +88,7 @@ void DeviceIconView::keyPressEvent(TQKeyEvent *e) } } else { - KListView::keyPressEvent(e); + TDEListView::keyPressEvent(e); } } diff --git a/kcontrol/hwmanager/deviceiconview.h b/kcontrol/hwmanager/deviceiconview.h index 76c18e93f..cdc5cd6d4 100644 --- a/kcontrol/hwmanager/deviceiconview.h +++ b/kcontrol/hwmanager/deviceiconview.h @@ -29,18 +29,18 @@ class ConfigModule; class ConfigModuleList; -class DeviceIconItem : public KListViewItem +class DeviceIconItem : public TDEListViewItem { public: DeviceIconItem(TQListViewItem *parent, const TQString& text, const TQPixmap& pm, TDEGenericDevice *d = 0) - : KListViewItem(parent, text) + : TDEListViewItem(parent, text) , _tag(TQString::null) , _device(d) { setPixmap(0, pm); } DeviceIconItem(TQListView *parent, const TQString& text, const TQPixmap& pm, TDEGenericDevice *d = 0) - : KListViewItem(parent, text) + : TDEListViewItem(parent, text) , _tag(TQString::null) , _device(d) { @@ -59,7 +59,7 @@ private: TDEGenericDevice *_device; }; -class DeviceIconView : public KListView +class DeviceIconView : public TDEListView { Q_OBJECT diff --git a/kcontrol/hwmanager/hwmanager.h b/kcontrol/hwmanager/hwmanager.h index 0a3fa2221..9d0e86d40 100644 --- a/kcontrol/hwmanager/hwmanager.h +++ b/kcontrol/hwmanager/hwmanager.h @@ -35,8 +35,8 @@ #include "deviceiconview.h" class TDEConfig; -class KPopupMenu; -class KListViewItem; +class TDEPopupMenu; +class TDEListViewItem; class TDEHWManager : public TDECModule, public DCOPObject { diff --git a/kcontrol/hwmanager/hwmanagerbase.ui b/kcontrol/hwmanager/hwmanagerbase.ui index 632ec2259..47de4caf5 100644 --- a/kcontrol/hwmanager/hwmanagerbase.ui +++ b/kcontrol/hwmanager/hwmanagerbase.ui @@ -58,7 +58,7 @@ <string>Filter by Name:</string> </property> </widget> - <widget class="KListViewSearchLine" row="2" column="1" colspan="3"> + <widget class="TDEListViewSearchLine" row="2" column="1" colspan="3"> <property name="name"> <cstring>deviceFilter</cstring> </property> diff --git a/kcontrol/iccconfig/iccconfig.h b/kcontrol/iccconfig/iccconfig.h index 1f8408e8f..4fd29e4e9 100644 --- a/kcontrol/iccconfig/iccconfig.h +++ b/kcontrol/iccconfig/iccconfig.h @@ -32,8 +32,8 @@ #include "iccconfigbase.h" class TDEConfig; -class KPopupMenu; -class KListViewItem; +class TDEPopupMenu; +class TDEListViewItem; class KICCConfig : public TDECModule, public DCOPObject { diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp index 812f382d2..802f1759d 100644 --- a/kcontrol/icons/iconthemes.cpp +++ b/kcontrol/icons/iconthemes.cpp @@ -77,7 +77,7 @@ IconThemesConfig::IconThemesConfig(TQWidget *parent, const char *name) lh2->addStretch(10); - m_iconThemes=new KListView(this,"IconThemeList"); + m_iconThemes=new TDEListView(this,"IconThemeList"); m_iconThemes->addColumn(i18n("Name")); m_iconThemes->addColumn(i18n("Description")); m_iconThemes->setAllColumnsShowFocus( true ); diff --git a/kcontrol/icons/iconthemes.h b/kcontrol/icons/iconthemes.h index f648bf02c..fde163127 100644 --- a/kcontrol/icons/iconthemes.h +++ b/kcontrol/icons/iconthemes.h @@ -58,7 +58,7 @@ protected slots: private: TQListViewItem *iconThemeItem(const TQString &name); - KListView *m_iconThemes; + TDEListView *m_iconThemes; TQPushButton *m_removeButton; TQLabel *m_previewExec; diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp index 558998b4e..53c33ff2b 100644 --- a/kcontrol/input/core/themepage.cpp +++ b/kcontrol/input/core/themepage.cpp @@ -60,7 +60,7 @@ ThemePage::ThemePage( TQWidget* parent, const char* name ) new TQLabel( i18n("Select the cursor theme you want to use:"), this ); // Create the theme list view - listview = new KListView( this ); + listview = new TDEListView( this ); listview->setFullWidth( true ); listview->setAllColumnsShowFocus( true ); listview->addColumn( i18n("Name") ); @@ -143,24 +143,24 @@ void ThemePage::defaults() void ThemePage::insertThemes() { - KListViewItem *item; + TDEListViewItem *item; - item = new KListViewItem( listview, i18n("Small black"), + item = new TDEListViewItem( listview, i18n("Small black"), i18n("Small black cursors"), "SmallBlack" ); item->setPixmap( 0, TQPixmap( arrow_small_black_xpm ) ); listview->insertItem( item ); - item = new KListViewItem( listview, i18n("Large black"), + item = new TDEListViewItem( listview, i18n("Large black"), i18n("Large black cursors"), "LargeBlack" ); item->setPixmap( 0, TQPixmap( arrow_large_black_xpm ) ); listview->insertItem( item ); - item = new KListViewItem( listview, i18n("Small white"), + item = new TDEListViewItem( listview, i18n("Small white"), i18n("Small white cursors"), "SmallWhite" ); item->setPixmap( 0, TQPixmap( arrow_small_white_xpm ) ); listview->insertItem( item ); - item = new KListViewItem( listview, i18n("Large white"), + item = new TDEListViewItem( listview, i18n("Large white"), i18n("Large white cursors"), "LargeWhite" ); item->setPixmap( 0, TQPixmap( arrow_large_white_xpm ) ); listview->insertItem( item ); diff --git a/kcontrol/input/core/themepage.h b/kcontrol/input/core/themepage.h index 42d24dbe4..d1060797a 100644 --- a/kcontrol/input/core/themepage.h +++ b/kcontrol/input/core/themepage.h @@ -21,7 +21,7 @@ #include <tqwidget.h> -class KListView; +class TDEListView; class TQListViewItem; class ThemePage : public TQWidget @@ -49,7 +49,7 @@ class ThemePage : public TQWidget void insertThemes(); void fixCursorFile(); - KListView *listview; + TDEListView *listview; TQString currentTheme, selectedTheme; }; diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp index e8a918512..0c81eff90 100644 --- a/kcontrol/input/xcursor/themepage.cpp +++ b/kcontrol/input/xcursor/themepage.cpp @@ -94,7 +94,7 @@ ThemePage::ThemePage( TQWidget* parent, const char* name ) preview = new PreviewWidget( new TQHBox( this ) ); // Create the theme list view - listview = new KListView( this ); + listview = new TDEListView( this ); listview->setFullWidth( true ); listview->setAllColumnsShowFocus( true ); listview->addColumn( i18n("Name") ); @@ -374,7 +374,7 @@ void ThemePage::insertTheme( const TQString &path ) delete listview->findItem( dirName, DirColumn ); // Create the listview item and insert it into the list. - KListViewItem *item = new KListViewItem( listview, name, desc, /*hidden*/ dirName ); + TDEListViewItem *item = new TDEListViewItem( listview, name, desc, /*hidden*/ dirName ); item->setPixmap( NameColumn, createIcon( dirName, sample ) ); listview->insertItem( item ); } @@ -529,7 +529,7 @@ void ThemePage::insertThemes() themeInfo.insert( *it, info ); // Create the listview item and insert it into the list. - KListViewItem *item = new KListViewItem( listview, name, desc, /*hidden*/ *it ); + TDEListViewItem *item = new TDEListViewItem( listview, name, desc, /*hidden*/ *it ); item->setPixmap( NameColumn, createIcon( *it, sample ) ); listview->insertItem( item ); } @@ -541,9 +541,9 @@ void ThemePage::insertThemes() // Sort the theme list listview->sort(); - KListViewItem *item = new KListViewItem( listview, ' ' + i18n( "No theme" ), i18n( "The old classic X cursors") , /*hidden*/ "none" ); + TDEListViewItem *item = new TDEListViewItem( listview, ' ' + i18n( "No theme" ), i18n( "The old classic X cursors") , /*hidden*/ "none" ); listview->insertItem( item ); - item = new KListViewItem( listview, ' ' + i18n( "System theme" ), i18n( "Do not change cursor theme") , /*hidden*/ "system" ); + item = new TDEListViewItem( listview, ' ' + i18n( "System theme" ), i18n( "Do not change cursor theme") , /*hidden*/ "system" ); listview->insertItem( item ); // no ThemeInfo object for this one } diff --git a/kcontrol/input/xcursor/themepage.h b/kcontrol/input/xcursor/themepage.h index 4197d73d1..22bca16db 100644 --- a/kcontrol/input/xcursor/themepage.h +++ b/kcontrol/input/xcursor/themepage.h @@ -22,7 +22,7 @@ #include <tqdict.h> -class KListView; +class TDEListView; class TQString; class PreviewWidget; class TQStringList; @@ -62,7 +62,7 @@ class ThemePage : public TQWidget void insertThemes(); TQPixmap createIcon( const TQString &, const TQString & ) const; - KListView *listview; + TDEListView *listview; PreviewWidget *preview; TQPushButton *installButton, *removeButton; TQString selectedTheme; diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp index b0ae6866d..719c5abf8 100644 --- a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp +++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp @@ -58,7 +58,7 @@ KCMIOSlaveInfo::KCMIOSlaveInfo(TQWidget *parent, const char *name, const TQStrin TQLabel* label=new TQLabel(i18n("Available IO slaves:"),this); TQHBox *hbox=new TQHBox(this); - m_ioslavesLb=new KListBox(hbox); + m_ioslavesLb=new TDEListBox(hbox); m_ioslavesLb->setMinimumSize(fontMetrics().width("blahfaselwhatever----"),10); connect( m_ioslavesLb, TQT_SIGNAL( selectionChanged( TQListBoxItem * ) ), TQT_SLOT( showInfo( TQListBoxItem * ) ) ); //TODO make something useful after 2.1 is released diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.h b/kcontrol/ioslaveinfo/kcmioslaveinfo.h index f2df0e1e4..24247ad90 100644 --- a/kcontrol/ioslaveinfo/kcmioslaveinfo.h +++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.h @@ -45,7 +45,7 @@ public: KCMIOSlaveInfo(TQWidget *parent = 0L, const char *name = 0L, const TQStringList &lits=TQStringList() ); protected: - KListBox *m_ioslavesLb; + TDEListBox *m_ioslavesLb; KTextBrowser *m_info; TQCString helpData; TDEIO::Job *m_tfj; diff --git a/kcontrol/kcontrol/moduleiconview.cpp b/kcontrol/kcontrol/moduleiconview.cpp index c6df5cb71..76402e18d 100644 --- a/kcontrol/kcontrol/moduleiconview.cpp +++ b/kcontrol/kcontrol/moduleiconview.cpp @@ -35,7 +35,7 @@ ModuleIconView::ModuleIconView(ConfigModuleList *list, TQWidget * parent, const char * name) - : KListView(parent, name) + : TDEListView(parent, name) , _path(KCGlobal::baseGroup()) , _modules(list) { @@ -155,7 +155,7 @@ void ModuleIconView::keyPressEvent(TQKeyEvent *e) } else { - KListView::keyPressEvent(e); + TDEListView::keyPressEvent(e); } } diff --git a/kcontrol/kcontrol/moduleiconview.h b/kcontrol/kcontrol/moduleiconview.h index dcacf9770..a5d43a447 100644 --- a/kcontrol/kcontrol/moduleiconview.h +++ b/kcontrol/kcontrol/moduleiconview.h @@ -25,12 +25,12 @@ class ConfigModule; class ConfigModuleList; -class ModuleIconItem : public KListViewItem +class ModuleIconItem : public TDEListViewItem { public: ModuleIconItem(TQListView *parent, const TQString& text, const TQPixmap& pm, ConfigModule *m = 0) - : KListViewItem(parent, text) + : TDEListViewItem(parent, text) , _tag(TQString::null) , _module(m) { @@ -54,7 +54,7 @@ private: ConfigModule *_module; }; -class ModuleIconView : public KListView +class ModuleIconView : public TDEListView { Q_OBJECT diff --git a/kcontrol/kcontrol/modulemenu.cpp b/kcontrol/kcontrol/modulemenu.cpp index 2b8f74b12..77e442a98 100644 --- a/kcontrol/kcontrol/modulemenu.cpp +++ b/kcontrol/kcontrol/modulemenu.cpp @@ -41,7 +41,7 @@ that is intentional :-] ModuleMenu::ModuleMenu(ConfigModuleList *list, TQWidget * parent, const char * name) - : KPopupMenu(parent, name) + : TDEPopupMenu(parent, name) , _modules(list) { // use large id's to start with... @@ -52,7 +52,7 @@ ModuleMenu::ModuleMenu(ConfigModuleList *list, TQWidget * parent, const char * n connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleSelected(int))); } -void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath) +void ModuleMenu::fill(TDEPopupMenu *parentMenu, const TQString &parentPath) { TQStringList subMenus = _modules->submenus(parentPath); for(TQStringList::ConstIterator it = subMenus.begin(); @@ -64,7 +64,7 @@ void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath) continue; // create new menu - KPopupMenu *menu = new KPopupMenu(parentMenu); + TDEPopupMenu *menu = new TDEPopupMenu(parentMenu); connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleSelected(int))); // Item names may contain ampersands. To avoid them being converted to diff --git a/kcontrol/kcontrol/modulemenu.h b/kcontrol/kcontrol/modulemenu.h index feac18bd6..2ed12aa5b 100644 --- a/kcontrol/kcontrol/modulemenu.h +++ b/kcontrol/kcontrol/modulemenu.h @@ -38,7 +38,7 @@ class ConfigModule; class ConfigModuleList; -class ModuleMenu : public KPopupMenu +class ModuleMenu : public TDEPopupMenu { Q_OBJECT @@ -52,7 +52,7 @@ private slots: void moduleSelected(int id); protected: - void fill(KPopupMenu *parentMenu, const TQString &parentPath); + void fill(TDEPopupMenu *parentMenu, const TQString &parentPath); private: int id; diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp index 7c095c5f7..982cef297 100644 --- a/kcontrol/kcontrol/moduletreeview.cpp +++ b/kcontrol/kcontrol/moduletreeview.cpp @@ -72,7 +72,7 @@ private: }; ModuleTreeView::ModuleTreeView(ConfigModuleList *list, TQWidget * parent, const char * name) - : KListView(parent, name) + : TDEListView(parent, name) , _modules(list) { addColumn(TQString::null); @@ -262,7 +262,7 @@ void ModuleTreeView::keyPressEvent(TQKeyEvent *e) slotItemSelected(currentItem()); } else - KListView::keyPressEvent(e); + TDEListView::keyPressEvent(e); } diff --git a/kcontrol/kcontrol/moduletreeview.h b/kcontrol/kcontrol/moduletreeview.h index 86bfecab4..d5e60cebf 100644 --- a/kcontrol/kcontrol/moduletreeview.h +++ b/kcontrol/kcontrol/moduletreeview.h @@ -64,7 +64,7 @@ private: TQString _icon; }; -class ModuleTreeView : public KListView +class ModuleTreeView : public TDEListView { Q_OBJECT diff --git a/kcontrol/kcontrol/searchwidget.cpp b/kcontrol/kcontrol/searchwidget.cpp index 1b32e0f7f..c98426641 100644 --- a/kcontrol/kcontrol/searchwidget.cpp +++ b/kcontrol/kcontrol/searchwidget.cpp @@ -74,14 +74,14 @@ SearchWidget::SearchWidget(TQWidget *parent , const char *name) TQVBoxLayout * l = new TQVBoxLayout(this, 0, 2); // keyword list - _keyList = new KListBox(this); + _keyList = new TDEListBox(this); TQLabel *keyl = new TQLabel(_keyList, i18n("&Keywords:"), this); l->addWidget(keyl); l->addWidget(_keyList); // result list - _resultList = new KListBox(this); + _resultList = new TDEListBox(this); TQLabel *resultl = new TQLabel(_resultList, i18n("&Results:"), this); l->addWidget(resultl); diff --git a/kcontrol/kcontrol/searchwidget.h b/kcontrol/kcontrol/searchwidget.h index abf094c2d..2e6306bbc 100644 --- a/kcontrol/kcontrol/searchwidget.h +++ b/kcontrol/kcontrol/searchwidget.h @@ -28,7 +28,7 @@ #include "modules.h" -class KListBox; +class TDEListBox; class KLineEdit; class TQListBoxItem; @@ -71,7 +71,7 @@ protected slots: void slotModuleClicked(TQListBoxItem *item); private: - KListBox *_keyList, *_resultList; + TDEListBox *_keyList, *_resultList; TQPtrList<KeywordListEntry> _keywords; }; diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp index 06a09e2d3..329cb6f89 100644 --- a/kcontrol/kcontrol/toplevel.cpp +++ b/kcontrol/kcontrol/toplevel.cpp @@ -49,7 +49,7 @@ #include "toplevel.moc" TopLevel::TopLevel(const char* name) - : KMainWindow( 0, name, (WFlags)WStyle_ContextHelp ) + : TDEMainWindow( 0, name, (WFlags)WStyle_ContextHelp ) , _active(0), dummyAbout(0) { setCaption(TQString::null); @@ -237,37 +237,37 @@ void TopLevel::setupActions() KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); - icon_view = new KRadioAction + icon_view = new TDERadioAction (i18n("&Icon View"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateIconView()), actionCollection(), "activate_iconview"); icon_view->setExclusiveGroup( "viewmode" ); - tree_view = new KRadioAction + tree_view = new TDERadioAction (i18n("&Tree View"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateTreeView()), actionCollection(), "activate_treeview"); tree_view->setExclusiveGroup( "viewmode" ); - icon_small = new KRadioAction + icon_small = new TDERadioAction (i18n("&Small"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateSmallIcons()), actionCollection(), "activate_smallicons"); icon_small->setExclusiveGroup( "iconsize" ); - icon_medium = new KRadioAction + icon_medium = new TDERadioAction (i18n("&Medium"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateMediumIcons()), actionCollection(), "activate_mediumicons"); icon_medium->setExclusiveGroup( "iconsize" ); - icon_large = new KRadioAction + icon_large = new TDERadioAction (i18n("&Large"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateLargeIcons()), actionCollection(), "activate_largeicons"); icon_large->setExclusiveGroup( "iconsize" ); - icon_huge = new KRadioAction + icon_huge = new TDERadioAction (i18n("&Huge"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateHugeIcons()), actionCollection(), "activate_hugeicons"); icon_huge->setExclusiveGroup( "iconsize" ); - about_module = new KAction(i18n("About Current Module"), 0, TQT_TQOBJECT(this), TQT_SLOT(aboutModule()), actionCollection(), "help_about_module"); + about_module = new TDEAction(i18n("About Current Module"), 0, TQT_TQOBJECT(this), TQT_SLOT(aboutModule()), actionCollection(), "help_about_module"); about_module->setEnabled(false); // I need to add this so that each module can get a bug reported, diff --git a/kcontrol/kcontrol/toplevel.h b/kcontrol/kcontrol/toplevel.h index 1a7e1735f..8d4f0212d 100644 --- a/kcontrol/kcontrol/toplevel.h +++ b/kcontrol/kcontrol/toplevel.h @@ -28,8 +28,8 @@ class TQSplitter; class TQWidgetStack; -class KToggleAction; -class KAction; +class TDEToggleAction; +class TDEAction; class DockContainer; class IndexWidget; @@ -39,7 +39,7 @@ class ConfigModule; class ConfigModuleList; class ModuleTitle; -class TopLevel : public KMainWindow +class TopLevel : public TDEMainWindow { Q_OBJECT @@ -84,9 +84,9 @@ private: DockContainer *_dock; ModuleTitle *_title; - KToggleAction *tree_view, *icon_view; - KToggleAction *icon_small, *icon_medium, *icon_large, *icon_huge; - KAction *report_bug, *about_module; + TDEToggleAction *tree_view, *icon_view; + TDEToggleAction *icon_small, *icon_medium, *icon_large, *icon_huge; + TDEAction *report_bug, *about_module; IndexWidget *_index; SearchWidget *_search; diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp index eeccfb362..8f8b836e2 100644 --- a/kcontrol/kded/kcmkded.cpp +++ b/kcontrol/kded/kcmkded.cpp @@ -75,7 +75,7 @@ KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &) "cannot manipulate these services.")); lay->addWidget( gb ); - _lvLoD = new KListView( gb ); + _lvLoD = new TDEListView( gb ); _lvLoD->addColumn(i18n("Service")); _lvLoD->addColumn(i18n("Description")); _lvLoD->addColumn(i18n("Status")); @@ -88,7 +88,7 @@ KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &) "Be careful with deactivation of unknown services.")); lay->addWidget( gb ); - _lvStartup = new KListView( gb ); + _lvStartup = new TDEListView( gb ); _lvStartup->addColumn(i18n("Use")); _lvStartup->addColumn(i18n("Service")); _lvStartup->addColumn(i18n("Description")); diff --git a/kcontrol/kded/kcmkded.h b/kcontrol/kded/kcmkded.h index 4f49ab140..6dff072ea 100644 --- a/kcontrol/kded/kcmkded.h +++ b/kcontrol/kded/kcmkded.h @@ -23,7 +23,7 @@ #include <tdecmodule.h> -class KListView; +class TDEListView; class TQStringList; class TQPushButton; @@ -53,8 +53,8 @@ protected slots: void setAutoloadEnabled(TDEConfig *config, const TQString &filename, bool b); private: - KListView *_lvLoD; - KListView *_lvStartup; + TDEListView *_lvLoD; + TDEListView *_lvStartup; TQPushButton *_pbStart; TQPushButton *_pbStop; diff --git a/kcontrol/keys/commandShortcuts.cpp b/kcontrol/keys/commandShortcuts.cpp index 9f5a49040..262aaac69 100644 --- a/kcontrol/keys/commandShortcuts.cpp +++ b/kcontrol/keys/commandShortcuts.cpp @@ -121,8 +121,8 @@ void CommandShortcutsModule::initGUI() "to the currently selected command.")); buttonLayout->addSpacing(KDialog::spacingHint() * 2); buttonLayout->addWidget(m_shortcutButton); - connect(m_shortcutButton, TQT_SIGNAL(capturedShortcut(const KShortcut&)), - this, TQT_SLOT(shortcutChanged(const KShortcut&))); + connect(m_shortcutButton, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), + this, TQT_SLOT(shortcutChanged(const TDEShortcut&))); connect(m_customRadio, TQT_SIGNAL(toggled(bool)), m_shortcutButton, TQT_SLOT(setEnabled(bool))); connect(m_noneRadio, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(shortcutRadioToggled(bool))); buttonLayout->addStretch(1); @@ -170,7 +170,7 @@ void CommandShortcutsModule::shortcutRadioToggled(bool remove) } } -void CommandShortcutsModule::shortcutChanged(const KShortcut& shortcut) +void CommandShortcutsModule::shortcutChanged(const TDEShortcut& shortcut) { AppTreeItem *item = static_cast<AppTreeItem*>(m_tree->currentItem()); if (!item || item->isDirectory()) diff --git a/kcontrol/keys/commandShortcuts.h b/kcontrol/keys/commandShortcuts.h index 3650b4e8c..2e0f0a76e 100644 --- a/kcontrol/keys/commandShortcuts.h +++ b/kcontrol/keys/commandShortcuts.h @@ -55,7 +55,7 @@ class CommandShortcutsModule : public TQWidget protected slots: void commandSelected(const TQString&, const TQString &, bool); - void shortcutChanged(const KShortcut& shortcut); + void shortcutChanged(const TDEShortcut& shortcut); void shortcutRadioToggled(bool remove); void commandDoubleClicked(TQListViewItem *item, const TQPoint &, int); void launchMenuEditor(); diff --git a/kcontrol/keys/kaccelaction.h b/kcontrol/keys/kaccelaction.h index a50d7a41d..248ff2278 100644 --- a/kcontrol/keys/kaccelaction.h +++ b/kcontrol/keys/kaccelaction.h @@ -30,30 +30,30 @@ #include <kshortcut.h> -class KAccelBase; +class TDEAccelBase; class TQObject; class TDEConfig; class TDEConfigBase; /* - KAccelAction holds information an a given action, such as "Run Command" + TDEAccelAction holds information an a given action, such as "Run Command" - 1) KAccelAction = "Run Command" + 1) TDEAccelAction = "Run Command" Default3 = "Alt+F2" Default4 = "Meta+Enter;Alt+F2" - 1) KShortcut = "Meta+Enter" + 1) TDEShortcut = "Meta+Enter" 1) KKeySequence = "Meta+Enter" 1) KKey = "Meta+Enter" 1) Meta+Enter 2) Meta+Keypad_Enter - 2) KShortcut = "Alt+F2" + 2) TDEShortcut = "Alt+F2" 1) KKeySequence = "Alt+F2" 1) Alt+F2 - 2) KAccelAction = "Something" + 2) TDEAccelAction = "Something" Default3 = "" Default4 = "" - 1) KShortcut = "Meta+X,Asterisk" + 1) TDEShortcut = "Meta+X,Asterisk" 1) KKeySequence = "Meta+X,Asterisk" 1) KKey = "Meta+X" 1) Meta+X @@ -63,35 +63,35 @@ class TDEConfigBase; */ //--------------------------------------------------------------------- -// KAccelAction +// TDEAccelAction //--------------------------------------------------------------------- -class KAccelAction +class TDEAccelAction { public: - KAccelAction(); - KAccelAction( const KAccelAction& ); - KAccelAction( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis, - const KShortcut& cutDef3, const KShortcut& cutDef4, + TDEAccelAction(); + TDEAccelAction( const TDEAccelAction& ); + TDEAccelAction( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis, + const TDEShortcut& cutDef3, const TDEShortcut& cutDef4, const TQObject* pObjSlot, const char* psMethodSlot, bool bConfigurable, bool bEnabled ); - ~KAccelAction(); + ~TDEAccelAction(); void clear(); bool init( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis, - const KShortcut& cutDef3, const KShortcut& cutDef4, + const TDEShortcut& cutDef3, const TDEShortcut& cutDef4, const TQObject* pObjSlot, const char* psMethodSlot, bool bConfigurable, bool bEnabled ); - KAccelAction& operator=( const KAccelAction& ); + TDEAccelAction& operator=( const TDEAccelAction& ); const TQString& name() const { return m_sName; } const TQString& label() const { return m_sLabel; } const TQString& whatsThis() const { return m_sWhatsThis; } - const KShortcut& shortcut() const { return m_cut; } - const KShortcut& shortcutDefault() const; - const KShortcut& shortcutDefault3() const { return m_cutDefault3; } - const KShortcut& shortcutDefault4() const { return m_cutDefault4; } + const TDEShortcut& shortcut() const { return m_cut; } + const TDEShortcut& shortcutDefault() const; + const TDEShortcut& shortcutDefault3() const { return m_cutDefault3; } + const TDEShortcut& shortcutDefault4() const { return m_cutDefault4; } const TQObject* objSlotPtr() const { return m_pObjSlot; } const char* methodSlotPtr() const { return m_psMethodSlot; } bool isConfigurable() const { return m_bConfigurable; } @@ -100,7 +100,7 @@ class KAccelAction void setName( const TQString& ); void setLabel( const TQString& ); void setWhatsThis( const TQString& ); - bool setShortcut( const KShortcut& rgCuts ); + bool setShortcut( const TDEShortcut& rgCuts ); void setSlot( const TQObject* pObjSlot, const char* psMethodSlot ); void setConfigurable( bool ); void setEnabled( bool ); @@ -123,8 +123,8 @@ class KAccelAction TQString m_sName, m_sLabel, m_sWhatsThis; - KShortcut m_cut; - KShortcut m_cutDefault3, m_cutDefault4; + TDEShortcut m_cut; + TDEShortcut m_cutDefault3, m_cutDefault4; const TQObject* m_pObjSlot; const char* m_psMethodSlot; bool m_bConfigurable, @@ -137,43 +137,43 @@ class KAccelAction private: static int g_bUseFourModifierKeys; - class KAccelActionPrivate* d; + class TDEAccelActionPrivate* d; - friend class KAccelActions; - friend class KAccelBase; + friend class TDEAccelActions; + friend class TDEAccelBase; }; //--------------------------------------------------------------------- -// KAccelActions +// TDEAccelActions //--------------------------------------------------------------------- -class KAccelActions +class TDEAccelActions { public: - KAccelActions(); - KAccelActions( const KAccelActions& ); - virtual ~KAccelActions(); + TDEAccelActions(); + TDEAccelActions( const TDEAccelActions& ); + virtual ~TDEAccelActions(); void clear(); - bool init( const KAccelActions& ); + bool init( const TDEAccelActions& ); bool init( TDEConfigBase& config, const TQString& sGroup ); - void updateShortcuts( KAccelActions& ); + void updateShortcuts( TDEAccelActions& ); int actionIndex( const TQString& sAction ) const; - KAccelAction* actionPtr( uint ); - const KAccelAction* actionPtr( uint ) const; - KAccelAction* actionPtr( const TQString& sAction ); - const KAccelAction* actionPtr( const TQString& sAction ) const; - KAccelAction* actionPtr( KKeySequence cut ); - KAccelAction& operator []( uint ); - const KAccelAction& operator []( uint ) const; - - KAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis, - const KShortcut& rgCutDefaults3, const KShortcut& rgCutDefaults4, + TDEAccelAction* actionPtr( uint ); + const TDEAccelAction* actionPtr( uint ) const; + TDEAccelAction* actionPtr( const TQString& sAction ); + const TDEAccelAction* actionPtr( const TQString& sAction ) const; + TDEAccelAction* actionPtr( KKeySequence cut ); + TDEAccelAction& operator []( uint ); + const TDEAccelAction& operator []( uint ) const; + + TDEAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis, + const TDEShortcut& rgCutDefaults3, const TDEShortcut& rgCutDefaults4, const TQObject* pObjSlot = 0, const char* psMethodSlot = 0, bool bConfigurable = true, bool bEnabled = true ); - KAccelAction* insert( const TQString& sName, const TQString& sLabel ); + TDEAccelAction* insert( const TQString& sName, const TQString& sLabel ); bool remove( const TQString& sAction ); bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 ); @@ -185,21 +185,21 @@ class KAccelActions uint count() const; protected: - KAccelBase* m_pKAccelBase; - KAccelAction** m_prgActions; + TDEAccelBase* m_pTDEAccelBase; + TDEAccelAction** m_prgActions; uint m_nSizeAllocated, m_nSize; void resize( uint ); - void insertPtr( KAccelAction* ); + void insertPtr( TDEAccelAction* ); private: - class KAccelActionsPrivate* d; + class TDEAccelActionsPrivate* d; - KAccelActions( KAccelBase* ); - void initPrivate( KAccelBase* ); - KAccelActions& operator =( KAccelActions& ); + TDEAccelActions( TDEAccelBase* ); + void initPrivate( TDEAccelBase* ); + TDEAccelActions& operator =( TDEAccelActions& ); - friend class KAccelBase; + friend class TDEAccelBase; }; #endif // _KACCELACTION_H diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp index 88f3aabe0..1696abf59 100644 --- a/kcontrol/keys/keyconfig.cpp +++ b/kcontrol/keys/keyconfig.cpp @@ -57,17 +57,17 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) kdDebug(125) << "KKeyModule::init() - Get default key bindings." << endl; if ( KeyType == "global" ) { - KAccelActions* keys = &actions; + TDEAccelActions* keys = &actions; // see also KKeyModule::init() below !!! #define NOSLOTS -#define KShortcuts KAccelShortcuts +#define TDEShortcuts TDEAccelShortcuts #include "../../twin/twinbindings.cpp" #include "../../kicker/kicker/core/kickerbindings.cpp" #include "../../kicker/taskbar/taskbarbindings.cpp" #include "../../kdesktop/kdesktopbindings.cpp" #include "../../klipper/klipperbindings.cpp" #include "../../kxkb/kxkbbindings.cpp" -#undef KShortcuts +#undef TDEShortcuts KeyScheme = "Global Key Scheme"; KeySet = "Global Keys"; // Sorting Hack: I'll re-write the module once feature-adding begins again. @@ -92,12 +92,12 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) } if ( KeyType == "standard" ) { - for(uint i=0; i<KStdAccel::NB_STD_ACCELS; i++) { - KStdAccel::StdAccel id = (KStdAccel::StdAccel)i; - actions.insertAction( KStdAccel::action(id), - KStdAccel::description(id), - KStdAccel::defaultKey3(id), - KStdAccel::defaultKey4(id) ); + for(uint i=0; i<TDEStdAccel::NB_STD_ACCELS; i++) { + TDEStdAccel::StdAccel id = (TDEStdAccel::StdAccel)i; + actions.insertAction( TDEStdAccel::action(id), + TDEStdAccel::description(id), + TDEStdAccel::defaultKey3(id), + TDEStdAccel::defaultKey4(id) ); } KeyScheme = "Standard Key Scheme"; @@ -459,7 +459,7 @@ void KKeyModule::readScheme( int index ) } }*/ -/*void KKeyModule::updateKeys( const KAccelActions* map_P ) +/*void KKeyModule::updateKeys( const TDEAccelActions* map_P ) { kc->updateKeys( map_P ); }*/ @@ -473,24 +473,24 @@ void KKeyModule::init() /*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n"; TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); - TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" ); - KAccel::useFourModifierKeys( fourMods == "true" ); - bool bUseFourModifierKeys = KAccel::useFourModifierKeys(); + TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", TDEAccel::keyboardHasMetaKey() ? "true" : "false" ); + TDEAccel::useFourModifierKeys( fourMods == "true" ); + bool bUseFourModifierKeys = TDEAccel::useFourModifierKeys(); TDEGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true ); */ - KAccelActions* keys = new KAccelActions(); + TDEAccelActions* keys = new TDEAccelActions(); kdDebug(125) << "KKeyModule::init() - Load Included Bindings\n"; // this should match the included files above #define NOSLOTS -#define KShortcuts KAccelShortcuts +#define TDEShortcuts TDEAccelShortcuts #include "../../klipper/klipperbindings.cpp" #include "../../twin/twinbindings.cpp" #include "../../kicker/kicker/core/kickerbindings.cpp" #include "../../kicker/taskbar/taskbarbindings.cpp" #include "../../kdesktop/kdesktopbindings.cpp" #include "../../kxkb/kxkbbindings.cpp" -#undef KShortcuts +#undef TDEShortcuts kdDebug(125) << "KKeyModule::init() - Read Config Bindings\n"; keys->readActions( "Global Keys" ); @@ -508,19 +508,19 @@ void KKeyModule::init() // KeyChooserSpec //----------------------------------------------------------------- -KeyChooserSpec::KeyChooserSpec( KAccelActions& actions, TQWidget* parent, bool bGlobal ) +KeyChooserSpec::KeyChooserSpec( TDEAccelActions& actions, TQWidget* parent, bool bGlobal ) : KKeyChooser( actions, parent, bGlobal, false, true ), m_bGlobal( bGlobal ) { //if( global ) // globalDict()->clear(); // don't check against global keys twice } -/*void KeyChooserSpec::updateKeys( const KAccelActions* map_P ) +/*void KeyChooserSpec::updateKeys( const TDEAccelActions* map_P ) { if( global ) { stdDict()->clear(); - for( KAccelActions::ConstIterator gIt( map_P->begin()); + for( TDEAccelActions::ConstIterator gIt( map_P->begin()); gIt != map_P->end(); ++gIt ) { @@ -532,7 +532,7 @@ KeyChooserSpec::KeyChooserSpec( KAccelActions& actions, TQWidget* parent, bool b else { globalDict()->clear(); - for( KAccelActions::ConstIterator gIt( map_P->begin()); + for( TDEAccelActions::ConstIterator gIt( map_P->begin()); gIt != map_P->end(); ++gIt ) { diff --git a/kcontrol/keys/keyconfig.h b/kcontrol/keys/keyconfig.h index d1760728d..fb9136184 100644 --- a/kcontrol/keys/keyconfig.h +++ b/kcontrol/keys/keyconfig.h @@ -24,8 +24,8 @@ class KKeyModule : public TQWidget { Q_OBJECT public: - KAccelActions actions; - //KAccelActions dict; + TDEAccelActions actions; + //TDEAccelActions dict; KeyChooserSpec *kc; KKeyModule( TQWidget *parent, bool isGlobal, bool bSeriesOnly, bool bSeriesNone, const char *name = 0 ); @@ -51,12 +51,12 @@ public slots: //void slotRemove(); void slotKeyChange(); void slotPreferMeta(); - //void updateKeys( const KAccelActions* map_P ); + //void updateKeys( const TDEAccelActions* map_P ); //void readSchemeNames(); signals: void keyChange(); - //void keysChanged( const KAccelActions* map_P ); + //void keysChanged( const TDEAccelActions* map_P ); protected: TQListBox *sList; @@ -79,9 +79,9 @@ class KeyChooserSpec : public KKeyChooser { Q_OBJECT public: - KeyChooserSpec( KAccelActions& actions, TQWidget* parent, + KeyChooserSpec( TDEAccelActions& actions, TQWidget* parent, bool bGlobal ); - //void updateKeys( const KAccelActions* map_P ); + //void updateKeys( const TDEAccelActions* map_P ); protected: bool m_bGlobal; }; diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp index 0c6d13c4d..736a937bd 100644 --- a/kcontrol/keys/main.cpp +++ b/kcontrol/keys/main.cpp @@ -154,12 +154,12 @@ extern "C" /*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n"; TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); - TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" ); - KAccel::useFourModifierKeys( fourMods == "true" ); - bool bUseFourModifierKeys = KAccel::useFourModifierKeys(); + TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", TDEAccel::keyboardHasMetaKey() ? "true" : "false" ); + TDEAccel::useFourModifierKeys( fourMods == "true" ); + bool bUseFourModifierKeys = TDEAccel::useFourModifierKeys(); TDEGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true ); */ - KAccelActions* keys = new KAccelActions(); + TDEAccelActions* keys = new TDEAccelActions(); kdDebug(125) << "KeyModule::init() - Load Included Bindings\n"; // this should match the included files above diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp index 15cad733a..c014a8b54 100644 --- a/kcontrol/keys/modifiers.cpp +++ b/kcontrol/keys/modifiers.cpp @@ -229,20 +229,20 @@ void ModifiersModule::initGUI() pGroup = new TQGroupBox( 1, Qt::Horizontal, i18n("X Modifier Mapping"), this ); pLayoutTop->addWidget( pGroup, 4, 0 ); - m_plstXMods = new KListView( pGroup ); + m_plstXMods = new TDEListView( pGroup ); m_plstXMods->setSorting( -1 ); m_plstXMods->setSelectionMode( TQListView::NoSelection ); m_plstXMods->setAllColumnsShowFocus( true ); m_plstXMods->addColumn( i18n("X11-Mod") ); - new KListViewItem( m_plstXMods, "mod5" ); - new KListViewItem( m_plstXMods, "mod4" ); - new KListViewItem( m_plstXMods, "mod3" ); - new KListViewItem( m_plstXMods, "mod2" ); - new KListViewItem( m_plstXMods, "mod1" ); - new KListViewItem( m_plstXMods, "control" ); - new KListViewItem( m_plstXMods, "lock" ); - new KListViewItem( m_plstXMods, "shift" ); + new TDEListViewItem( m_plstXMods, "mod5" ); + new TDEListViewItem( m_plstXMods, "mod4" ); + new TDEListViewItem( m_plstXMods, "mod3" ); + new TDEListViewItem( m_plstXMods, "mod2" ); + new TDEListViewItem( m_plstXMods, "mod1" ); + new TDEListViewItem( m_plstXMods, "control" ); + new TDEListViewItem( m_plstXMods, "lock" ); + new TDEListViewItem( m_plstXMods, "shift" ); //------------------ pLayoutTop->setRowStretch( 5, 1 ); diff --git a/kcontrol/keys/modifiers.h b/kcontrol/keys/modifiers.h index 5cb57bfcb..b600bfafb 100644 --- a/kcontrol/keys/modifiers.h +++ b/kcontrol/keys/modifiers.h @@ -6,7 +6,7 @@ class TQCheckBox; class TQLabel; class KComboBox; -class KListView; +class TDEListView; class ModifiersModule : public TQWidget { @@ -30,7 +30,7 @@ class ModifiersModule : public TQWidget TQLabel* m_plblCtrl, * m_plblAlt, * m_plblWin; TQLabel* m_plblWinModX; TQCheckBox* m_pchkMacKeyboard; - KListView* m_plstXMods; + TDEListView* m_plstXMods; TQCheckBox* m_pchkMacSwap; void initGUI(); diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp index 3dac9dcf7..e45953056 100644 --- a/kcontrol/keys/shortcuts.cpp +++ b/kcontrol/keys/shortcuts.cpp @@ -107,8 +107,8 @@ void ShortcutsModule::initGUI() TQString kde_winkeys_env_dir = TDEGlobal::dirs()->localtdedir() + "/env/"; kdDebug(125) << "A-----------" << endl; - KAccelActions* keys = &m_actionsGeneral; -// see also KShortcutsModule::init() below !!! + TDEAccelActions* keys = &m_actionsGeneral; +// see also TDEShortcutsModule::init() below !!! #define NOSLOTS #define KICKER_ALL_BINDINGS #include "../../twin/twinbindings.cpp" @@ -187,7 +187,7 @@ void ShortcutsModule::initGUI() // Yes, it does, so Win is a key m_bUseRmWinKeys = false; } - m_pListGeneral = new KAccelShortcutList( m_actionsGeneral, true ); + m_pListGeneral = new TDEAccelShortcutList( m_actionsGeneral, true ); m_pkcGeneral = new KKeyChooser( m_pListGeneral, this, KKeyChooser::Global, false ); m_pkcGeneral->resize (m_pkcGeneral->sizeHint() ); @@ -201,12 +201,12 @@ void ShortcutsModule::initGUI() m_pTab->addTab( m_pkcGeneral, i18n("&Global Shortcuts") ); connect( m_pkcGeneral, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) ); - m_pListSequence = new KAccelShortcutList( m_actionsSequence, true ); + m_pListSequence = new TDEAccelShortcutList( m_actionsSequence, true ); m_pkcSequence = new KKeyChooser( m_pListSequence, this, KKeyChooser::Global, false ); m_pTab->addTab( m_pkcSequence, i18n("Shortcut Se&quences") ); connect( m_pkcSequence, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) ); - m_pListApplication = new KStdAccel::ShortcutList; + m_pListApplication = new TDEStdAccel::ShortcutList; m_pkcApplication = new KKeyChooser( m_pListApplication, this, KKeyChooser::Standard, false ); m_pTab->addTab( m_pkcApplication, i18n("App&lication Shortcuts") ); connect( m_pkcApplication, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) ); @@ -222,7 +222,7 @@ void ShortcutsModule::initGUI() void ShortcutsModule::createActionsGeneral() { - KAccelActions& actions = m_actionsGeneral; + TDEAccelActions& actions = m_actionsGeneral; for( uint i = 0; i < actions.count(); i++ ) { TQString sConfigKey = actions[i].name(); @@ -243,7 +243,7 @@ void ShortcutsModule::createActionsGeneral() void ShortcutsModule::createActionsSequence() { - KAccelActions& actions = m_actionsSequence; + TDEAccelActions& actions = m_actionsSequence; for( uint i = 0; i < actions.count(); i++ ) { TQString sConfigKey = actions[i].name(); @@ -410,7 +410,7 @@ void ShortcutsModule::slotSaveSchemeAs() TQDir dir( kksPath ); if( !dir.exists() && !dir.mkdir( kksPath ) ) { - tqWarning("KShortcutsModule: Could not make directory to store user info."); + tqWarning("TDEShortcutsModule: Could not make directory to store user info."); return; } diff --git a/kcontrol/keys/shortcuts.h b/kcontrol/keys/shortcuts.h index 0fa8818a8..76c3890c6 100644 --- a/kcontrol/keys/shortcuts.h +++ b/kcontrol/keys/shortcuts.h @@ -71,8 +71,8 @@ class ShortcutsModule : public TQWidget TQPushButton* m_pbtnSave, * m_pbtnRemove; int m_nSysSchemes; TQStringList m_rgsSchemeFiles; - KAccelActions m_actionsGeneral, m_actionsSequence;//, m_actionsApplication; - KShortcutList* m_pListGeneral, * m_pListSequence, * m_pListApplication; + TDEAccelActions m_actionsGeneral, m_actionsSequence;//, m_actionsApplication; + TDEShortcutList* m_pListGeneral, * m_pListSequence, * m_pListApplication; KKeyChooser* m_pkcGeneral, * m_pkcSequence, * m_pkcApplication; TQCheckBox* m_useRmWinKeys; bool m_bUseRmWinKeys; diff --git a/kcontrol/keys/treeview.cpp b/kcontrol/keys/treeview.cpp index 31b39974f..361c1cfb8 100644 --- a/kcontrol/keys/treeview.cpp +++ b/kcontrol/keys/treeview.cpp @@ -35,16 +35,16 @@ #include "khotkeys.h" AppTreeItem::AppTreeItem(TQListViewItem *parent, const TQString& storageId) - : KListViewItem(parent), m_init(false), m_storageId(storageId) {} + : TDEListViewItem(parent), m_init(false), m_storageId(storageId) {} AppTreeItem::AppTreeItem(TQListViewItem *parent, TQListViewItem *after, const TQString& storageId) - : KListViewItem(parent, after), m_init(false), m_storageId(storageId) {} + : TDEListViewItem(parent, after), m_init(false), m_storageId(storageId) {} AppTreeItem::AppTreeItem(TQListView *parent, const TQString& storageId) - : KListViewItem(parent), m_init(false), m_storageId(storageId) {} + : TDEListViewItem(parent), m_init(false), m_storageId(storageId) {} AppTreeItem::AppTreeItem(TQListView *parent, TQListViewItem *after, const TQString& storageId) - : KListViewItem(parent, after), m_init(false), m_storageId(storageId) {} + : TDEListViewItem(parent, after), m_init(false), m_storageId(storageId) {} void AppTreeItem::setName(const TQString &name) { @@ -94,7 +94,7 @@ static TQPixmap appIcon(const TQString &iconName) AppTreeView::AppTreeView( TQWidget *parent, const char *name ) - : KListView(parent, name) + : TDEListView(parent, name) { setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); setAllColumnsShowFocus(true); diff --git a/kcontrol/keys/treeview.h b/kcontrol/keys/treeview.h index d31ba2d00..36d8b91ca 100644 --- a/kcontrol/keys/treeview.h +++ b/kcontrol/keys/treeview.h @@ -25,10 +25,10 @@ #include <klistview.h> class TQPopupMenu; -class KActionCollection; +class TDEActionCollection; class KDesktopFile; -class AppTreeItem : public KListViewItem +class AppTreeItem : public TDEListViewItem { public: @@ -58,7 +58,7 @@ private: TQString m_accel; }; -class AppTreeView : public KListView +class AppTreeView : public TDEListView { friend class AppTreeItem; Q_OBJECT diff --git a/kcontrol/kfontinst/ChangeLog b/kcontrol/kfontinst/ChangeLog index 7916d0b45..27f3c8c9b 100644 --- a/kcontrol/kfontinst/ChangeLog +++ b/kcontrol/kfontinst/ChangeLog @@ -248,7 +248,7 @@ KDE3.1 -> KDE3.2 6. Advanced editing of XftConfig. 7. Added help on XftConfig - from Danny Tholen ([email protected]) 8. Removed some memory leaks -10. Default folders changed for non-root users. KFontinst will now (upon initial start-up) select the following: +10. Default folders changed for non-root users. TDEFontinst will now (upon initial start-up) select the following: X fonts dir: $TDEHOME/share/fonts XConfig file: $TDEHOME/share/fonts/fontpaths @@ -261,7 +261,7 @@ KDE3.1 -> KDE3.2 ...Also to accomplish this, some changes are needed to 'starttde' - see file README.starttde -11. Because of the above, when started as non-root, KFontinst will create Type1 and TrueType sub-folders in +11. Because of the above, when started as non-root, TDEFontinst will create Type1 and TrueType sub-folders in $TDEHOME/share/fonts - if they do not already exist. 12. Moved XftConfig stuff from a sub-page of settings tab into its own tab. 13. Added question dialog if module is unloaded before system has been configured. @@ -301,23 +301,23 @@ KDE3.1 -> KDE3.2 11. Support more encodings - encodings combos now list standard encodings as well as those read from .enc(.gz) files. 12. Internal AMF creator for Type1 and TrueType fonts - ttf2pt1 and pf2afm.ps are no longer used/supplied. -13. Removed the 'Process AFMs' & 'Delete AFMs' options - all AFMs are created be KFontinst, therefore they +13. Removed the 'Process AFMs' & 'Delete AFMs' options - all AFMs are created be TDEFontinst, therefore they should be OK for StarOffice and AbiWord. 14. If a writable XF86Config file is found - then complete folders may be installed, and folders in the X11 directory may be uninstalled or disabled (i.e. the folder is not deleted, but it's entry is removed from the XF86Config file). -15. No longer supply .enc files with KFontinst - they should be provided by the distro. +15. No longer supply .enc files with TDEFontinst - they should be provided by the distro. 0.9.1->0.9.2 ============ 1. Removed a bug where the "Configure System" menu entry was always disabled! 2. Spelling error in Settings dialog. 3. t1lib has problems with some of the fonts supplied with Adobe acrobat - therefore, if t1lib fails to load the - font, then KFontinst itself will try to read the header information (although no preview will be available, + font, then TDEFontinst itself will try to read the header information (although no preview will be available, everything else should still work). -4. Fixed multiple installing of programs in other/ directory. For instance KFontinst's version of ttmkfdir +4. Fixed multiple installing of programs in other/ directory. For instance TDEFontinst's version of ttmkfdir was being installed into $(PREFIX) (usually /usr/bin) as well as $(KDE_DATADIR)/kfontinst - this was incorrect - as KFontinst will only use the version in $(KDE_DATADIR)/kfontinst, and it was possible that a previous version + as TDEFontinst will only use the version in $(KDE_DATADIR)/kfontinst, and it was possible that a previous version of ttmkfdir (such as that supplied with XFree86) would have been overwritten. 5. Fixed bug where the user was allowed to select (and subsequently install) fonts which could not be loaded correctly. 6. Added the ability to enter a custom preview string. diff --git a/kcontrol/kfontinst/configure.in.bot b/kcontrol/kfontinst/configure.in.bot index 99042cbdb..b9d9e6c6d 100644 --- a/kcontrol/kfontinst/configure.in.bot +++ b/kcontrol/kfontinst/configure.in.bot @@ -2,7 +2,7 @@ dnl put here things which have to be done as very last part of configure if test -z "$FONTINST_SUBDIR"; then echo "" - echo "KFontInstall control module got disabled from compilation" + echo "TDEFontInstall control module got disabled from compilation" echo "because of missing FreeType 2.x libraries/headers." echo "You can download the freetype library from http://www.freetype.org/." echo "" diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp index bce091cd7..da1e5f2e2 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp @@ -137,7 +137,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) TQGridLayout *fontsLayout=new TQGridLayout(fontsFrame, 1, 1, 0, 1); TQVBoxLayout *layout=new TQVBoxLayout(this, 0, KDialog::spacingHint()); - KToolBar *toolbar=new KToolBar(this); + TDEToolBar *toolbar=new TDEToolBar(this); bool showBitmap(itsConfig.readBoolEntry(CFG_SHOW_BITMAP, false)); fontsFrame->setLineWidth(0); @@ -177,10 +177,10 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) // // Now for the hack! - KAction *act; - KActionMenu *topMnu=dynamic_cast<KActionMenu *>(itsDirOp->actionCollection()->action("popupMenu")); + TDEAction *act; + TDEActionMenu *topMnu=dynamic_cast<TDEActionMenu *>(itsDirOp->actionCollection()->action("popupMenu")); - itsViewMenuAct=dynamic_cast<KActionMenu *>(itsDirOp->actionCollection()->action("view menu")); + itsViewMenuAct=dynamic_cast<TDEActionMenu *>(itsDirOp->actionCollection()->action("view menu")); topMnu->popupMenu()->clear(); connect(topMnu->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(setupMenu())); if((act=itsDirOp->actionCollection()->action("up"))) @@ -197,28 +197,28 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) topMnu->insert(itsViewMenuAct); - if((itsIconAct=dynamic_cast<KRadioAction *>(itsDirOp->actionCollection()->action("short view")))) + if((itsIconAct=dynamic_cast<TDERadioAction *>(itsDirOp->actionCollection()->action("short view")))) { disconnect(itsIconAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(slotSimpleView())); connect(itsIconAct, TQT_SIGNAL(activated()), TQT_SLOT(iconView())); itsIconAct->plug(toolbar); } - if((itsListAct=dynamic_cast<KRadioAction *>(itsDirOp->actionCollection()->action("detailed view")))) + if((itsListAct=dynamic_cast<TDERadioAction *>(itsDirOp->actionCollection()->action("detailed view")))) { disconnect(itsListAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(slotDetailedView())); connect(itsListAct, TQT_SIGNAL(activated()), TQT_SLOT(listView())); itsListAct->plug(toolbar); } - itsShowBitmapAct=new KToggleAction(i18n("Show Bitmap Fonts"), "font_bitmap", 0, TQT_TQOBJECT(this), TQT_SLOT(filterFonts()), + itsShowBitmapAct=new TDEToggleAction(i18n("Show Bitmap Fonts"), "font_bitmap", 0, TQT_TQOBJECT(this), TQT_SLOT(filterFonts()), itsDirOp->actionCollection(), "showbitmap"); itsShowBitmapAct->setChecked(showBitmap); itsShowBitmapAct->plug(toolbar); toolbar->insertLineSeparator(); - act=new KAction(i18n("Add Fonts..."), "newfont", 0, TQT_TQOBJECT(this), TQT_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts"); + act=new TDEAction(i18n("Add Fonts..."), "newfont", 0, TQT_TQOBJECT(this), TQT_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts"); act->plug(toolbar); topMnu->insert(act); @@ -232,11 +232,11 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) } toolbar->insertLineSeparator(); - act=new KAction(i18n("Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(configure()), itsDirOp->actionCollection(), "configure"); + act=new TDEAction(i18n("Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(configure()), itsDirOp->actionCollection(), "configure"); act->plug(toolbar); #ifdef HAVE_XFT toolbar->insertLineSeparator(); - act=new KAction(i18n("Print..."), "fileprint", 0, TQT_TQOBJECT(this), TQT_SLOT(print()), itsDirOp->actionCollection(), "print"); + act=new TDEAction(i18n("Print..."), "fileprint", 0, TQT_TQOBJECT(this), TQT_SLOT(print()), itsDirOp->actionCollection(), "print"); act->plug(toolbar); #endif @@ -251,7 +251,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) #ifdef HAVE_XFT if(itsPreview) { - KActionCollection *previewCol=itsPreview->actionCollection(); + TDEActionCollection *previewCol=itsPreview->actionCollection(); if(previewCol && previewCol->count()>0 && (act=previewCol->action("changeText"))) act->plug(toolbar); @@ -616,7 +616,7 @@ void CKCmFontInst::jobResult(TDEIO::Job *job) i18n("Please note that any open applications will need to be restarted in order " "for any changes to be noticed."), #endif - i18n("Success"), "KFontinst_WarnAboutFontChangesAndOpenApps"); + i18n("Success"), "TDEFontinst_WarnAboutFontChangesAndOpenApps"); } void CKCmFontInst::addFonts(const KURL::List &src, const KURL &dest) diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h index 4895f273e..a5dccb161 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h @@ -43,10 +43,10 @@ #endif class KDirOperator; -class KAction; -class KRadioAction; -class KActionMenu; -class KToggleAction; +class TDEAction; +class TDERadioAction; +class TDEActionMenu; +class TDEToggleAction; class KFileItem; class TQLabel; class TQSplitter; @@ -95,13 +95,13 @@ class CKCmFontInst : public TDECModule KDirOperator *itsDirOp; KURL itsTop; - KToggleAction *itsShowBitmapAct; - KAction *itsSepDirsAct, + TDEToggleAction *itsShowBitmapAct; + TDEAction *itsSepDirsAct, *itsShowHiddenAct, *itsDeleteAct; - KRadioAction *itsListAct, + TDERadioAction *itsListAct, *itsIconAct; - KActionMenu *itsViewMenuAct; + TDEActionMenu *itsViewMenuAct; #ifdef HAVE_XFT KParts::ReadOnlyPart *itsPreview; #endif diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp index 3c8801e75..fb45b44ca 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp @@ -64,7 +64,7 @@ class CKFileFontView::CKFileFontViewPrivate }; CKFileFontView::CKFileFontView(TQWidget *parent, const char *name) - : KListView(parent, name), + : TDEListView(parent, name), KFileView(), d(new CKFileFontViewPrivate()) { @@ -106,7 +106,7 @@ void CKFileFontView::setSelected(const KFileItem *info, bool enable) CFontListViewItem *item = (CFontListViewItem*)info->extraData(this); if (item) - KListView::setSelected(item, enable); + TDEListView::setSelected(item, enable); } } @@ -117,7 +117,7 @@ void CKFileFontView::setCurrentItem(const KFileItem *item) CFontListViewItem *it = (CFontListViewItem*) item->extraData(this); if (it) - KListView::setCurrentItem(it); + TDEListView::setCurrentItem(it); } } @@ -130,18 +130,18 @@ KFileItem * CKFileFontView::currentFileItem() const void CKFileFontView::clearSelection() { - KListView::clearSelection(); + TDEListView::clearSelection(); } void CKFileFontView::selectAll() { if (KFile::NoSelection!=KFileView::selectionMode() && KFile::Single!=KFileView::selectionMode()) - KListView::selectAll(true); + TDEListView::selectAll(true); } void CKFileFontView::invertSelection() { - KListView::invertSelection(); + TDEListView::invertSelection(); } void CKFileFontView::slotActivateMenu(TQListViewItem *item,const TQPoint& pos) @@ -158,7 +158,7 @@ void CKFileFontView::slotActivateMenu(TQListViewItem *item,const TQPoint& pos) void CKFileFontView::clearView() { itsResolver->m_lstPendingMimeIconItems.clear(); - KListView::clear(); + TDEListView::clear(); } void CKFileFontView::insertItem(KFileItem *i) @@ -357,8 +357,8 @@ void CKFileFontView::slotSortingChanged(int col) i->setKey(sortingKey(i->text(itsSortingCol), item->isDir(), sortSpec)); } - KListView::setSorting(itsSortingCol, !reversed); - KListView::sort(); + TDEListView::setSorting(itsSortingCol, !reversed); + TDEListView::sort(); if (!itsBlockSortingSignal) sig->changeSorting( static_cast<TQDir::SortSpec>( sortSpec ) ); @@ -392,7 +392,7 @@ void CKFileFontView::ensureItemVisible(const KFileItem *i) CFontListViewItem *item = (CFontListViewItem*) i->extraData(this); if ( item ) - KListView::ensureItemVisible(item); + TDEListView::ensureItemVisible(item); } } @@ -435,7 +435,7 @@ KFileItem * CKFileFontView::prevItem(const KFileItem *fileItem) const void CKFileFontView::keyPressEvent(TQKeyEvent *e) { - KListView::keyPressEvent(e); + TDEListView::keyPressEvent(e); if (Key_Return==e->key() || Key_Enter==e->key()) if (e->state() & ControlButton) @@ -638,7 +638,7 @@ void CFontListViewItem::init() void CKFileFontView::virtual_hook(int id, void *data) { - KListView::virtual_hook(id, data); + TDEListView::virtual_hook(id, data); KFileView::virtual_hook(id, data); } diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h index 7a6adb448..2950d3c33 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h @@ -48,12 +48,12 @@ class TQKeyEvent; * An item for the listiew, that has a reference to its corresponding * @ref KFileItem. */ -class CFontListViewItem : public KListViewItem +class CFontListViewItem : public TDEListViewItem { public: CFontListViewItem(TQListView *parent, const TQString &text, const TQPixmap &icon, KFileItem *fi) - : KListViewItem(parent, text), + : TDEListViewItem(parent, text), itsInf(fi) { setPixmap(0, icon); @@ -61,14 +61,14 @@ class CFontListViewItem : public KListViewItem } CFontListViewItem(TQListView *parent, KFileItem *fi) - : KListViewItem(parent), + : TDEListViewItem(parent), itsInf(fi) { init(); } CFontListViewItem(TQListView *parent, const TQString &text, const TQPixmap &icon, KFileItem *fi, TQListViewItem *after) - : KListViewItem(parent, after), + : TDEListViewItem(parent, after), itsInf(fi) { setPixmap(0, icon); @@ -113,7 +113,7 @@ class CFontListViewItem : public KListViewItem * @see KCombiView * @see KFileIconView */ -class CKFileFontView : public KListView, public KFileView +class CKFileFontView : public TDEListView, public KFileView { Q_OBJECT @@ -192,9 +192,9 @@ class CKFileFontView : public KListView, public KFileView private: - virtual void insertItem(TQListViewItem *i) { KListView::insertItem(i); } - virtual void setSorting(int i, bool b) { KListView::setSorting(i, b); } - virtual void setSelected(TQListViewItem *i, bool b) { KListView::setSelected(i, b); } + virtual void insertItem(TQListViewItem *i) { TDEListView::insertItem(i); } + virtual void setSorting(int i, bool b) { TDEListView::setSorting(i, b); } + virtual void setSelected(TQListViewItem *i, bool b) { TDEListView::setSelected(i, b); } inline CFontListViewItem * viewItem( const KFileItem *item ) const { diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/kfontinst/viewpart/FontViewPart.cpp index 6147363b9..a95c4e4e6 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPart.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewPart.cpp @@ -107,7 +107,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name) connect(itsInstallButton, TQT_SIGNAL(clicked()), TQT_SLOT(install())); connect(itsFaceSelector, TQT_SIGNAL(valueChanged(int)), itsPreview, TQT_SLOT(showFace(int))); - itsChangeTextAction=new KAction(i18n("Change Text..."), "text", KShortcut(), + itsChangeTextAction=new TDEAction(i18n("Change Text..."), "text", TDEShortcut(), this, TQT_SLOT(changeText()), actionCollection(), "changeText"); itsChangeTextAction->setEnabled(false); itsPrintAction=KStdAction::print(this, TQT_SLOT(print()), actionCollection(), "print"); diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.h b/kcontrol/kfontinst/viewpart/FontViewPart.h index 1e4500c5a..29ef28d6c 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPart.h +++ b/kcontrol/kfontinst/viewpart/FontViewPart.h @@ -35,7 +35,7 @@ class TQPushButton; class TQFrame; class TQLabel; class KIntNumInput; -class KAction; +class TDEAction; class KURL; namespace KFI @@ -74,7 +74,7 @@ class CFontViewPart : public KParts::ReadOnlyPart *itsToolsFrame; TQLabel *itsFaceLabel; KIntNumInput *itsFaceSelector; - KAction *itsChangeTextAction, + TDEAction *itsChangeTextAction, *itsPrintAction; bool itsShowInstallButton; int itsFace; diff --git a/kcontrol/kfontinst/viewpart/kfontview.desktop b/kcontrol/kfontinst/viewpart/kfontview.desktop index f774dba33..88a964974 100644 --- a/kcontrol/kfontinst/viewpart/kfontview.desktop +++ b/kcontrol/kfontinst/viewpart/kfontview.desktop @@ -1,10 +1,10 @@ [Desktop Entry] -Name=KFontView +Name=TDEFontView Name[be]=Прагляд шрыфтоў Name[bn]=কে-ফন্ট-ভিউ Name[cs]=Prohlížeč písem Name[eo]=Tiparorigardilo -Name[eu]=KFontWiew +Name[eu]=TDEFontWiew Name[he]=מציג גופנים Name[hi]=के-फ़ॉन्ट-व्यू Name[mk]=КФонтПреглед @@ -18,7 +18,7 @@ Name[sk]=Prehliadač písiem Name[sv]=Kfontview Name[tg]=Намоишгари КҲарф Name[vi]=Trình xem phông chữ TDE -Name[wa]=Håyneu di fontes (KFontView) +Name[wa]=Håyneu di fontes (TDEFontView) Name[zh_CN]=字体预览 Exec=kfontview %i %u Icon=fonts diff --git a/kcontrol/kicker/applettab_impl.h b/kcontrol/kicker/applettab_impl.h index 83b80da0e..a92e166d6 100644 --- a/kcontrol/kicker/applettab_impl.h +++ b/kcontrol/kicker/applettab_impl.h @@ -28,7 +28,7 @@ class TQGroupBox; class TQButtonGroup; class TQRadioButton; class TQPushButton; -class KListView; +class TDEListView; class TQListViewItem; class AppletTab : public AppletTabBase diff --git a/kcontrol/kicker/menutab.ui b/kcontrol/kicker/menutab.ui index 49c2502b6..5d82d9e95 100644 --- a/kcontrol/kicker/menutab.ui +++ b/kcontrol/kicker/menutab.ui @@ -193,7 +193,7 @@ </spacer> </vbox> </widget> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Optional Menus</string> @@ -366,7 +366,7 @@ <string>Font:</string> </property> </widget> - <widget class="KFontRequester" row="2" column="1" rowspan="1" colspan="3"> + <widget class="TDEFontRequester" row="2" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_ButtonFont</cstring> </property> diff --git a/kcontrol/konq/desktopbehavior.ui b/kcontrol/konq/desktopbehavior.ui index 63a8de7c4..e2593e205 100644 --- a/kcontrol/konq/desktopbehavior.ui +++ b/kcontrol/konq/desktopbehavior.ui @@ -330,7 +330,7 @@ <p>For example, files which are named ".directory" are plain text files which contain information for Konqueror, such as the icon to use in displaying a directory, the order in which files should be sorted, etc. You should not change or delete these files unless you know what you are doing.</p></string> </property> </widget> - <widget class="KListView" row="2" column="0"> + <widget class="TDEListView" row="2" column="0"> <column> <property name="text"> <string>Show Icon Previews For</string> @@ -373,7 +373,7 @@ <string>&Show device icons:</string> </property> </widget> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Device Types to Display</string> diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp index e7c3fd9cf..1f795c6a8 100644 --- a/kcontrol/konq/fontopts.cpp +++ b/kcontrol/konq/fontopts.cpp @@ -56,7 +56,7 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop row++; - m_pStandard = new KFontCombo( this ); + m_pStandard = new TDEFontCombo( this ); label = new TQLabel( m_pStandard, i18n("&Standard font:"), this ); lay->addWidget(label,row,0); lay->addMultiCellWidget(m_pStandard,row,row,1,1); diff --git a/kcontrol/konq/fontopts.h b/kcontrol/konq/fontopts.h index 0a0a18823..c163deb70 100644 --- a/kcontrol/konq/fontopts.h +++ b/kcontrol/konq/fontopts.h @@ -44,7 +44,7 @@ class TQRadioButton; class KColorButton; class TDEConfig; -class KFontCombo; +class TDEFontCombo; //----------------------------------------------------------------------------- @@ -88,7 +88,7 @@ private: TQRadioButton* m_pMedium; TQRadioButton* m_pLarge; */ - KFontCombo* m_pStandard; + TDEFontCombo* m_pStandard; TQSpinBox* m_pSize; int m_fSize; diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp index d69333a7c..b0528b5dc 100644 --- a/kcontrol/konq/previews.cpp +++ b/kcontrol/konq/previews.cpp @@ -77,7 +77,7 @@ KPreviewOptions::KPreviewOptions( TQWidget *parent, const char */*name*/ ) "no preview will be generated for files bigger than 10 MB, for speed reasons.")); // Listview containing checkboxes for all protocols that support listing - KListView *listView = new KListView( this, "listView" ); + TDEListView *listView = new TDEListView( this, "listView" ); listView->addColumn( i18n( "Select Protocols" ) ); listView->setFullWidth( true ); diff --git a/kcontrol/konq/rootopts.h b/kcontrol/konq/rootopts.h index ec4510b1c..ffbf24a5a 100644 --- a/kcontrol/konq/rootopts.h +++ b/kcontrol/konq/rootopts.h @@ -24,7 +24,7 @@ class TQComboBox; class TQPushButton; class TDEConfig; -class KListView; +class TDEListView; class KURLRequester; namespace TDEIO { class Job; } diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp index 617197eba..cd54cd003 100644 --- a/kcontrol/konqhtml/appearance.cpp +++ b/kcontrol/konqhtml/appearance.cpp @@ -67,7 +67,7 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg TQLabel* label = new TQLabel( i18n("S&tandard font:"), this ); lay->addWidget( label , ++r, E); - m_pFonts[0] = new KFontCombo( emptyList, this ); + m_pFonts[0] = new TDEFontCombo( emptyList, this ); label->setBuddy( m_pFonts[0] ); lay->addMultiCellWidget(m_pFonts[0], r, r, M, W); @@ -88,7 +88,7 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg label = new TQLabel( i18n( "&Fixed font:"), this ); lay->addWidget( label, ++r, E ); - m_pFonts[1] = new KFontCombo( emptyList, this ); + m_pFonts[1] = new TDEFontCombo( emptyList, this ); label->setBuddy( m_pFonts[1] ); lay->addMultiCellWidget(m_pFonts[1], r, r, M, W); @@ -109,7 +109,7 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg label = new TQLabel( i18n( "S&erif font:" ), this ); lay->addWidget( label, ++r, E ); - m_pFonts[2] = new KFontCombo( emptyList, this ); + m_pFonts[2] = new TDEFontCombo( emptyList, this ); label->setBuddy( m_pFonts[2] ); lay->addMultiCellWidget( m_pFonts[2], r, r, M, W ); @@ -130,7 +130,7 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg label = new TQLabel( i18n( "Sa&ns serif font:" ), this ); lay->addWidget( label, ++r, E ); - m_pFonts[3] = new KFontCombo( emptyList, this ); + m_pFonts[3] = new TDEFontCombo( emptyList, this ); label->setBuddy( m_pFonts[3] ); lay->addMultiCellWidget( m_pFonts[3], r, r, M, W ); @@ -152,7 +152,7 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg label = new TQLabel( i18n( "C&ursive font:" ), this ); lay->addWidget( label, ++r, E ); - m_pFonts[4] = new KFontCombo( emptyList, this ); + m_pFonts[4] = new TDEFontCombo( emptyList, this ); label->setBuddy( m_pFonts[4] ); lay->addMultiCellWidget( m_pFonts[4], r, r, M, W ); @@ -174,7 +174,7 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg label = new TQLabel( i18n( "Fantas&y font:" ), this ); lay->addWidget( label, ++r, E ); - m_pFonts[5] = new KFontCombo( emptyList, this ); + m_pFonts[5] = new TDEFontCombo( emptyList, this ); label->setBuddy( m_pFonts[5] ); lay->addMultiCellWidget( m_pFonts[5], r, r, M, W ); diff --git a/kcontrol/konqhtml/appearance.h b/kcontrol/konqhtml/appearance.h index c833e8111..3c5131abf 100644 --- a/kcontrol/konqhtml/appearance.h +++ b/kcontrol/konqhtml/appearance.h @@ -17,7 +17,7 @@ #include <tdecmodule.h> class TQSpinBox; -class KFontCombo; +class TDEFontCombo; class KAppearanceOptions : public TDECModule { @@ -55,7 +55,7 @@ private: KIntNumInput* m_minSize; KIntNumInput* m_MedSize; KIntNumInput* m_pageDPI; - KFontCombo* m_pFonts[6]; + TDEFontCombo* m_pFonts[6]; TQComboBox* m_pEncoding; TQSpinBox *m_pFontSizeAdjust; diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp index 8bc8a3e50..3c8086abf 100644 --- a/kcontrol/konqhtml/domainlistview.cpp +++ b/kcontrol/konqhtml/domainlistview.cpp @@ -43,7 +43,7 @@ DomainListView::DomainListView(TDEConfig *config,const TQString &title, thisLayout->setSpacing(KDialog::spacingHint()); thisLayout->setMargin(KDialog::marginHint()); - domainSpecificLV = new KListView(this); + domainSpecificLV = new TDEListView(this); domainSpecificLV->addColumn(i18n("Host/Domain")); domainSpecificLV->addColumn(i18n("Policy"), 100); connect(domainSpecificLV,TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(changePressed())); diff --git a/kcontrol/konqhtml/domainlistview.h b/kcontrol/konqhtml/domainlistview.h index f62b2e46a..f5844071e 100644 --- a/kcontrol/konqhtml/domainlistview.h +++ b/kcontrol/konqhtml/domainlistview.h @@ -30,7 +30,7 @@ class TQPushButton; class TQStringList; class TDEConfig; -class KListView; +class TDEListView; class Policies; class PolicyDialog; @@ -80,7 +80,7 @@ public: /** * returns the list view displaying the domains */ - KListView *listView() const { return domainSpecificLV; } + TDEListView *listView() const { return domainSpecificLV; } /** * returns the add push-button. @@ -193,7 +193,7 @@ protected: TDEConfig *config; - KListView *domainSpecificLV; + TDEListView *domainSpecificLV; TQPushButton* addDomainPB; TQPushButton* changeDomainPB; diff --git a/kcontrol/konqhtml/javaopts.h b/kcontrol/konqhtml/javaopts.h index 0c179edd0..ea854aed3 100644 --- a/kcontrol/konqhtml/javaopts.h +++ b/kcontrol/konqhtml/javaopts.h @@ -22,7 +22,7 @@ class KColorButton; class TDEConfig; -class KListView; +class TDEListView; class KURLRequester; class KIntNumInput; diff --git a/kcontrol/konqhtml/nsconfigwidget.ui b/kcontrol/konqhtml/nsconfigwidget.ui index be05b0aa6..a20a0f02f 100644 --- a/kcontrol/konqhtml/nsconfigwidget.ui +++ b/kcontrol/konqhtml/nsconfigwidget.ui @@ -161,7 +161,7 @@ <string>&Up</string> </property> </widget> - <widget class="KListBox" row="1" column="0" rowspan="4" colspan="2"> + <widget class="TDEListBox" row="1" column="0" rowspan="4" colspan="2"> <property name="name"> <cstring>dirList</cstring> </property> diff --git a/kcontrol/privacy/kcmprivacydialog.ui b/kcontrol/privacy/kcmprivacydialog.ui index b6182c61f..5c2afe250 100644 --- a/kcontrol/privacy/kcmprivacydialog.ui +++ b/kcontrol/privacy/kcmprivacydialog.ui @@ -50,7 +50,7 @@ <property name="orientation"> <enum>Vertical</enum> </property> - <widget class="KListView"> + <widget class="TDEListView"> <property name="name"> <cstring>privacyListView</cstring> </property> diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp index 869446e42..13b376cd4 100644 --- a/kcontrol/privacy/kprivacymanager.cpp +++ b/kcontrol/privacy/kprivacymanager.cpp @@ -117,8 +117,8 @@ bool KPrivacyManager::clearWebCache() const bool KPrivacyManager::clearRecentDocuments() const { - KRecentDocument::clear(); - return KRecentDocument::recentDocuments().isEmpty(); + TDERecentDocument::clear(); + return TDERecentDocument::recentDocuments().isEmpty(); } bool KPrivacyManager::clearQuickStartMenu() const diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp index 6f5d52c33..c175384c2 100644 --- a/kcontrol/privacy/privacy.cpp +++ b/kcontrol/privacy/privacy.cpp @@ -71,7 +71,7 @@ Privacy::Privacy(TQWidget *parent, const char *name) //privacyTabs->addTab(p3pSettings, i18n("Privacy Settings")); - KListView *sw = cleaningDialog->privacyListView; + TDEListView *sw = cleaningDialog->privacyListView; sw->addColumn(i18n("Privacy Settings")); sw->addColumn(i18n("Description")); @@ -82,8 +82,8 @@ Privacy::Privacy(TQWidget *parent, const char *name) - generalCLI = new KListViewItem(sw, i18n("General") ); - webbrowsingCLI = new KListViewItem(sw, i18n("Web Browsing") ); + generalCLI = new TDEListViewItem(sw, i18n("General") ); + webbrowsingCLI = new TDEListViewItem(sw, i18n("Web Browsing") ); generalCLI->setOpen(true); webbrowsingCLI->setOpen(true); diff --git a/kcontrol/privacy/privacy.h b/kcontrol/privacy/privacy.h index 3300fec6d..495b2fa6c 100644 --- a/kcontrol/privacy/privacy.h +++ b/kcontrol/privacy/privacy.h @@ -53,8 +53,8 @@ private: TQPtrList<TQCheckListItem> checklist; - KListViewItem *generalCLI; - KListViewItem *webbrowsingCLI; + TDEListViewItem *generalCLI; + TDEListViewItem *webbrowsingCLI; TQCheckListItem *clearThumbnails; TQCheckListItem *clearRunCommandHistory; diff --git a/kcontrol/randr/configdialog.h b/kcontrol/randr/configdialog.h index 561732078..9ec755834 100644 --- a/kcontrol/randr/configdialog.h +++ b/kcontrol/randr/configdialog.h @@ -35,7 +35,7 @@ class TDEGlobalAccel; class KKeyChooser; -class KListView; +class TDEListView; class TQPushButton; class TQDialog; class ConfigDialog; @@ -56,11 +56,11 @@ private: }; -class ListView : public KListView +class ListView : public TDEListView { public: ListView( ConfigDialog* configWidget, TQWidget *parent, const char *name ) - : KListView( parent, name ), _configWidget( configWidget ), + : TDEListView( parent, name ), _configWidget( configWidget ), _regExpEditor(0L) {} // TQListView has a weird idea of a sizeHint... virtual TQSize sizeHint () const { diff --git a/kcontrol/randr/tderandrbindings.cpp b/kcontrol/randr/tderandrbindings.cpp index b7df41602..07702633b 100644 --- a/kcontrol/randr/tderandrbindings.cpp +++ b/kcontrol/randr/tderandrbindings.cpp @@ -28,7 +28,7 @@ keys->insert( "Program:tderandrtray", i18n("Display Control") ); - DEF( I18N_NOOP("Switch Displays"), KShortcut(TQString("XF86Display")), KShortcut(TQString("XF86Display")), slotCycleDisplays() ); + DEF( I18N_NOOP("Switch Displays"), TDEShortcut(TQString("XF86Display")), TDEShortcut(TQString("XF86Display")), slotCycleDisplays() ); #undef DEF #undef WIN diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp index 42151d87e..845f3e498 100644 --- a/kcontrol/randr/tderandrtray.cpp +++ b/kcontrol/randr/tderandrtray.cpp @@ -223,7 +223,7 @@ void KRandRSystemTray::reloadDisplayConfiguration() } } -void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu) +void KRandRSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu) { int lastIndex = 0; @@ -247,7 +247,7 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu) /*lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1)); menu->setItemEnabled(lastIndex, false);*/ } else { - KPopupMenu* subMenu = new KPopupMenu(menu, TQString("screen%1").arg(s+1).latin1()); + TDEPopupMenu* subMenu = new TDEPopupMenu(menu, TQString("screen%1").arg(s+1).latin1()); m_screenPopups.append(subMenu); populateMenu(subMenu); lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1), subMenu); @@ -293,23 +293,23 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu) menu->insertTitle(SmallIcon("randr"), i18n("Global Configuation")); - KAction *actColors = new KAction( i18n( "Configure Displays..." ), - SmallIconSet( "configure" ), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDisplayConfig() ), + TDEAction *actColors = new TDEAction( i18n( "Configure Displays..." ), + SmallIconSet( "configure" ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDisplayConfig() ), actionCollection() ); actColors->plug( menu ); -// KAction *actPrefs = new KAction( i18n( "Configure Display..." ), -// SmallIconSet( "configure" ), KShortcut(), this, TQT_SLOT( slotPrefs() ), +// TDEAction *actPrefs = new TDEAction( i18n( "Configure Display..." ), +// SmallIconSet( "configure" ), TDEShortcut(), this, TQT_SLOT( slotPrefs() ), // actionCollection() ); // actPrefs->plug( menu ); - KAction *actSKeys = new KAction( i18n( "Configure Shortcut Keys..." ), - SmallIconSet( "configure" ), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotSKeys() ), + TDEAction *actSKeys = new TDEAction( i18n( "Configure Shortcut Keys..." ), + SmallIconSet( "configure" ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotSKeys() ), actionCollection() ); actSKeys->plug( menu ); menu->insertItem(SmallIcon("help"),KStdGuiItem::help().text(), m_help->menu()); - KAction *quitAction = actionCollection()->action(KStdAction::name(KStdAction::Quit)); + TDEAction *quitAction = actionCollection()->action(KStdAction::name(KStdAction::Quit)); quitAction->plug(menu); m_menu = menu; @@ -317,7 +317,7 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu) void KRandRSystemTray::slotScreenActivated() { - setCurrentScreen(m_screenPopups.find(static_cast<const KPopupMenu*>(sender()))); + setCurrentScreen(m_screenPopups.find(static_cast<const TDEPopupMenu*>(sender()))); } void KRandRSystemTray::configChanged() @@ -391,7 +391,7 @@ int KRandRSystemTray::GetHackResolutionParameter() { return resparm; } -void KRandRSystemTray::populateMenu(KPopupMenu* menu) +void KRandRSystemTray::populateMenu(TDEPopupMenu* menu) { int lastIndex = 0; @@ -718,7 +718,7 @@ void KRandRSystemTray::findPrimaryDisplay() } } -void KRandRSystemTray::addOutputMenu(KPopupMenu* menu) +void KRandRSystemTray::addOutputMenu(TDEPopupMenu* menu) { XRROutputInfo *output_info; char *output_name; diff --git a/kcontrol/randr/tderandrtray.h b/kcontrol/randr/tderandrtray.h index 6c96203e4..aee432b4a 100644 --- a/kcontrol/randr/tderandrtray.h +++ b/kcontrol/randr/tderandrtray.h @@ -28,7 +28,7 @@ #include <tdehardwaredevices.h> class KHelpMenu; -class KPopupMenu; +class TDEPopupMenu; class KRandRSystemTray : public KSystemTray, public KRandrSimpleAPI { @@ -38,7 +38,7 @@ public: KRandRSystemTray(TQWidget* parent = 0, const char *name = 0); TDEGlobalAccel *globalKeys; - virtual void contextMenuAboutToShow(KPopupMenu* menu); + virtual void contextMenuAboutToShow(TDEPopupMenu* menu); void configChanged(); @@ -64,8 +64,8 @@ protected: void resizeEvent ( TQResizeEvent * ); private: - void populateMenu(KPopupMenu* menu); - void addOutputMenu(KPopupMenu* menu); + void populateMenu(TDEPopupMenu* menu); + void addOutputMenu(TDEPopupMenu* menu); int GetDefaultResolutionParameter(); int GetHackResolutionParameter(); void findPrimaryDisplay(); @@ -73,7 +73,7 @@ private: bool m_popupUp; KHelpMenu* m_help; - TQPtrList<KPopupMenu> m_screenPopups; + TQPtrList<TDEPopupMenu> m_screenPopups; Display *randr_display; ScreenInfo *randr_screen_info; @@ -82,7 +82,7 @@ private: int last_known_x; int last_known_y; - KPopupMenu* m_menu; + TDEPopupMenu* m_menu; KSimpleConfig *r_config; KSimpleConfig *t_config; diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp index 2105c34d0..d802df1a6 100644 --- a/kcontrol/smartcard/smartcard.cpp +++ b/kcontrol/smartcard/smartcard.cpp @@ -69,7 +69,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name) base = new SmartcardBase(this); layout->add(base); - _popUpKardChooser = new KPopupMenu(this,"KpopupKardChooser"); + _popUpKardChooser = new TDEPopupMenu(this,"KpopupKardChooser"); _popUpKardChooser->insertItem(i18n("Change Module..."), this, TQT_SLOT(slotLaunchChooser())); @@ -145,16 +145,16 @@ void KSmartcardConfig::updateReadersState (TQString readerName, bool isCardPresent, TQString atr) { - KListViewItem * tID=(KListViewItem *) base->_readerHostsListView->findItem(readerName, 0); + TDEListViewItem * tID=(TDEListViewItem *) base->_readerHostsListView->findItem(readerName, 0); if (tID==0) return; - KListViewItem * tIDChild=(KListViewItem*) tID->firstChild(); + TDEListViewItem * tIDChild=(TDEListViewItem*) tID->firstChild(); if (tIDChild==NULL) return; delete tIDChild; if (!isCardPresent) - (void) new KListViewItem(tID,i18n("No card inserted")); + (void) new TDEListViewItem(tID,i18n("No card inserted")); else{ getSupportingModule(tID,atr); @@ -175,7 +175,7 @@ void KSmartcardConfig::loadReadersTab( TQStringList lr){ arg << modName; // New view items - KListViewItem * temp; + TDEListViewItem * temp; //If the smartcard support is disabled we unload the kardsvc KDED module // and return @@ -188,11 +188,11 @@ void KSmartcardConfig::loadReadersTab( TQStringList lr){ // New view items - KListViewItem * temp; + TDEListViewItem * temp; kapp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)", data, rettype, retval); - (void) new KListViewItem(base->_readerHostsListView, + (void) new TDEListViewItem(base->_readerHostsListView, i18n("Smart card support disabled")); @@ -203,14 +203,14 @@ void KSmartcardConfig::loadReadersTab( TQStringList lr){ if (lr.isEmpty()){ - (void) new KListViewItem(base->_readerHostsListView, + (void) new TDEListViewItem(base->_readerHostsListView, i18n("No readers found. Check 'pcscd' is running")); return; } for (TQStringList::Iterator _slot=lr.begin();_slot!=lr.end();++_slot){ - temp= new KListViewItem(base->_readerHostsListView,*_slot); + temp= new TDEListViewItem(base->_readerHostsListView,*_slot); TQByteArray dataATR; @@ -227,7 +227,7 @@ void KSmartcardConfig::loadReadersTab( TQStringList lr){ if (cardATR.isNull()){ - (void) new KListViewItem(temp,i18n("NO ATR or no card inserted")); + (void) new TDEListViewItem(temp,i18n("NO ATR or no card inserted")); continue; } @@ -241,13 +241,13 @@ void KSmartcardConfig::loadReadersTab( TQStringList lr){ } -void KSmartcardConfig::getSupportingModule( KListViewItem * ant, +void KSmartcardConfig::getSupportingModule( TDEListViewItem * ant, TQString & cardATR) const{ if (cardATR.isNull()){ - (void) new KListViewItem(ant,i18n("NO ATR or no card inserted")); + (void) new TDEListViewItem(ant,i18n("NO ATR or no card inserted")); return; } @@ -258,7 +258,7 @@ void KSmartcardConfig::getSupportingModule( KListViewItem * ant, TQString type=mng[0]; TQString subType=mng[1]; TQString subSubType=mng[2]; - KListViewItem * hil =new KListViewItem(ant, + TDEListViewItem * hil =new TDEListViewItem(ant, i18n("Managed by: "), type, subType, @@ -268,7 +268,7 @@ void KSmartcardConfig::getSupportingModule( KListViewItem * ant, else{ - KListViewItem * hil =new KListViewItem(ant, + TDEListViewItem * hil =new TDEListViewItem(ant, i18n("No module managing this card")); hil->setSelectable(FALSE); } diff --git a/kcontrol/smartcard/smartcard.h b/kcontrol/smartcard/smartcard.h index 0a4b7d704..7cb90478e 100644 --- a/kcontrol/smartcard/smartcard.h +++ b/kcontrol/smartcard/smartcard.h @@ -34,8 +34,8 @@ class TDEConfig; class KCardDB; -class KPopupMenu; -class KListViewItem; +class TDEPopupMenu; +class TDEListViewItem; class KSmartcardConfig : public TDECModule, public DCOPObject { @@ -77,9 +77,9 @@ private: TDEConfig *config; bool _ok; KCardDB * _cardDB; - KPopupMenu * _popUpKardChooser; + TDEPopupMenu * _popUpKardChooser; - void getSupportingModule( KListViewItem * ant, + void getSupportingModule( TDEListViewItem * ant, TQString & cardATR) const ; diff --git a/kcontrol/smartcard/smartcardbase.ui b/kcontrol/smartcard/smartcardbase.ui index 2949e87e7..c3104f05b 100644 --- a/kcontrol/smartcard/smartcardbase.ui +++ b/kcontrol/smartcard/smartcardbase.ui @@ -146,7 +146,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Reader</string> diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp index ea6c11a08..1b592cc52 100644 --- a/kcontrol/style/kcmstyle.cpp +++ b/kcontrol/style/kcmstyle.cpp @@ -648,7 +648,7 @@ void KCMStyle::save() if ( m_bToolbarsDirty ) // ##### FIXME - Doesn't apply all settings correctly due to bugs in - // TDEApplication/KToolbar + // TDEApplication/TDEToolbar KIPC::sendMessageAll(KIPC::ToolbarStyleChanged); if (m_bEffectsDirty) { diff --git a/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui b/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui index e4fb65121..6b7bd409f 100644 --- a/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui +++ b/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui @@ -27,7 +27,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListView" row="1" column="0"> + <widget class="TDEListView" row="1" column="0"> <column> <property name="text"> <string>Domain [Group]</string> @@ -158,7 +158,7 @@ <cstring>kListViewSearchLine</cstring> </property> </widget> - <widget class="KListViewSearchLine"> + <widget class="TDEListViewSearchLine"> <property name="name"> <cstring>kListViewSearchLine</cstring> </property> diff --git a/kcontrol/tdeio/kcookiespolicies.cpp b/kcontrol/tdeio/kcookiespolicies.cpp index 803edf07f..9241e1a04 100644 --- a/kcontrol/tdeio/kcookiespolicies.cpp +++ b/kcontrol/tdeio/kcookiespolicies.cpp @@ -53,8 +53,8 @@ KCookiesPolicies::KCookiesPolicies(TQWidget *parent) dlg = new KCookiesPolicyDlgUI (this); dlg->lvDomainPolicy->header()->setStretchEnabled(true, 0); - dlg->lvDomainPolicy->setColumnWidthMode(0, KListView::Manual); - dlg->lvDomainPolicy->setColumnWidthMode(1, KListView::Maximum); + dlg->lvDomainPolicy->setColumnWidthMode(0, TDEListView::Manual); + dlg->lvDomainPolicy->setColumnWidthMode(1, TDEListView::Maximum); dlg->tbClearSearchLine->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase")); dlg->kListViewSearchLine->setListView(dlg->lvDomainPolicy); TQValueList<int> columns; diff --git a/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui b/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui index 880b41cba..fb315acf7 100644 --- a/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui +++ b/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui @@ -210,7 +210,7 @@ To add a new policy, simply click on the <b>Add...</b> button and su </widget> </vbox> </widget> - <widget class="KListView" row="1" column="0" rowspan="2" colspan="1"> + <widget class="TDEListView" row="1" column="0" rowspan="2" colspan="1"> <column> <property name="text"> <string>Domain</string> @@ -284,7 +284,7 @@ List of sites for which you have set a specific cookie policy. Specific policies <cstring>kListViewSearchLine</cstring> </property> </widget> - <widget class="KListViewSearchLine"> + <widget class="TDEListViewSearchLine"> <property name="name"> <cstring>kListViewSearchLine</cstring> </property> diff --git a/kcontrol/tdeio/manualproxy_ui.ui b/kcontrol/tdeio/manualproxy_ui.ui index 43567977e..dec7e70d4 100644 --- a/kcontrol/tdeio/manualproxy_ui.ui +++ b/kcontrol/tdeio/manualproxy_ui.ui @@ -287,7 +287,7 @@ Reverse the use of the exception list. Checking this box will result in the prox </size> </property> </spacer> - <widget class="KListBox" row="0" column="0" rowspan="5" colspan="1"> + <widget class="TDEListBox" row="0" column="0" rowspan="5" colspan="1"> <property name="name"> <cstring>lbExceptions</cstring> </property> diff --git a/kcontrol/tdeio/useragentdlg_ui.ui b/kcontrol/tdeio/useragentdlg_ui.ui index 1e5d55c4e..db158b1d0 100644 --- a/kcontrol/tdeio/useragentdlg_ui.ui +++ b/kcontrol/tdeio/useragentdlg_ui.ui @@ -192,7 +192,7 @@ By default, only minimal identification information is sent to remote sites. The <property name="margin"> <number>11</number> </property> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Site Name</string> diff --git a/kcontrol/tdm/tdm-conv.cpp b/kcontrol/tdm/tdm-conv.cpp index fa1260b7e..105630f40 100644 --- a/kcontrol/tdm/tdm-conv.cpp +++ b/kcontrol/tdm/tdm-conv.cpp @@ -134,7 +134,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) connect(npGroup, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); pl_label = new TQLabel(i18n("No password re&quired for:"), npGroup); - npuserlv = new KListView(npGroup); + npuserlv = new TDEListView(npGroup); pl_label->setBuddy(npuserlv); npuserlv->addColumn(TQString::null); npuserlv->header()->hide(); diff --git a/kcontrol/tdm/tdm-conv.h b/kcontrol/tdm/tdm-conv.h index 3f8dda974..1a086ec6c 100644 --- a/kcontrol/tdm/tdm-conv.h +++ b/kcontrol/tdm/tdm-conv.h @@ -73,7 +73,7 @@ private: TQRadioButton *npRadio, *ppRadio, *spRadio; KComboBox *userlb, *puserlb; TQSpinBox *delaysb; - KListView *npuserlv; + TDEListView *npuserlv; TQLabel *u_label, *d_label, *pu_label, *w_label, *n_label, *pl_label; TQString autoUser, preselUser; TQStringList noPassUsers; diff --git a/kcontrol/tdm/tdm-font.cpp b/kcontrol/tdm/tdm-font.cpp index 9947101c1..954759df6 100644 --- a/kcontrol/tdm/tdm-font.cpp +++ b/kcontrol/tdm/tdm-font.cpp @@ -44,7 +44,7 @@ TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name) { TQGridLayout *ml = new TQGridLayout(this, 5, 2, KDialog::marginHint(), KDialog::spacingHint()); TQLabel *label = new TQLabel(i18n("&General:"), this); - stdFontChooser = new KFontRequester(this); + stdFontChooser = new TDEFontRequester(this); label->setBuddy(stdFontChooser); TQWhatsThis::add( stdFontChooser, i18n("This changes the font which is used for all the text in the login manager except for the greeting and failure messages.") ); connect(stdFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged())); @@ -52,7 +52,7 @@ TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name) ml->addWidget(stdFontChooser, 1, 1); label = new TQLabel(i18n("&Failures:"), this); - failFontChooser = new KFontRequester(this); + failFontChooser = new TDEFontRequester(this); label->setBuddy(failFontChooser); TQWhatsThis::add( failFontChooser, i18n("This changes the font which is used for failure messages in the login manager.") ); connect(failFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged())); @@ -60,7 +60,7 @@ TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name) ml->addWidget(failFontChooser, 2, 1); label = new TQLabel(i18n("Gree&ting:"), this); - greetingFontChooser = new KFontRequester(this); + greetingFontChooser = new TDEFontRequester(this); label->setBuddy(greetingFontChooser); TQWhatsThis::add( greetingFontChooser, i18n("This changes the font which is used for the login manager's greeting.") ); connect(greetingFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged())); diff --git a/kcontrol/tdm/tdm-font.h b/kcontrol/tdm/tdm-font.h index 67b2c864d..fbbbc5028 100644 --- a/kcontrol/tdm/tdm-font.h +++ b/kcontrol/tdm/tdm-font.h @@ -22,7 +22,7 @@ #include <tqwidget.h> -class KFontRequester; +class TDEFontRequester; class TQCheckBox; class TDMFontWidget : public TQWidget @@ -46,9 +46,9 @@ protected slots: private: TQCheckBox *aacb; - KFontRequester *greetingFontChooser; - KFontRequester *failFontChooser; - KFontRequester *stdFontChooser; + TDEFontRequester *greetingFontChooser; + TDEFontRequester *failFontChooser; + TDEFontRequester *stdFontChooser; }; diff --git a/kcontrol/tdm/tdm-users.cpp b/kcontrol/tdm/tdm-users.cpp index daa507a51..65d57a894 100644 --- a/kcontrol/tdm/tdm-users.cpp +++ b/kcontrol/tdm/tdm-users.cpp @@ -127,7 +127,7 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name) wstack = new TQWidgetStack( this ); s_label = new TQLabel( wstack, i18n("S&elect users and groups:"), this ); - optinlv = new KListView( this ); + optinlv = new TDEListView( this ); optinlv->addColumn( i18n("Selected Users") ); optinlv->setResizeMode( TQListView::LastColumn ); TQWhatsThis::add( optinlv, i18n("TDM will show all checked users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") ); @@ -136,7 +136,7 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name) TQT_SLOT(slotUpdateOptIn( TQListViewItem * )) ); connect( optinlv, TQT_SIGNAL(clicked( TQListViewItem * )), TQT_SLOT(slotChanged()) ); - optoutlv = new KListView( this ); + optoutlv = new TDEListView( this ); optoutlv->addColumn( i18n("Hidden Users") ); optoutlv->setResizeMode( TQListView::LastColumn ); TQWhatsThis::add( optoutlv, i18n("TDM will show all non-checked non-system users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") ); diff --git a/kcontrol/tdm/tdm-users.h b/kcontrol/tdm/tdm-users.h index 8a87c28dd..c5167655c 100644 --- a/kcontrol/tdm/tdm-users.h +++ b/kcontrol/tdm/tdm-users.h @@ -84,7 +84,7 @@ private: TQLabel *s_label; // middle TQWidgetStack *wstack; - KListView *optoutlv, *optinlv; + TDEListView *optoutlv, *optinlv; TQButtonGroup *faceGroup; // right TQRadioButton *rbadmonly, *rbprefadm, *rbprefusr, *rbusronly; diff --git a/kdcop/kdcoplistview.cpp b/kdcop/kdcoplistview.cpp index cc727072b..eae4b0bfe 100644 --- a/kdcop/kdcoplistview.cpp +++ b/kdcop/kdcoplistview.cpp @@ -13,7 +13,7 @@ KDCOPListView::KDCOPListView ( TQWidget *parent, const char *name) - : KListView(parent, name) + : TDEListView(parent, name) { kdDebug() << "Building new list." << endl; setDragEnabled(true); diff --git a/kdcop/kdcoplistview.h b/kdcop/kdcoplistview.h index 9cb549f7f..1851d9569 100644 --- a/kdcop/kdcoplistview.h +++ b/kdcop/kdcoplistview.h @@ -11,7 +11,7 @@ #include <klistview.h> class TQDragObject; -class KDCOPListView : public KListView +class KDCOPListView : public TDEListView { Q_OBJECT diff --git a/kdcop/kdcopview.ui b/kdcop/kdcopview.ui index cfef4f95c..60092917a 100644 --- a/kdcop/kdcopview.ui +++ b/kdcop/kdcopview.ui @@ -20,7 +20,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="KListViewSearchLine" row="0" column="1"> + <widget class="TDEListViewSearchLine" row="0" column="1"> <property name="name"> <cstring>kListViewSearchLine1</cstring> </property> @@ -81,7 +81,7 @@ <number>0</number> </property> </widget> - <widget class="KListBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TDEListBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>lb_replyData</cstring> </property> diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp index 6eeb43009..d9e6baaa9 100644 --- a/kdcop/kdcopwindow.cpp +++ b/kdcop/kdcopwindow.cpp @@ -280,7 +280,7 @@ DCOPBrowserFunctionItem::setOpen(bool o) // ------------------------------------------------------------------------ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name) - : KMainWindow(parent, name) + : TDEMainWindow(parent, name) { dcopClient = kapp->dcopClient(); dcopClient->attach(); @@ -317,10 +317,10 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name) KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() ); - (void) new KAction( i18n( "&Reload" ), "reload", KStdAccel::shortcut(KStdAccel::Reload), TQT_TQOBJECT(this), TQT_SLOT( slotReload() ), actionCollection(), "reload" ); + (void) new TDEAction( i18n( "&Reload" ), "reload", TDEStdAccel::shortcut(TDEStdAccel::Reload), TQT_TQOBJECT(this), TQT_SLOT( slotReload() ), actionCollection(), "reload" ); exeaction = - new KAction + new TDEAction ( i18n("&Execute"), "exec", @@ -334,7 +334,7 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name) exeaction->setEnabled(false); exeaction->setToolTip(i18n("Execute the selected DCOP call.")); - langmode = new KSelectAction ( i18n("Language Mode"), + langmode = new TDESelectAction ( i18n("Language Mode"), CTRL + Key_M, TQT_TQOBJECT(this), TQT_SLOT(slotMode()), diff --git a/kdcop/kdcopwindow.h b/kdcop/kdcopwindow.h index 39612cac9..ce8d94a4a 100644 --- a/kdcop/kdcopwindow.h +++ b/kdcop/kdcopwindow.h @@ -9,8 +9,8 @@ class DCOPClient; class TQListViewItem; -class KAction; -class KSelectAction; +class TDEAction; +class TDESelectAction; class TQWidgetStack; class TQLabel; class KDCOPListView; @@ -19,7 +19,7 @@ class KDCOPListView; #include "kdcoplistview.h" #include "kdcopview.h" -class KDCOPWindow : public KMainWindow +class KDCOPWindow : public TDEMainWindow { Q_OBJECT @@ -53,8 +53,8 @@ class KDCOPWindow : public KMainWindow bool demarshal(TQCString & replyType, TQDataStream & reply, TQListBox *theList); DCOPClient * dcopClient; - KAction * exeaction; - KSelectAction * langmode; + TDEAction * exeaction; + TDESelectAction * langmode; kdcopview * mainView; TQVBoxLayout * mainLayout; }; diff --git a/kdebugdialog/klistdebugdialog.cpp b/kdebugdialog/klistdebugdialog.cpp index 376f8d7d9..68d02fd7b 100644 --- a/kdebugdialog/klistdebugdialog.cpp +++ b/kdebugdialog/klistdebugdialog.cpp @@ -30,7 +30,7 @@ #include <klineedit.h> #include <dcopclient.h> -KListDebugDialog::KListDebugDialog( TQStringList areaList, TQWidget *parent, const char *name, bool modal ) +TDEListDebugDialog::TDEListDebugDialog( TQStringList areaList, TQWidget *parent, const char *name, bool modal ) : KAbstractDebugDialog( parent, name, modal ), m_areaList( areaList ) { @@ -65,7 +65,7 @@ KListDebugDialog::KListDebugDialog( TQStringList areaList, TQWidget *parent, con resize( 350, 400 ); } -void KListDebugDialog::generateCheckBoxes( const TQString& filter ) +void TDEListDebugDialog::generateCheckBoxes( const TQString& filter ) { TQPtrListIterator<TQCheckBox> cb_it ( boxes ); for( ; cb_it.current() ; ++cb_it ) @@ -102,7 +102,7 @@ void KListDebugDialog::generateCheckBoxes( const TQString& filter ) load(); } -void KListDebugDialog::selectAll() +void TDEListDebugDialog::selectAll() { TQPtrListIterator<TQCheckBox> it ( boxes ); for ( ; it.current() ; ++it ) { @@ -111,7 +111,7 @@ void KListDebugDialog::selectAll() } } -void KListDebugDialog::deSelectAll() +void TDEListDebugDialog::deSelectAll() { TQPtrListIterator<TQCheckBox> it ( boxes ); for ( ; it.current() ; ++it ) { @@ -120,7 +120,7 @@ void KListDebugDialog::deSelectAll() } } -void KListDebugDialog::load() +void TDEListDebugDialog::load() { TQPtrListIterator<TQCheckBox> it ( boxes ); for ( ; it.current() ; ++it ) @@ -152,7 +152,7 @@ void KListDebugDialog::load() } } -void KListDebugDialog::save() +void TDEListDebugDialog::save() { TQPtrListIterator<TQCheckBox> it ( boxes ); for ( ; it.current() ; ++it ) @@ -176,7 +176,7 @@ void KListDebugDialog::save() m_changes.clear(); } -void KListDebugDialog::activateArea( TQCString area, bool activate ) +void TDEListDebugDialog::activateArea( TQCString area, bool activate ) { TQPtrListIterator<TQCheckBox> it ( boxes ); for ( ; it.current() ; ++it ) diff --git a/kdebugdialog/klistdebugdialog.h b/kdebugdialog/klistdebugdialog.h index 46bc72b18..07fa0bc91 100644 --- a/kdebugdialog/klistdebugdialog.h +++ b/kdebugdialog/klistdebugdialog.h @@ -35,13 +35,13 @@ class KLineEdit; * * @author David Faure <[email protected]> */ -class KListDebugDialog : public KAbstractDebugDialog +class TDEListDebugDialog : public KAbstractDebugDialog { Q_OBJECT public: - KListDebugDialog( TQStringList areaList, TQWidget *parent=0, const char *name=0, bool modal=true ); - virtual ~KListDebugDialog() {} + TDEListDebugDialog( TQStringList areaList, TQWidget *parent=0, const char *name=0, bool modal=true ); + virtual ~TDEListDebugDialog() {} void activateArea( TQCString area, bool activate ); diff --git a/kdebugdialog/main.cpp b/kdebugdialog/main.cpp index 5f36b77cc..e1635ef26 100644 --- a/kdebugdialog/main.cpp +++ b/kdebugdialog/main.cpp @@ -94,7 +94,7 @@ int main(int argc, char ** argv) dialog = new KDebugDialog(areaList, 0L); else { - KListDebugDialog * listdialog = new KListDebugDialog(areaList, 0L); + TDEListDebugDialog * listdialog = new TDEListDebugDialog(areaList, 0L); if (args->isSet("on")) { listdialog->activateArea( args->getOption("on"), true ); diff --git a/kdesktop/bgmanager.h b/kdesktop/bgmanager.h index e73337db4..2d29278f7 100644 --- a/kdesktop/bgmanager.h +++ b/kdesktop/bgmanager.h @@ -22,7 +22,7 @@ class TDEConfig; class TQTimer; class TQPixmap; -class KPopupMenu; +class TDEPopupMenu; class KWinModule; class KPixmap; class KVirtualBGRenderer; diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc index 07fbaf5cd..9ff390ec6 100644 --- a/kdesktop/desktop.cc +++ b/kdesktop/desktop.cc @@ -62,7 +62,7 @@ #include <kpopupmenu.h> #include <kapplication.h> #include <kdirlister.h> -// Create the equivalent of KAccelBase::connectItem +// Create the equivalent of TDEAccelBase::connectItem // and then remove this include and fix reconnects in initRoot() -- ellis //#include <kaccelbase.h> @@ -454,8 +454,8 @@ void KDesktop::initConfig() keys->updateConnections(); } - KLaunchSettings::self()->readConfig(); - if( !KLaunchSettings::busyCursor() ) + TDELaunchSettings::self()->readConfig(); + if( !TDELaunchSettings::busyCursor() ) { delete startup_id; startup_id = NULL; @@ -748,7 +748,7 @@ void KDesktop::toggleShowDesktop() setShowDesktop(!showDesktopState()); } -KActionCollection * KDesktop::actionCollection() +TDEActionCollection * KDesktop::actionCollection() { if (!m_pIconView) return 0; @@ -929,7 +929,7 @@ void KDesktop::slotSwitchDesktops(int delta) void KDesktop::handleColorDropEvent(TQDropEvent * e) { - KPopupMenu popup; + TDEPopupMenu popup; popup.insertItem(SmallIconSet("colors"),i18n("Set as Primary Background Color"), 1); popup.insertItem(SmallIconSet("colors"),i18n("Set as Secondary Background Color"), 2); int result = popup.exec(e->pos()); @@ -946,7 +946,7 @@ void KDesktop::handleColorDropEvent(TQDropEvent * e) void KDesktop::handleImageDropEvent(TQDropEvent * e) { - KPopupMenu popup; + TDEPopupMenu popup; if ( m_pIconView ) popup.insertItem(SmallIconSet("filesave"),i18n("&Save to Desktop..."), 1); if ( ( m_pIconView && m_pIconView->maySetWallpaper() ) || m_pRootWidget ) diff --git a/kdesktop/desktop.h b/kdesktop/desktop.h index 3aa81241c..0620dcd4d 100644 --- a/kdesktop/desktop.h +++ b/kdesktop/desktop.h @@ -39,7 +39,7 @@ class TQTimer; class StartupId; class KDIconView; class Minicli; -class KActionCollection; +class TDEActionCollection; class KRootWidget : public TQObject { @@ -99,7 +99,7 @@ public: KWinModule* twinModule() const { return m_pKwinmodule; } // The action collection of the active widget - KActionCollection *actionCollection(); + TDEActionCollection *actionCollection(); // The URL (for the File/New menu) KURL url() const; diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc index ba772c39d..d80af8fe7 100644 --- a/kdesktop/kdiconview.cc +++ b/kdesktop/kdiconview.cc @@ -418,35 +418,35 @@ void KDIconView::createActions() { if (m_bEditableDesktopIcons) { - KAction *undo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), &m_actionCollection, "undo" ); + TDEAction *undo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), &m_actionCollection, "undo" ); connect( KonqUndoManager::self(), TQT_SIGNAL( undoAvailable( bool ) ), undo, TQT_SLOT( setEnabled( bool ) ) ); connect( KonqUndoManager::self(), TQT_SIGNAL( undoTextChanged( const TQString & ) ), undo, TQT_SLOT( setText( const TQString & ) ) ); undo->setEnabled( KonqUndoManager::self()->undoAvailable() ); - KAction* paCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( slotCut() ), &m_actionCollection, "cut" ); - KShortcut cutShortCut = paCut->shortcut(); + TDEAction* paCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( slotCut() ), &m_actionCollection, "cut" ); + TDEShortcut cutShortCut = paCut->shortcut(); cutShortCut.remove( KKey( SHIFT + Key_Delete ) ); // used for deleting files paCut->setShortcut( cutShortCut ); KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy() ), &m_actionCollection, "copy" ); KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPaste() ), &m_actionCollection, "paste" ); - KAction *pasteTo = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPopupPasteTo() ), &m_actionCollection, "pasteto" ); + TDEAction *pasteTo = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPopupPasteTo() ), &m_actionCollection, "pasteto" ); pasteTo->setEnabled( false ); // only enabled during popupMenu() - KShortcut reloadShortcut = KStdAccel::shortcut(KStdAccel::Reload); - new KAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( refreshIcons() ), &m_actionCollection, "reload" ); + TDEShortcut reloadShortcut = TDEStdAccel::shortcut(TDEStdAccel::Reload); + new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( refreshIcons() ), &m_actionCollection, "reload" ); - (void) new KAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, TQT_TQOBJECT(this), TQT_SLOT( renameSelectedItem() ), &m_actionCollection, "rename" ); - (void) new KAction( i18n( "&Properties" ), ALT+Key_Return, TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ), &m_actionCollection, "properties" ); - KAction* trash = new KAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, &m_actionCollection, "trash" ); - connect( trash, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ), - this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, TQt::ButtonState ) ) ); + (void) new TDEAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, TQT_TQOBJECT(this), TQT_SLOT( renameSelectedItem() ), &m_actionCollection, "rename" ); + (void) new TDEAction( i18n( "&Properties" ), ALT+Key_Return, TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ), &m_actionCollection, "properties" ); + TDEAction* trash = new TDEAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, &m_actionCollection, "trash" ); + connect( trash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), + this, TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) ); TDEConfig config("kdeglobals", true, false); config.setGroup( "KDE" ); - (void) new KAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotDelete() ), &m_actionCollection, "del" ); + (void) new TDEAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotDelete() ), &m_actionCollection, "del" ); // Initial state of the actions (cut/copy/paste/...) slotSelectionChanged(); @@ -870,12 +870,12 @@ bool KDIconView::deleteGlobalDesktopFiles() return !itemsLeft; } -void KDIconView::slotTrashActivated( KAction::ActivationReason reason, TQt::ButtonState state ) +void KDIconView::slotTrashActivated( TDEAction::ActivationReason reason, TQt::ButtonState state ) { if (deleteGlobalDesktopFiles()) return; // All items deleted - if ( reason == KAction::PopupMenuActivation && ( state & TQt::ShiftButton ) ) + if ( reason == TDEAction::PopupMenuActivation && ( state & TQt::ShiftButton ) ) KonqOperations::del(this, KonqOperations::DEL, selectedUrls()); else KonqOperations::del(this, KonqOperations::TRASH, selectedUrls()); @@ -899,7 +899,7 @@ void KDIconView::popupMenu( const TQPoint &_global, const KFileItemList& _items if ( _items.count() == 1 ) m_popupURL = _items.getFirst()->url(); - KAction* pasteTo = m_actionCollection.action( "pasteto" ); + TDEAction* pasteTo = m_actionCollection.action( "pasteto" ); if (pasteTo) pasteTo->setEnabled( m_actionCollection.action( "paste" )->isEnabled() ); @@ -945,7 +945,7 @@ void KDIconView::slotEnableAction( const char * name, bool enabled ) if ( sName == "properties" || sName == "editMimeType" ) return; - KAction * act = m_actionCollection.action( sName.data() ); + TDEAction * act = m_actionCollection.action( sName.data() ); if (act) act->setEnabled( enabled ); } @@ -1409,7 +1409,7 @@ void KDIconView::slotClipboardDataChanged() TQString actionText = TDEIO::pasteActionText(); bool paste = !actionText.isEmpty(); if ( paste ) { - KAction* pasteAction = m_actionCollection.action( "paste" ); + TDEAction* pasteAction = m_actionCollection.action( "paste" ); if ( pasteAction ) pasteAction->setText( actionText ); } diff --git a/kdesktop/kdiconview.h b/kdesktop/kdiconview.h index c9feecaf7..7d8ff1527 100644 --- a/kdesktop/kdiconview.h +++ b/kdesktop/kdiconview.h @@ -33,7 +33,7 @@ class KDirLister; class KonqSettings; class KSimpleConfig; -class KAccel; +class TDEAccel; class KShadowEngine; class KDesktopShadowSettings; @@ -60,7 +60,7 @@ public: */ void start(); - KActionCollection *actionCollection() { return &m_actionCollection; } + TDEActionCollection *actionCollection() { return &m_actionCollection; } enum SortCriterion { NameCaseSensitive = 0, NameCaseInsensitive, Size, Type, Date }; @@ -138,7 +138,7 @@ protected slots: // slots connected to the popupmenu (actions) void slotCut(); void slotCopy(); - void slotTrashActivated( KAction::ActivationReason reason, TQt::ButtonState state ); + void slotTrashActivated( TDEAction::ActivationReason reason, TQt::ButtonState state ); void slotDelete(); void slotPopupPasteTo(); void slotProperties(); @@ -200,10 +200,10 @@ private: static void readIconPosition(KSimpleConfig *config, int &x, int &y); /** Our action collection, parent of all our actions */ - KActionCollection m_actionCollection; + TDEActionCollection m_actionCollection; - /** KAccel object, to make the actions shortcuts work */ - KAccel *m_accel; + /** TDEAccel object, to make the actions shortcuts work */ + TDEAccel *m_accel; bool m_bNeedRepaint; bool m_bNeedSave; diff --git a/kdesktop/klaunchsettings.kcfgc b/kdesktop/klaunchsettings.kcfgc index 0cf4f73eb..4d10d280f 100644 --- a/kdesktop/klaunchsettings.kcfgc +++ b/kdesktop/klaunchsettings.kcfgc @@ -1,4 +1,4 @@ File=klaunch.kcfg -ClassName=KLaunchSettings +ClassName=TDELaunchSettings Singleton=true Mutators=true diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc index a263b529c..62bb0e2bc 100644 --- a/kdesktop/krootwm.cc +++ b/kdesktop/krootwm.cc @@ -72,7 +72,7 @@ extern TQCString kdesktop_name, kicker_name, twin_name; KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop), startup(FALSE) { s_rootWm = this; - m_actionCollection = new KActionCollection(_desktop, this, "KRootWm::m_actionCollection"); + m_actionCollection = new TDEActionCollection(_desktop, this, "KRootWm::m_actionCollection"); m_pDesktop = _desktop; m_bDesktopEnabled = (m_pDesktop->iconView() != 0); customMenu1 = 0; @@ -92,9 +92,9 @@ KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop), startup(FALSE) m_pDesktop->iconView(), TQT_SLOT( slotNewMenuActivated() ) ); } - if (kapp->authorizeKAction("bookmarks")) + if (kapp->authorizeTDEAction("bookmarks")) { - bookmarks = new KActionMenu( i18n("Bookmarks"), "bookmark", m_actionCollection, "bookmarks" ); + bookmarks = new TDEActionMenu( i18n("Bookmarks"), "bookmark", m_actionCollection, "bookmarks" ); // The KBookmarkMenu is needed to fill the Bookmarks menu in the desktop menubar. bookmarkMenu = new KBookmarkMenu( KonqBookmarkManager::self(), new KBookmarkOwner(), bookmarks->popupMenu(), @@ -119,8 +119,8 @@ KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop), startup(FALSE) if (m_bDesktopEnabled) { // Don't do that! One action in two parent collections means some invalid write - // during the second ~KActionCollection. - KAction *action = m_pDesktop->actionCollection()->action( "paste" ); + // during the second ~TDEActionCollection. + TDEAction *action = m_pDesktop->actionCollection()->action( "paste" ); if (action) m_actionCollection->insert( action ); action = m_pDesktop->actionCollection()->action( "undo" ); @@ -131,79 +131,79 @@ KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop), startup(FALSE) if (kapp->authorize("run_command")) { - new KAction(i18n("Run Command..."), "run", 0, TQT_TQOBJECT(m_pDesktop), TQT_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" ); - new KAction(i18n("Open Terminal Here..." ), "terminal", CTRL+Key_T, this, TQT_SLOT( slotOpenTerminal() ), + new TDEAction(i18n("Run Command..."), "run", 0, TQT_TQOBJECT(m_pDesktop), TQT_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" ); + new TDEAction(i18n("Open Terminal Here..." ), "terminal", CTRL+Key_T, this, TQT_SLOT( slotOpenTerminal() ), m_actionCollection, "open_terminal" ); } if (!TDEGlobal::config()->isImmutable()) { - new KAction(i18n("Configure Desktop..."), "configure", 0, this, TQT_SLOT( slotConfigureDesktop() ), + new TDEAction(i18n("Configure Desktop..."), "configure", 0, this, TQT_SLOT( slotConfigureDesktop() ), m_actionCollection, "configdesktop" ); - new KAction(i18n("Disable Desktop Menu"), 0, this, TQT_SLOT( slotToggleDesktopMenu() ), + new TDEAction(i18n("Disable Desktop Menu"), 0, this, TQT_SLOT( slotToggleDesktopMenu() ), m_actionCollection, "togglemenubar" ); } - new KAction(i18n("Unclutter Windows"), 0, this, TQT_SLOT( slotUnclutterWindows() ), + new TDEAction(i18n("Unclutter Windows"), 0, this, TQT_SLOT( slotUnclutterWindows() ), m_actionCollection, "unclutter" ); - new KAction(i18n("Cascade Windows"), 0, this, TQT_SLOT( slotCascadeWindows() ), + new TDEAction(i18n("Cascade Windows"), 0, this, TQT_SLOT( slotCascadeWindows() ), m_actionCollection, "cascade" ); // arrange menu actions if (m_bDesktopEnabled && kapp->authorize("editable_desktop_icons")) { - new KAction(i18n("By Name (Case Sensitive)"), 0, this, TQT_SLOT( slotArrangeByNameCS() ), + new TDEAction(i18n("By Name (Case Sensitive)"), 0, this, TQT_SLOT( slotArrangeByNameCS() ), m_actionCollection, "sort_ncs"); - new KAction(i18n("By Name (Case Insensitive)"), 0, this, TQT_SLOT( slotArrangeByNameCI() ), + new TDEAction(i18n("By Name (Case Insensitive)"), 0, this, TQT_SLOT( slotArrangeByNameCI() ), m_actionCollection, "sort_nci"); - new KAction(i18n("By Size"), 0, this, TQT_SLOT( slotArrangeBySize() ), + new TDEAction(i18n("By Size"), 0, this, TQT_SLOT( slotArrangeBySize() ), m_actionCollection, "sort_size"); - new KAction(i18n("By Type"), 0, this, TQT_SLOT( slotArrangeByType() ), + new TDEAction(i18n("By Type"), 0, this, TQT_SLOT( slotArrangeByType() ), m_actionCollection, "sort_type"); - new KAction(i18n("By Date"), 0, this, TQT_SLOT( slotArrangeByDate() ), + new TDEAction(i18n("By Date"), 0, this, TQT_SLOT( slotArrangeByDate() ), m_actionCollection, "sort_date"); - KToggleAction *aSortDirsFirst = new KToggleAction( i18n("Directories First"), 0, m_actionCollection, "sort_directoriesfirst" ); + TDEToggleAction *aSortDirsFirst = new TDEToggleAction( i18n("Directories First"), 0, m_actionCollection, "sort_directoriesfirst" ); connect( aSortDirsFirst, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotToggleDirFirst( bool ) ) ); - new KAction(i18n("Line Up Horizontally"), 0, + new TDEAction(i18n("Line Up Horizontally"), 0, this, TQT_SLOT( slotLineupIconsHoriz() ), m_actionCollection, "lineupHoriz" ); - new KAction(i18n("Line Up Vertically"), 0, + new TDEAction(i18n("Line Up Vertically"), 0, this, TQT_SLOT( slotLineupIconsVert() ), m_actionCollection, "lineupVert" ); - KToggleAction *aAutoAlign = new KToggleAction(i18n("Align to Grid"), 0, + TDEToggleAction *aAutoAlign = new TDEToggleAction(i18n("Align to Grid"), 0, m_actionCollection, "realign" ); connect( aAutoAlign, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotToggleAutoAlign( bool ) ) ); - KToggleAction *aLockIcons = new KToggleAction(i18n("Lock in Place"), 0, m_actionCollection, "lock_icons"); + TDEToggleAction *aLockIcons = new TDEToggleAction(i18n("Lock in Place"), 0, m_actionCollection, "lock_icons"); connect( aLockIcons, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotToggleLockIcons( bool ) ) ); } if (m_bDesktopEnabled) { - new KAction(i18n("Refresh Desktop"), "desktop", 0, this, TQT_SLOT( slotRefreshDesktop() ), + new TDEAction(i18n("Refresh Desktop"), "desktop", 0, this, TQT_SLOT( slotRefreshDesktop() ), m_actionCollection, "refresh" ); } // Icons in sync with kicker if (kapp->authorize("lock_screen")) { - new KAction(i18n("Lock Session"), "lock", 0, this, TQT_SLOT( slotLock() ), + new TDEAction(i18n("Lock Session"), "lock", 0, this, TQT_SLOT( slotLock() ), m_actionCollection, "lock" ); } if (kapp->authorize("logout")) { - new KAction(i18n("Log Out \"%1\"...").arg(KUser().loginName()), "exit", 0, + new TDEAction(i18n("Log Out \"%1\"...").arg(KUser().loginName()), "exit", 0, this, TQT_SLOT( slotLogout() ), m_actionCollection, "logout" ); } if (kapp->authorize("start_new_session") && DM().isSwitchable()) { - new KAction(i18n("Start New Session"), "fork", 0, this, + new TDEAction(i18n("Start New Session"), "fork", 0, this, TQT_SLOT( slotNewSession() ), m_actionCollection, "newsession" ); if (kapp->authorize("lock_screen")) { - new KAction(i18n("Lock Current && Start New Session"), "lock", 0, this, + new TDEAction(i18n("Lock Current && Start New Session"), "lock", 0, this, TQT_SLOT( slotLockNNewSession() ), m_actionCollection, "lockNnewsession" ); } } @@ -248,14 +248,14 @@ void KRootWm::initConfig() m_pDesktop->iconView()->setAutoAlign( KDesktopSettings::autoLineUpIcons() ); if ( kapp->authorize( "editable_desktop_icons" ) ) { m_pDesktop->iconView()->setItemsMovable( !KDesktopSettings::lockIcons() ); - KToggleAction *aLockIcons = static_cast<KToggleAction*>(m_actionCollection->action("lock_icons")); + TDEToggleAction *aLockIcons = static_cast<TDEToggleAction*>(m_actionCollection->action("lock_icons")); if (aLockIcons) aLockIcons->setChecked( KDesktopSettings::lockIcons() ); } - KToggleAction *aAutoAlign = static_cast<KToggleAction*>(m_actionCollection->action("realign")); + TDEToggleAction *aAutoAlign = static_cast<TDEToggleAction*>(m_actionCollection->action("realign")); if (aAutoAlign) aAutoAlign->setChecked( KDesktopSettings::autoLineUpIcons() ); - KToggleAction *aSortDirsFirst = static_cast<KToggleAction*>(m_actionCollection->action("sort_directoriesfirst")); + TDEToggleAction *aSortDirsFirst = static_cast<TDEToggleAction*>(m_actionCollection->action("sort_directoriesfirst")); if (aSortDirsFirst) aSortDirsFirst->setChecked( KDesktopSettings::sortDirectoriesFirst() ); } @@ -285,7 +285,7 @@ void KRootWm::buildMenus() // create Arrange menu TQPopupMenu *pArrangeMenu = 0; TQPopupMenu *pLineupMenu = 0; - KAction *action; + TDEAction *action; help = new KHelpMenu(0, 0, false); help->menu()->removeItem( KHelpMenu::menuAboutApp ); @@ -437,7 +437,7 @@ void KRootWm::buildMenus() m_actionCollection->action( "lineupVert" )->plug( pIconOperationsMenu ); pIconOperationsMenu->insertSeparator(); m_actionCollection->action( "realign" )->plug( pIconOperationsMenu ); - KAction *aLockIcons = m_actionCollection->action( "lock_icons" ); + TDEAction *aLockIcons = m_actionCollection->action( "lock_icons" ); if ( aLockIcons ) aLockIcons->plug( pIconOperationsMenu ); @@ -665,7 +665,7 @@ void KRootWm::slotArrangeByNameCS() { if (m_bDesktopEnabled) { - bool b = static_cast<KToggleAction *>(m_actionCollection->action("sort_directoriesfirst"))->isChecked(); + bool b = static_cast<TDEToggleAction *>(m_actionCollection->action("sort_directoriesfirst"))->isChecked(); m_pDesktop->iconView()->rearrangeIcons( KDIconView::NameCaseSensitive, b); } } @@ -674,7 +674,7 @@ void KRootWm::slotArrangeByNameCI() { if (m_bDesktopEnabled) { - bool b = static_cast<KToggleAction *>(m_actionCollection->action("sort_directoriesfirst"))->isChecked(); + bool b = static_cast<TDEToggleAction *>(m_actionCollection->action("sort_directoriesfirst"))->isChecked(); m_pDesktop->iconView()->rearrangeIcons( KDIconView::NameCaseInsensitive, b); } } @@ -683,7 +683,7 @@ void KRootWm::slotArrangeBySize() { if (m_bDesktopEnabled) { - bool b = static_cast<KToggleAction *>(m_actionCollection->action("sort_directoriesfirst"))->isChecked(); + bool b = static_cast<TDEToggleAction *>(m_actionCollection->action("sort_directoriesfirst"))->isChecked(); m_pDesktop->iconView()->rearrangeIcons( KDIconView::Size, b); } } @@ -692,7 +692,7 @@ void KRootWm::slotArrangeByDate() { if (m_bDesktopEnabled) { - bool b = static_cast<KToggleAction *>( m_actionCollection->action( "sort_directoriesfirst" ) )->isChecked(); + bool b = static_cast<TDEToggleAction *>( m_actionCollection->action( "sort_directoriesfirst" ) )->isChecked(); m_pDesktop->iconView()->rearrangeIcons( KDIconView::Date, b ); } } @@ -701,7 +701,7 @@ void KRootWm::slotArrangeByType() { if (m_bDesktopEnabled) { - bool b = static_cast<KToggleAction *>(m_actionCollection->action("sort_directoriesfirst"))->isChecked(); + bool b = static_cast<TDEToggleAction *>(m_actionCollection->action("sort_directoriesfirst"))->isChecked(); m_pDesktop->iconView()->rearrangeIcons( KDIconView::Type, b); } } @@ -835,7 +835,7 @@ void KRootWm::slotLogout() { void KRootWm::slotPopulateSessions() { - KAction *action; + TDEAction *action; int p; DM dm; diff --git a/kdesktop/krootwm.h b/kdesktop/krootwm.h index 5bccc36c0..dabe5ac23 100644 --- a/kdesktop/krootwm.h +++ b/kdesktop/krootwm.h @@ -39,8 +39,8 @@ class KNewMenu; class KWinModule; class KBookmarkMenu; class KHelpMenu; -class KActionCollection; -class KActionMenu; +class TDEActionCollection; +class TDEActionMenu; class KWindowListMenu; enum { @@ -141,9 +141,9 @@ private: menuChoice rightButtonChoice; KNewMenu* menuNew; - KActionMenu* bookmarks; + TDEActionMenu* bookmarks; KBookmarkMenu* bookmarkMenu; - KActionCollection * m_actionCollection; + TDEActionCollection * m_actionCollection; TQPoint m_desktopMenuPosition; void activateMenu( menuChoice choice, const TQPoint& global ); diff --git a/kdesktop/main.cc b/kdesktop/main.cc index 9f549e54a..5730305c3 100644 --- a/kdesktop/main.cc +++ b/kdesktop/main.cc @@ -280,7 +280,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) } // for the KDE-already-running check in starttde - KSelectionOwner kde_running( "_KDE_RUNNING", 0 ); + TDESelectionOwner kde_running( "_KDE_RUNNING", 0 ); kde_running.claim( false ); KDesktop desktop( x_root_hack, wait_for_kded ); diff --git a/kdesktop/pixmapserver.cc b/kdesktop/pixmapserver.cc index 58389ae56..d8cde0562 100644 --- a/kdesktop/pixmapserver.cc +++ b/kdesktop/pixmapserver.cc @@ -72,7 +72,7 @@ void KPixmapServer::add(TQString name, TQPixmap *pm, bool overwrite) pi.selection = sel; m_Names[name] = pi; - KSelectionInode si; + TDESelectionInode si; si.name = name; si.handle = pm->handle(); m_Selections[sel] = si; @@ -163,7 +163,7 @@ bool KPixmapServer::x11Event(XEvent *event) SelectionIterator it = m_Selections.find(sel); if (it == m_Selections.end()) return false; - KSelectionInode si = it.data(); + TDESelectionInode si = it.data(); // Only convert to pixmap if (ev->target != pixmap) diff --git a/kdesktop/pixmapserver.h b/kdesktop/pixmapserver.h index f5c877f17..3084cd0a3 100644 --- a/kdesktop/pixmapserver.h +++ b/kdesktop/pixmapserver.h @@ -35,7 +35,7 @@ struct KPixmapData int refcount; }; -struct KSelectionInode +struct TDESelectionInode { Qt::HANDLE handle; TQString name; @@ -110,12 +110,12 @@ private: Atom pixmap; TQMap<TQString,KPixmapInode> m_Names; - TQMap<Atom,KSelectionInode> m_Selections; + TQMap<Atom,TDESelectionInode> m_Selections; TQMap<HANDLE,KPixmapData> m_Data; TQMap<Atom,HANDLE> m_Active; typedef TQMap<TQString,KPixmapInode>::Iterator NameIterator; - typedef TQMap<Atom,KSelectionInode>::Iterator SelectionIterator; + typedef TQMap<Atom,TDESelectionInode>::Iterator SelectionIterator; typedef TQMap<HANDLE,KPixmapData>::Iterator DataIterator; typedef TQMap<Atom,HANDLE>::Iterator AtomIterator; }; diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp index 2cedadcdf..0572413a8 100644 --- a/kdesktop/startupid.cpp +++ b/kdesktop/startupid.cpp @@ -75,9 +75,9 @@ StartupId::~StartupId() void StartupId::configure() { - startup_info.setTimeout( KLaunchSettings::timeout()); - blinking = KLaunchSettings::blinking(); - bouncing = KLaunchSettings::bouncing(); + startup_info.setTimeout( TDELaunchSettings::timeout()); + blinking = TDELaunchSettings::blinking(); + bouncing = TDELaunchSettings::bouncing(); } void StartupId::gotNewStartup( const TDEStartupInfoId& id_P, const TDEStartupInfoData& data_P ) diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp index a482a2c15..2f365c129 100644 --- a/kdialog/kdialog.cpp +++ b/kdialog/kdialog.cpp @@ -512,7 +512,7 @@ static int directCommand(TDECmdLineArgs *args) } else { // getsavefilename TQString result = dlg.selectedFile(); if (!result.isEmpty()) { - KRecentDocument::add(result); + TDERecentDocument::add(result); cout << result.local8Bit().data() << endl; return 0; } diff --git a/kdialog/klistboxdialog.cpp b/kdialog/klistboxdialog.cpp index d7abfb694..65be6c71e 100644 --- a/kdialog/klistboxdialog.cpp +++ b/kdialog/klistboxdialog.cpp @@ -26,7 +26,7 @@ #include "klocale.h" -KListBoxDialog::KListBoxDialog(TQString text, TQWidget *parent) +TDEListBoxDialog::TDEListBoxDialog(TQString text, TQWidget *parent) : KDialogBase( parent, 0, true, TQString::null, Ok|Cancel, Ok, true ) { TQVBox *page = makeVBoxMainWidget(); @@ -38,13 +38,13 @@ KListBoxDialog::KListBoxDialog(TQString text, TQWidget *parent) table->setFocus(); } -void KListBoxDialog::insertItem(const TQString& item) +void TDEListBoxDialog::insertItem(const TQString& item) { table->insertItem(item); table->setCurrentItem(0); } -void KListBoxDialog::setCurrentItem(const TQString& item) +void TDEListBoxDialog::setCurrentItem(const TQString& item) { for ( int i=0; i < (int) table->count(); i++ ) { if ( table->text(i) == item ) { @@ -54,7 +54,7 @@ void KListBoxDialog::setCurrentItem(const TQString& item) } } -int KListBoxDialog::currentItem() +int TDEListBoxDialog::currentItem() { return table->currentItem(); } diff --git a/kdialog/klistboxdialog.h b/kdialog/klistboxdialog.h index fb73383f1..37d77f142 100644 --- a/kdialog/klistboxdialog.h +++ b/kdialog/klistboxdialog.h @@ -23,14 +23,14 @@ #include <kdialogbase.h> -class KListBoxDialog : public KDialogBase +class TDEListBoxDialog : public KDialogBase { Q_OBJECT public: - KListBoxDialog(TQString text, TQWidget *parent=0); - ~KListBoxDialog() {}; + TDEListBoxDialog(TQString text, TQWidget *parent=0); + ~TDEListBoxDialog() {}; TQListBox &getTable() { return *table; }; diff --git a/kdialog/widgets.cpp b/kdialog/widgets.cpp index 536ffadce..1563a817b 100644 --- a/kdialog/widgets.cpp +++ b/kdialog/widgets.cpp @@ -175,7 +175,7 @@ bool Widgets::comboBox(TQWidget *parent, const TQString& title, const TQString& bool Widgets::listBox(TQWidget *parent, const TQString& title, const TQString& text, const TQStringList& args, const TQString& defaultEntry, TQString &result) { - KListBoxDialog box(text,parent); + TDEListBoxDialog box(text,parent); kapp->setTopWidget( &box ); box.setCaption(title); @@ -201,7 +201,7 @@ bool Widgets::checkList(TQWidget *parent, const TQString& title, const TQString& result.clear(); - KListBoxDialog box(text,parent); + TDEListBoxDialog box(text,parent); TQListBox &table = box.getTable(); @@ -245,7 +245,7 @@ bool Widgets::radioBox(TQWidget *parent, const TQString& title, const TQString& { TQStringList entries, tags; - KListBoxDialog box(text,parent); + TDEListBoxDialog box(text,parent); TQListBox &table = box.getTable(); diff --git a/kfind/ChangeLog b/kfind/ChangeLog index 61359c8a5..18b80091a 100644 --- a/kfind/ChangeLog +++ b/kfind/ChangeLog @@ -88,7 +88,7 @@ ver. 0.3.3: ver. 0.3.2: - o uses KTopLevelWidget and KToolBar + o uses KTopLevelWidget and TDEToolBar o new documentations ver. 0.3.1: diff --git a/kfind/kdatecombo.cpp b/kfind/kdatecombo.cpp index b901b0f0d..d27ea7a3b 100644 --- a/kfind/kdatecombo.cpp +++ b/kfind/kdatecombo.cpp @@ -30,7 +30,7 @@ KDateCombo::KDateCombo(const TQDate & date, TQWidget *parent, const char *name) void KDateCombo::initObject(const TQDate & date, TQWidget *, const char *) { clearValidator(); - popupFrame = new KPopupFrame(this, "popupFrame"); + popupFrame = new TDEPopupFrame(this, "popupFrame"); popupFrame->installEventFilter(this); datePicker = new KDatePicker(popupFrame, date, "datePicker"); datePicker->setMinimumSize(datePicker->sizeHint()); diff --git a/kfind/kdatecombo.h b/kfind/kdatecombo.h index ab714a3ba..d1aa3ecdc 100644 --- a/kfind/kdatecombo.h +++ b/kfind/kdatecombo.h @@ -16,7 +16,7 @@ */ class KDatePicker; -class KPopupFrame; +class TDEPopupFrame; class KDateCombo : public TQComboBox { Q_OBJECT @@ -30,7 +30,7 @@ public: bool setDate(const TQDate & newDate); private: - KPopupFrame * popupFrame; + TDEPopupFrame * popupFrame; KDatePicker * datePicker; void initObject(const TQDate & date, TQWidget *parent, const char *name); diff --git a/kfind/kfindpart.h b/kfind/kfindpart.h index c0bf8b825..3ec83970a 100644 --- a/kfind/kfindpart.h +++ b/kfind/kfindpart.h @@ -31,9 +31,9 @@ class KQuery; class TDEAboutData; //added class KonqPropsView; -class KAction; -class KToggleAction; -class KActionMenu; +class TDEAction; +class TDEToggleAction; +class TDEActionMenu; class TQIconViewItem; class IconViewBrowserExtension; //end added diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp index 6cbbe1268..7b5f510bc 100644 --- a/kfind/kfwin.cpp +++ b/kfind/kfwin.cpp @@ -105,7 +105,7 @@ TQString KfFileLVI::key(int column, bool) const } KfindWindow::KfindWindow( TQWidget *parent, const char *name ) - : KListView( parent, name ) + : TDEListView( parent, name ) ,m_baseDir("") ,m_menu(0) { @@ -134,8 +134,8 @@ KfindWindow::KfindWindow( TQWidget *parent, const char *name ) connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT( selectionHasChanged() )); - connect(this, TQT_SIGNAL(contextMenu(KListView *, TQListViewItem*,const TQPoint&)), - this, TQT_SLOT(slotContextMenu(KListView *,TQListViewItem*,const TQPoint&))); + connect(this, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem*,const TQPoint&)), + this, TQT_SLOT(slotContextMenu(TDEListView *,TQListViewItem*,const TQPoint&))); connect(this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotExecute(TQListViewItem*))); @@ -330,10 +330,10 @@ void KfindWindow::slotExecute(TQListViewItem* item) ((KfFileLVI*)item)->fileitem.run(); } -// Resizes KListView to occupy all visible space +// Resizes TDEListView to occupy all visible space void KfindWindow::resizeEvent(TQResizeEvent *e) { - KListView::resizeEvent(e); + TDEListView::resizeEvent(e); resetColumns(false); clipper()->repaint(); } @@ -390,7 +390,7 @@ void KfindWindow::resetColumns(bool init) setColumnWidth(1, dir_w); } -void KfindWindow::slotContextMenu(KListView *,TQListViewItem *item,const TQPoint&p) +void KfindWindow::slotContextMenu(TDEListView *,TQListViewItem *item,const TQPoint&p) { if (!item) return; int count = selectedItems().count(); @@ -401,13 +401,13 @@ void KfindWindow::slotContextMenu(KListView *,TQListViewItem *item,const TQPoint }; if (m_menu==0) - m_menu = new KPopupMenu(this); + m_menu = new TDEPopupMenu(this); else m_menu->clear(); if (count == 1) { - //menu = new KPopupMenu(item->text(0), this); + //menu = new TDEPopupMenu(item->text(0), this); m_menu->insertTitle(item->text(0)); m_menu->insertItem(SmallIcon("fileopen"),i18n("Menu item", "Open"), this, TQT_SLOT(openBinding())); m_menu->insertItem(SmallIcon("window_new"),i18n("Open Folder"), this, TQT_SLOT(openFolder())); diff --git a/kfind/kfwin.h b/kfind/kfwin.h index ded6a0631..66d9424b2 100644 --- a/kfind/kfwin.h +++ b/kfind/kfwin.h @@ -14,7 +14,7 @@ class KfArchiver; class TQPixmap; class TQFileInfo; -class KPopupMenu; +class TDEPopupMenu; class KfindWindow; class KfFileLVI : public TQListViewItem @@ -29,7 +29,7 @@ class KfFileLVI : public TQListViewItem KFileItem fileitem; }; -class KfindWindow: public KListView +class KfindWindow: public TDEListView { Q_OBJECT public: @@ -44,7 +44,7 @@ public: public slots: void copySelection(); - void slotContextMenu(KListView *,TQListViewItem *item,const TQPoint&p); + void slotContextMenu(TDEListView *,TQListViewItem *item,const TQPoint&p); private slots: void deleteFiles(); @@ -66,7 +66,7 @@ signals: private: TQString m_baseDir; - KPopupMenu *m_menu; + TDEPopupMenu *m_menu; bool haveSelection; bool m_pressed; void resetColumns(bool init); diff --git a/khelpcenter/DESIGN b/khelpcenter/DESIGN index fd8bbb289..c5c961ae8 100644 --- a/khelpcenter/DESIGN +++ b/khelpcenter/DESIGN @@ -129,7 +129,7 @@ KHC::ContentsTab object and a KHC::SearchTab object. # This effectively enables people new to KDE in less time to become productive # (a task-oriented list isn't so useful for peoplew ho are familiar with KDE's # applications, of course). -# Implementation-wise, we should perhaps stop using a KListView and use a +# Implementation-wise, we should perhaps stop using a TDEListView and use a # KOffice-style component selection widget like koshell has at the left? The first five items are generated by KHC::Navigator itself and are direct @@ -138,14 +138,14 @@ items is (with one exception) delegated to four helper classes, which inherit a 'KHC::TreeBuilder' class which has the following interface: class KHC::TreeBuilder - virtual void build( KListViewItem *parent ) = 0; + virtual void build( TDEListViewItem *parent ) = 0; ## What about the trees generated as children of the contents list view? # Oops, that's a typo, what you mean is what I originally intented: a -# TreeBuilder should take a 'KListView' as it's parent, subclasses can then +# TreeBuilder should take a 'TDEListView' as it's parent, subclasses can then # overload that method (such as the KHC::TOCBuilder which will want to provide -# a build( KListViewItem *parent ) method). +# a build( TDEListViewItem *parent ) method). # This concept of using a TreeBuilder baseclass might make it possible to turn # all the classes which use that interface into plugins. That way we could @@ -387,7 +387,7 @@ protocol == "help") by itself and otherwise use the plain URL. # QObject::children() and iterate over all children, use QToolTip::textFor() to # check whether the given qwidget has a tooltip and if so, use QToolTip::tip() # to show the tooltip. -# One could probably add a standard dcop call to KMainWindow, like +# One could probably add a standard dcop call to TDEMainWindow, like # "showAllToolTips". KSnapShot could get a QCheckBox "Show all tooltips", and # if that box is checked it tells the selected window to show all it's # tooltips via that DCOP call right before it does the snapshot. The thing is diff --git a/khelpcenter/fontdialog.cpp b/khelpcenter/fontdialog.cpp index ebaead73f..9bea68004 100644 --- a/khelpcenter/fontdialog.cpp +++ b/khelpcenter/fontdialog.cpp @@ -87,37 +87,37 @@ void FontDialog::setupFontTypesBox() TQLabel *lStandardFont = new TQLabel( i18n( "S&tandard font:" ), gb ); layout->addWidget( lStandardFont, 0, 0 ); - m_standardFontCombo = new KFontCombo( gb ); + m_standardFontCombo = new TDEFontCombo( gb ); layout->addWidget( m_standardFontCombo, 0, 1 ); lStandardFont->setBuddy( m_standardFontCombo ); TQLabel *lFixedFont = new TQLabel( i18n( "F&ixed font:" ), gb ); layout->addWidget( lFixedFont, 1, 0 ); - m_fixedFontCombo = new KFontCombo( gb ); + m_fixedFontCombo = new TDEFontCombo( gb ); layout->addWidget( m_fixedFontCombo, 1, 1 ); lFixedFont->setBuddy( m_fixedFontCombo ); TQLabel *lSerifFont = new TQLabel( i18n( "S&erif font:" ), gb ); layout->addWidget( lSerifFont, 2, 0 ); - m_serifFontCombo = new KFontCombo( gb ); + m_serifFontCombo = new TDEFontCombo( gb ); layout->addWidget( m_serifFontCombo, 2, 1 ); lSerifFont->setBuddy( m_serifFontCombo ); TQLabel *lSansSerifFont = new TQLabel( i18n( "S&ans serif font:" ), gb ); layout->addWidget( lSansSerifFont, 3, 0 ); - m_sansSerifFontCombo = new KFontCombo( gb ); + m_sansSerifFontCombo = new TDEFontCombo( gb ); layout->addWidget( m_sansSerifFontCombo, 3, 1 ); lSansSerifFont->setBuddy( m_sansSerifFontCombo ); TQLabel *lItalicFont = new TQLabel( i18n( "&Italic font:" ), gb ); layout->addWidget( lItalicFont, 4, 0 ); - m_italicFontCombo = new KFontCombo( gb ); + m_italicFontCombo = new TDEFontCombo( gb ); layout->addWidget( m_italicFontCombo, 4, 1 ); lItalicFont->setBuddy( m_italicFontCombo ); TQLabel *lFantasyFont = new TQLabel( i18n( "&Fantasy font:" ), gb ); layout->addWidget( lFantasyFont, 5, 0 ); - m_fantasyFontCombo = new KFontCombo( gb ); + m_fantasyFontCombo = new TDEFontCombo( gb ); layout->addWidget( m_fantasyFontCombo, 5, 1 ); lFantasyFont->setBuddy( m_fantasyFontCombo ); } diff --git a/khelpcenter/fontdialog.h b/khelpcenter/fontdialog.h index e0cc32a63..ef06f2b84 100644 --- a/khelpcenter/fontdialog.h +++ b/khelpcenter/fontdialog.h @@ -26,7 +26,7 @@ class TQBoxLayout; class TQSpinBox; class KComboBox; -class KFontCombo; +class TDEFontCombo; class KIntNumInput; namespace KHC { @@ -50,12 +50,12 @@ class FontDialog : public KDialogBase KIntNumInput *m_minFontSize; KIntNumInput *m_medFontSize; - KFontCombo *m_standardFontCombo; - KFontCombo *m_fixedFontCombo; - KFontCombo *m_serifFontCombo; - KFontCombo *m_sansSerifFontCombo; - KFontCombo *m_italicFontCombo; - KFontCombo *m_fantasyFontCombo; + TDEFontCombo *m_standardFontCombo; + TDEFontCombo *m_fixedFontCombo; + TDEFontCombo *m_serifFontCombo; + TDEFontCombo *m_sansSerifFontCombo; + TDEFontCombo *m_italicFontCombo; + TDEFontCombo *m_fantasyFontCombo; KComboBox *m_defaultEncoding; TQSpinBox *m_fontSizeAdjustement; }; diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp index a2c0b0990..e1f6aaa73 100644 --- a/khelpcenter/glossary.cpp +++ b/khelpcenter/glossary.cpp @@ -36,29 +36,29 @@ using namespace KHC; -class SectionItem : public KListViewItem +class SectionItem : public TDEListViewItem { public: SectionItem( TQListViewItem *parent, const TQString &text ) - : KListViewItem( parent, text ) + : TDEListViewItem( parent, text ) { setOpen( false ); } virtual void setOpen( bool open ) { - KListViewItem::setOpen(open); + TDEListViewItem::setOpen(open); setPixmap( 0, SmallIcon( TQString::fromLatin1( open ? "contents" : "contents2" ) ) ); } }; -class EntryItem : public KListViewItem +class EntryItem : public TDEListViewItem { public: EntryItem( SectionItem *parent, const TQString &term, const TQString &id ) - : KListViewItem( parent, term ), + : TDEListViewItem( parent, term ), m_id( id ) { } @@ -69,7 +69,7 @@ class EntryItem : public KListViewItem TQString m_id; }; -Glossary::Glossary( TQWidget *parent ) : KListView( parent ) +Glossary::Glossary( TQWidget *parent ) : TDEListView( parent ) { m_initialized = false; @@ -84,10 +84,10 @@ Glossary::Glossary( TQWidget *parent ) : KListView( parent ) setAllColumnsShowFocus( true ); setRootIsDecorated( true ); - m_byTopicItem = new KListViewItem( this, i18n( "By Topic" ) ); + m_byTopicItem = new TDEListViewItem( this, i18n( "By Topic" ) ); m_byTopicItem->setPixmap( 0, SmallIcon( "help" ) ); - m_alphabItem = new KListViewItem( this, i18n( "Alphabetically" ) ); + m_alphabItem = new TDEListViewItem( this, i18n( "Alphabetically" ) ); m_alphabItem->setPixmap( 0, SmallIcon( "charset" ) ); m_cacheFile = locateLocal( "cache", "help/glossary.xml" ); @@ -108,7 +108,7 @@ void Glossary::show() buildGlossaryTree(); m_initialized = true; } - KListView::show(); + TDEListView::show(); } Glossary::~Glossary() @@ -142,7 +142,7 @@ int Glossary::glossaryCTime() const void Glossary::rebuildGlossaryCache() { - KMainWindow *mainWindow = dynamic_cast<KMainWindow *>( kapp->mainWidget() ); + TDEMainWindow *mainWindow = dynamic_cast<TDEMainWindow *>( kapp->mainWidget() ); Q_ASSERT( mainWindow ); mainWindow->statusBar()->message( i18n( "Rebuilding cache..." ) ); @@ -172,7 +172,7 @@ void Glossary::meinprocExited( TDEProcess *meinproc ) m_status = CacheOk; - KMainWindow *mainWindow = dynamic_cast<KMainWindow *>( kapp->mainWidget() ); + TDEMainWindow *mainWindow = dynamic_cast<TDEMainWindow *>( kapp->mainWidget() ); Q_ASSERT( mainWindow ); mainWindow->statusBar()->message( i18n( "Rebuilding cache... done." ), 2000 ); diff --git a/khelpcenter/glossary.h b/khelpcenter/glossary.h index cb79e25b4..e0d9fd901 100644 --- a/khelpcenter/glossary.h +++ b/khelpcenter/glossary.h @@ -97,7 +97,7 @@ inline TQDataStream &operator>>( TQDataStream &stream, GlossaryEntry &e ) return stream >> e.m_term >> e.m_definition >> e.m_seeAlso; } -class Glossary : public KListView +class Glossary : public TDEListView { Q_OBJECT public: diff --git a/khelpcenter/history.cpp b/khelpcenter/history.cpp index 123727ab9..1a5218da2 100644 --- a/khelpcenter/history.cpp +++ b/khelpcenter/history.cpp @@ -51,11 +51,11 @@ History::~History() { } -void History::setupActions( KActionCollection *coll ) +void History::setupActions( TDEActionCollection *coll ) { TQPair<KGuiItem, KGuiItem> backForward = KStdGuiItem::backAndForward(); - m_backAction = new KToolBarPopupAction( backForward.first, ALT+Key_Left, + m_backAction = new TDEToolBarPopupAction( backForward.first, ALT+Key_Left, this, TQT_SLOT( back() ), coll, "back" ); connect( m_backAction->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_SLOT( backActivated( int ) ) ); @@ -63,7 +63,7 @@ void History::setupActions( KActionCollection *coll ) TQT_SLOT( fillBackMenu() ) ); m_backAction->setEnabled( false ); - m_forwardAction = new KToolBarPopupAction( backForward.second, ALT+Key_Right, + m_forwardAction = new TDEToolBarPopupAction( backForward.second, ALT+Key_Right, this, TQT_SLOT( forward() ), coll, "forward" ); connect( m_forwardAction->popupMenu(), TQT_SIGNAL( activated( int ) ), @@ -73,7 +73,7 @@ void History::setupActions( KActionCollection *coll ) m_forwardAction->setEnabled( false ); } -void History::installMenuBarHook( KMainWindow *mainWindow ) +void History::installMenuBarHook( TDEMainWindow *mainWindow ) { TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( "go_web", mainWindow ) ); @@ -256,7 +256,7 @@ void History::fillForwardMenu() void History::fillGoMenu() { - KMainWindow *mainWindow = static_cast<KMainWindow *>( kapp->mainWidget() ); + TDEMainWindow *mainWindow = static_cast<TDEMainWindow *>( kapp->mainWidget() ); TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) ); if ( !goMenu || m_goMenuIndex == -1 ) return; @@ -289,7 +289,7 @@ void History::fillGoMenu() void History::goMenuActivated( int id ) { - KMainWindow *mainWindow = static_cast<KMainWindow *>( kapp->mainWidget() ); + TDEMainWindow *mainWindow = static_cast<TDEMainWindow *>( kapp->mainWidget() ); TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) ); if ( !goMenu ) return; diff --git a/khelpcenter/history.h b/khelpcenter/history.h index aa3a405d4..c7c4c9532 100644 --- a/khelpcenter/history.h +++ b/khelpcenter/history.h @@ -25,9 +25,9 @@ #include <tqobject.h> #include <tqptrlist.h> -class KActionCollection; -class KMainWindow; -class KToolBarPopupAction; +class TDEActionCollection; +class TDEMainWindow; +class TDEToolBarPopupAction; class TQPopupMenu; namespace KHC { @@ -52,10 +52,10 @@ class History : public TQObject static History &self(); - void setupActions( KActionCollection *coll ); + void setupActions( TDEActionCollection *coll ); void updateActions(); - void installMenuBarHook( KMainWindow *mainWindow ); + void installMenuBarHook( TDEMainWindow *mainWindow ); void createEntry(); void updateCurrentEntry( KHC::View *view ); @@ -97,8 +97,8 @@ class History : public TQObject int m_goMenuHistoryStartPos; int m_goMenuHistoryCurrentPos; public: - KToolBarPopupAction *m_backAction; - KToolBarPopupAction *m_forwardAction; + TDEToolBarPopupAction *m_backAction; + TDEToolBarPopupAction *m_forwardAction; }; } diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp index e0ef62dd4..245f3301d 100644 --- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp +++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp @@ -135,7 +135,7 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name) delButton = new TQPushButton(i18n("Delete"), gb); grid->addWidget(delButton, 2,0); - searchPaths = new KListBox(gb); + searchPaths = new TDEListBox(gb); grid->addMultiCellWidget(searchPaths, 1,3, 1,1); grid->setRowStretch(2,2); diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.h b/khelpcenter/htmlsearch/kcmhtmlsearch.h index bc4e2fef3..28445437a 100644 --- a/khelpcenter/htmlsearch/kcmhtmlsearch.h +++ b/khelpcenter/htmlsearch/kcmhtmlsearch.h @@ -28,7 +28,7 @@ class TQLineEdit; class TQCheckBox; class TQPushButton; -class KListBox; +class TDEListBox; class TDEProcess; class KLanguageCombo; class KURLRequester; @@ -71,7 +71,7 @@ private: KURLRequester *htdigBin, *htsearchBin, *htmergeBin; TQCheckBox *indexKDE, *indexMan, *indexInfo; TQPushButton *addButton, *delButton, *runButton; - KListBox *searchPaths; + TDEListBox *searchPaths; KLanguageCombo *language; TDEProcess *indexProc; diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp index 74f29c434..12646c330 100644 --- a/khelpcenter/kcmhelpcenter.cpp +++ b/khelpcenter/kcmhelpcenter.cpp @@ -273,7 +273,7 @@ void KCMHelpCenter::setupMainWidget( TQWidget *parent ) TQLabel *label = new TQLabel( helpText, parent ); topLayout->addWidget( label ); - mListView = new KListView( parent ); + mListView = new TDEListView( parent ); mListView->setFullWidth( true ); mListView->addColumn( i18n("Search Scope") ); mListView->addColumn( i18n("Status") ); diff --git a/khelpcenter/kcmhelpcenter.h b/khelpcenter/kcmhelpcenter.h index 10f0c5311..0212a22c5 100644 --- a/khelpcenter/kcmhelpcenter.h +++ b/khelpcenter/kcmhelpcenter.h @@ -37,7 +37,7 @@ class TDEConfig; class TDEAboutData; class KTempFile; class KURLRequester; -class KListView; +class TDEListView; namespace KHC { class HtmlSearchConfig; @@ -154,7 +154,7 @@ class KCMHelpCenter : public KDialogBase, virtual public KCMHelpCenterIface private: KHC::SearchEngine *mEngine; - KListView *mListView; + TDEListView *mListView; TQLabel *mIndexDirLabel; TQPushButton *mBuildButton; IndexProgressDialog *mProgressDialog; diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp index 836307460..c5b4932b6 100644 --- a/khelpcenter/mainwindow.cpp +++ b/khelpcenter/mainwindow.cpp @@ -85,7 +85,7 @@ class LogDialog : public KDialogBase MainWindow::MainWindow() - : KMainWindow(0, "MainWindow"), DCOPObject( "KHelpCenterIface" ), + : TDEMainWindow(0, "MainWindow"), DCOPObject( "KHelpCenterIface" ), mLogDialog( 0 ) { mSplitter = new TQSplitter( this ); @@ -212,27 +212,27 @@ void MainWindow::setupActions() KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), actionCollection(), "printFrame" ); - KAction *prevPage = new KAction( i18n( "Previous Page" ), CTRL+Key_PageUp, mDoc, TQT_SLOT( prevPage() ), + TDEAction *prevPage = new TDEAction( i18n( "Previous Page" ), CTRL+Key_PageUp, mDoc, TQT_SLOT( prevPage() ), actionCollection(), "prevPage" ); prevPage->setWhatsThis( i18n( "Moves to the previous page of the document" ) ); - KAction *nextPage = new KAction( i18n( "Next Page" ), CTRL + Key_PageDown, mDoc, TQT_SLOT( nextPage() ), + TDEAction *nextPage = new TDEAction( i18n( "Next Page" ), CTRL + Key_PageDown, mDoc, TQT_SLOT( nextPage() ), actionCollection(), "nextPage" ); nextPage->setWhatsThis( i18n( "Moves to the next page of the document" ) ); - KAction *home = KStdAction::home( TQT_TQOBJECT(this), TQT_SLOT( slotShowHome() ), actionCollection() ); + TDEAction *home = KStdAction::home( TQT_TQOBJECT(this), TQT_SLOT( slotShowHome() ), actionCollection() ); home->setText(i18n("Table of &Contents")); home->setToolTip(i18n("Table of contents")); home->setWhatsThis(i18n("Go back to the table of contents")); mCopyText = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopySelectedText()), actionCollection(), "copy_text"); - mLastSearchAction = new KAction( i18n("&Last Search Result"), 0, TQT_TQOBJECT(this), + mLastSearchAction = new TDEAction( i18n("&Last Search Result"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotLastSearch() ), actionCollection(), "lastsearch" ); mLastSearchAction->setEnabled( false ); - new KAction( i18n("Build Search Index..."), 0, TQT_TQOBJECT(mNavigator), + new TDEAction( i18n("Build Search Index..."), 0, TQT_TQOBJECT(mNavigator), TQT_SLOT( showIndexDialog() ), actionCollection(), "build_index" ); KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() ); @@ -240,16 +240,16 @@ void MainWindow::setupActions() TDEConfig *cfg = TDEGlobal::config(); cfg->setGroup( "Debug" ); if ( cfg->readBoolEntry( "SearchErrorLog", false ) ) { - new KAction( i18n("Show Search Error Log"), 0, TQT_TQOBJECT(this), + new TDEAction( i18n("Show Search Error Log"), 0, TQT_TQOBJECT(this), TQT_SLOT( showSearchStderr() ), actionCollection(), "show_search_stderr" ); } History::self().setupActions( actionCollection() ); - new KAction( i18n( "Configure Fonts..." ), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotConfigureFonts() ), actionCollection(), "configure_fonts" ); - new KAction( i18n( "Increase Font Sizes" ), "viewmag+", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotIncFontSizes() ), actionCollection(), "incFontSizes" ); - new KAction( i18n( "Decrease Font Sizes" ), "viewmag-", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDecFontSizes() ), actionCollection(), "decFontSizes" ); + new TDEAction( i18n( "Configure Fonts..." ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotConfigureFonts() ), actionCollection(), "configure_fonts" ); + new TDEAction( i18n( "Increase Font Sizes" ), "viewmag+", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotIncFontSizes() ), actionCollection(), "incFontSizes" ); + new TDEAction( i18n( "Decrease Font Sizes" ), "viewmag-", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDecFontSizes() ), actionCollection(), "decFontSizes" ); } void MainWindow::slotCopySelectedText() diff --git a/khelpcenter/mainwindow.h b/khelpcenter/mainwindow.h index e0472246a..698e0150f 100644 --- a/khelpcenter/mainwindow.h +++ b/khelpcenter/mainwindow.h @@ -22,7 +22,7 @@ namespace KHC { class View; -class MainWindow : public KMainWindow, public DCOPObject +class MainWindow : public TDEMainWindow, public DCOPObject { Q_OBJECT K_DCOP @@ -97,8 +97,8 @@ private: View *mDoc; Navigator *mNavigator; - KAction *mLastSearchAction; - KAction *mCopyText; + TDEAction *mLastSearchAction; + TDEAction *mCopyText; LogDialog *mLogDialog; }; diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp index 1c813972f..eb5e0c4f7 100644 --- a/khelpcenter/navigator.cpp +++ b/khelpcenter/navigator.cpp @@ -160,7 +160,7 @@ bool Navigator::showMissingDocs() const void Navigator::setupContentsTab() { - mContentsTree = new KListView( mTabWidget ); + mContentsTree = new TDEListView( mTabWidget ); mContentsTree->setFrameStyle(TQFrame::Panel | TQFrame::Sunken); mContentsTree->addColumn(TQString::null); mContentsTree->setAllColumnsShowFocus(true); diff --git a/khelpcenter/navigator.h b/khelpcenter/navigator.h index e6912d5ef..fef806e21 100644 --- a/khelpcenter/navigator.h +++ b/khelpcenter/navigator.h @@ -36,7 +36,7 @@ class TQPushButton; -class KListView; +class TDEListView; class KService; class TDEProcess; class KProcIO; @@ -118,7 +118,7 @@ class Navigator : public TQWidget void insertPlugins(); void hideSearch(); - KListView *mContentsTree; + TDEListView *mContentsTree; Glossary *mGlossaryTree; SearchWidget *mSearchWidget; diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp index 8cdf52cca..c4bf2c182 100644 --- a/khelpcenter/view.cpp +++ b/khelpcenter/view.cpp @@ -21,7 +21,7 @@ using namespace KHC; View::View( TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof, KActionCollection *col ) + TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof, TDEActionCollection *col ) : TDEHTMLPart( parentWidget, widgetName, parent, name, prof ), mState( Docu ), mActionCollection(col) { setJScriptEnabled(false); @@ -246,10 +246,10 @@ void View::slotDecFontSizes() void View::showMenu( const TQString& url, const TQPoint& pos) { - KPopupMenu* pop = new KPopupMenu(view()); + TDEPopupMenu* pop = new TDEPopupMenu(view()); if (url.isEmpty()) { - KAction *action; + TDEAction *action; action = mActionCollection->action("go_home"); if (action) action->plug(pop); diff --git a/khelpcenter/view.h b/khelpcenter/view.h index 8e5099917..2ad17af6b 100644 --- a/khelpcenter/view.h +++ b/khelpcenter/view.h @@ -6,7 +6,7 @@ #include "glossary.h" #include "navigator.h" -class KActionCollection; +class TDEActionCollection; namespace DOM { class Node; @@ -22,7 +22,7 @@ class View : public TDEHTMLPart public: View( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof, - KActionCollection *col ); + TDEActionCollection *col ); ~View(); @@ -83,7 +83,7 @@ class View : public TDEHTMLPart int m_zoomStepping; Formatter *mFormatter; - KActionCollection *mActionCollection; + TDEActionCollection *mActionCollection; TQString mCopyURL; }; diff --git a/khotkeys/TODO b/khotkeys/TODO index 5192cc6c0..d8e7fd352 100644 --- a/khotkeys/TODO +++ b/khotkeys/TODO @@ -73,7 +73,7 @@ akce : kdyz se objevi okno, aplikovat na nej veci, ktere dela kstart ( sticky, a strokes : kdyz X bere mys pres gpmdata, gpm pekne zasekava u vstupu pri prostrednim tlacitku dole => strokes pak za moc nestoji paste pri MMB volitelne jen kdyz MMB neni stisknuto napr. pres 500ms ( kvuli strokes ) akce : kdyz se stiskne nejaka shortcut a nejaka aplikace nebezi, tak se spusti a pak se ji ta shortcut preda ( napr. pro klipper ? ) -odstranit tu KAccel zmenu, kterou v CVS udelal Coolo - stejne netusim, jestli to ma nebo nema byt i18n, tak at je aspon default +odstranit tu TDEAccel zmenu, kterou v CVS udelal Coolo - stejne netusim, jestli to ma nebo nema byt i18n, tak at je aspon default skupine akci 'KMenuedit entries' by asi nemelo jit zmenit jmeno kdyz se v KMenuEdit udela polozka a pak se ten menuentry smaze, asi by se ta shortcut mela aspon disablovat ?! at dokaze zvetsovat vsechna 'File Open Dialog' okna diff --git a/khotkeys/kcontrol/kcmkhotkeys.h b/khotkeys/kcontrol/kcmkhotkeys.h index 92bf49efb..58751599d 100644 --- a/khotkeys/kcontrol/kcmkhotkeys.h +++ b/khotkeys/kcontrol/kcmkhotkeys.h @@ -54,8 +54,8 @@ class Module void set_daemon_disabled( bool disable ); bool daemon_disabled() const; void import(); - KShortcut voice_shortcut() const; - void set_voice_shortcut( const KShortcut&) ; + TDEShortcut voice_shortcut() const; + void set_voice_shortcut( const TDEShortcut&) ; public slots: void changed(); protected: @@ -153,13 +153,13 @@ bool Module::daemon_disabled() const inline -void Module::set_voice_shortcut( const KShortcut& cut) +void Module::set_voice_shortcut( const TDEShortcut& cut) { settings.voice_shortcut=cut; } inline -KShortcut Module::voice_shortcut() const +TDEShortcut Module::voice_shortcut() const { return settings.voice_shortcut; } diff --git a/khotkeys/kcontrol/menuedit.cpp b/khotkeys/kcontrol/menuedit.cpp index 990cd4ff5..97e372821 100644 --- a/khotkeys/kcontrol/menuedit.cpp +++ b/khotkeys/kcontrol/menuedit.cpp @@ -288,9 +288,9 @@ TQString khotkeys_change_menu_entry_shortcut( const TQString& entry_P, } TQString shortcut = ""; // make sure the shortcut is valid - shortcut = (KShortcut( shortcut_P )).toStringInternal(); + shortcut = (TDEShortcut( shortcut_P )).toStringInternal(); if( !shortcut.isEmpty()) - entry->set_trigger( new Shortcut_trigger( entry, KShortcut( shortcut ))); + entry->set_trigger( new Shortcut_trigger( entry, TDEShortcut( shortcut ))); if( shortcut.isEmpty()) { delete entry; diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp index 31eb7be27..258c6cfd5 100644 --- a/khotkeys/kcontrol/triggers_tab.cpp +++ b/khotkeys/kcontrol/triggers_tab.cpp @@ -125,7 +125,7 @@ void Triggers_tab::new_selected( int type_P ) { case TYPE_SHORTCUT_TRIGGER: // Shortcut_trigger dlg = new Shortcut_trigger_dialog( - new Shortcut_trigger( NULL, KShortcut())); // CHECKME NULL ? + new Shortcut_trigger( NULL, TDEShortcut())); // CHECKME NULL ? break; case TYPE_GESTURE_TRIGGER: // Gesture trigger dlg = new Gesture_trigger_dialog( @@ -230,16 +230,16 @@ Shortcut_trigger_widget::Shortcut_trigger_widget( TQWidget* parent_P, const char lay->addWidget( bt, 0 , Qt::AlignHCenter ); lay->addStretch(); clear_data(); - connect( bt, TQT_SIGNAL( capturedShortcut( const KShortcut& )), - this, TQT_SLOT( capturedShortcut( const KShortcut& ))); + connect( bt, TQT_SIGNAL( capturedShortcut( const TDEShortcut& )), + this, TQT_SLOT( capturedShortcut( const TDEShortcut& ))); } void Shortcut_trigger_widget::clear_data() { - bt->setShortcut( KShortcut(), false ); + bt->setShortcut( TDEShortcut(), false ); } -void Shortcut_trigger_widget::capturedShortcut( const KShortcut& s_P ) +void Shortcut_trigger_widget::capturedShortcut( const TDEShortcut& s_P ) { if( KKeyChooser::checkGlobalShortcutsConflict( s_P, true, topLevelWidget()) || KKeyChooser::checkStandardShortcutsConflict( s_P, true, topLevelWidget())) diff --git a/khotkeys/kcontrol/triggers_tab.h b/khotkeys/kcontrol/triggers_tab.h index 89b674a7b..c4d6160fe 100644 --- a/khotkeys/kcontrol/triggers_tab.h +++ b/khotkeys/kcontrol/triggers_tab.h @@ -20,7 +20,7 @@ #include <window_trigger_widget.h> class KKeyButton; -class KShortcut; +class TDEShortcut; namespace KHotKeys { @@ -90,7 +90,7 @@ class Shortcut_trigger_widget public slots: void clear_data(); private slots: - void capturedShortcut( const KShortcut& ); + void capturedShortcut( const TDEShortcut& ); private: KKeyButton* bt; }; diff --git a/khotkeys/kcontrol/voice_settings_tab.cpp b/khotkeys/kcontrol/voice_settings_tab.cpp index 612498536..277e2f675 100644 --- a/khotkeys/kcontrol/voice_settings_tab.cpp +++ b/khotkeys/kcontrol/voice_settings_tab.cpp @@ -26,7 +26,7 @@ namespace KHotKeys Voice_settings_tab::Voice_settings_tab( TQWidget* parent_P, const char* name_P ) : Voice_settings_tab_ui( parent_P, name_P ) { - connect( keyButton , TQT_SIGNAL(capturedShortcut (const KShortcut &)) , this, TQT_SLOT(slotCapturedKey( const KShortcut& ))); + connect( keyButton , TQT_SIGNAL(capturedShortcut (const TDEShortcut &)) , this, TQT_SLOT(slotCapturedKey( const TDEShortcut& ))); } void Voice_settings_tab::read_data() @@ -44,9 +44,9 @@ void Voice_settings_tab::clear_data() // "global" tab, not action specific, do nothing } -void Voice_settings_tab::slotCapturedKey( const KShortcut& cut) +void Voice_settings_tab::slotCapturedKey( const TDEShortcut& cut) { - /*for(uint seq=0; seq<KShortcut::MAX_SEQUENCES; seq++) + /*for(uint seq=0; seq<TDEShortcut::MAX_SEQUENCES; seq++) { KKeySequance key=cut.seq(seq); if(key.isNull()) diff --git a/khotkeys/kcontrol/voice_settings_tab.h b/khotkeys/kcontrol/voice_settings_tab.h index 68e37af3a..c59a911a2 100644 --- a/khotkeys/kcontrol/voice_settings_tab.h +++ b/khotkeys/kcontrol/voice_settings_tab.h @@ -13,7 +13,7 @@ #include <voice_settings_tab_ui.h> -class KShortcut; +class TDEShortcut; namespace KHotKeys { @@ -29,7 +29,7 @@ class Voice_settings_tab public slots: void clear_data(); private slots: - void slotCapturedKey( const KShortcut& ); + void slotCapturedKey( const TDEShortcut& ); }; //*************************************************************************** diff --git a/khotkeys/shared/action_data.cpp b/khotkeys/shared/action_data.cpp index 488a18133..4f481ea59 100644 --- a/khotkeys/shared/action_data.cpp +++ b/khotkeys/shared/action_data.cpp @@ -287,7 +287,7 @@ void Generic_action_data::cfg_write( TDEConfig& cfg_P ) const Command_url_shortcut_action_data::Command_url_shortcut_action_data( Action_data_group* parent_P, const TQString& name_P, const TQString& comment_P, - const KShortcut& shortcut_P, const TQString& command_url_P, bool enabled_P ) + const TDEShortcut& shortcut_P, const TQString& command_url_P, bool enabled_P ) : Simple_action_data< Shortcut_trigger, Command_url_action >( parent_P, name_P, comment_P, enabled_P ) { @@ -307,7 +307,7 @@ void Simple_action_data< Shortcut_trigger, Command_url_action > Menuentry_shortcut_action_data::Menuentry_shortcut_action_data( Action_data_group* parent_P, const TQString& name_P, const TQString& comment_P, - const KShortcut& shortcut_P, const TQString& menuentry_P, bool enabled_P ) + const TDEShortcut& shortcut_P, const TQString& menuentry_P, bool enabled_P ) : Simple_action_data< Shortcut_trigger, Menuentry_action >( parent_P, name_P, comment_P, enabled_P ) { diff --git a/khotkeys/shared/action_data.h b/khotkeys/shared/action_data.h index cf1186263..5d84c6f18 100644 --- a/khotkeys/shared/action_data.h +++ b/khotkeys/shared/action_data.h @@ -165,7 +165,7 @@ class KDE_EXPORT Command_url_shortcut_action_data Command_url_shortcut_action_data( Action_data_group* parent_P, const TQString& name_P, const TQString& comment_P, bool enabled_P = true ); Command_url_shortcut_action_data( Action_data_group* parent_P, const TQString& name_P, - const TQString& comment_P, const KShortcut& shortcut_P, const TQString& command_url_P, + const TQString& comment_P, const TDEShortcut& shortcut_P, const TQString& command_url_P, bool enabled_P = true ); Command_url_shortcut_action_data( TDEConfig& cfg_P, Action_data_group* parent_P ); }; @@ -178,7 +178,7 @@ class KDE_EXPORT Menuentry_shortcut_action_data Menuentry_shortcut_action_data( Action_data_group* parent_P, const TQString& name_P, const TQString& comment_P, bool enabled_P = true ); Menuentry_shortcut_action_data( Action_data_group* parent_P, const TQString& name_P, - const TQString& comment_P, const KShortcut& shortcut_P, const TQString& command_url_P, + const TQString& comment_P, const TDEShortcut& shortcut_P, const TQString& command_url_P, bool enabled_P = true ); Menuentry_shortcut_action_data( TDEConfig& cfg_P, Action_data_group* parent_P ); }; diff --git a/khotkeys/shared/input.cpp b/khotkeys/shared/input.cpp index 25cc1c465..979e31726 100644 --- a/khotkeys/shared/input.cpp +++ b/khotkeys/shared/input.cpp @@ -53,7 +53,7 @@ Kbd::~Kbd() delete kga; } -void Kbd::insert_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P ) +void Kbd::insert_item( const TDEShortcut& shortcut_P, Kbd_receiver* receiver_P ) { Receiver_data& rcv = receivers[ receiver_P ]; rcv.shortcuts.append( shortcut_P ); @@ -61,7 +61,7 @@ void Kbd::insert_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P ) grab_shortcut( shortcut_P ); } -void Kbd::remove_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P ) +void Kbd::remove_item( const TDEShortcut& shortcut_P, Kbd_receiver* receiver_P ) { Receiver_data& rcv = receivers[ receiver_P ]; rcv.shortcuts.remove( shortcut_P ); @@ -77,7 +77,7 @@ void Kbd::activate_receiver( Kbd_receiver* receiver_P ) if( rcv.active ) return; rcv.active = true; - for( TQValueList< KShortcut >::ConstIterator it( rcv.shortcuts.begin()); + for( TQValueList< TDEShortcut >::ConstIterator it( rcv.shortcuts.begin()); it != rcv.shortcuts.end(); ++it ) grab_shortcut( *it ); @@ -89,13 +89,13 @@ void Kbd::deactivate_receiver( Kbd_receiver* receiver_P ) if( !rcv.active ) return; rcv.active = false; - for( TQValueList< KShortcut >::ConstIterator it( rcv.shortcuts.begin()); + for( TQValueList< TDEShortcut >::ConstIterator it( rcv.shortcuts.begin()); it != rcv.shortcuts.end(); ++it ) ungrab_shortcut( *it ); } -void Kbd::grab_shortcut( const KShortcut& shortcut_P ) +void Kbd::grab_shortcut( const TDEShortcut& shortcut_P ) { if( grabs.contains( shortcut_P )) ++grabs[ shortcut_P ]; @@ -115,7 +115,7 @@ void Kbd::grab_shortcut( const KShortcut& shortcut_P ) } } -void Kbd::ungrab_shortcut( const KShortcut& shortcut_P ) +void Kbd::ungrab_shortcut( const TDEShortcut& shortcut_P ) { if( !grabs.contains( shortcut_P )) return; @@ -141,7 +141,7 @@ void Kbd::update_connections() void Kbd::key_slot( TQString key_P ) { kdDebug( 1217 ) << "Key pressed:" << key_P << endl; - KShortcut shortcut( key_P ); + TDEShortcut shortcut( key_P ); if( !grabs.contains( shortcut )) return; for( TQMap< Kbd_receiver*, Receiver_data >::ConstIterator it = receivers.begin(); diff --git a/khotkeys/shared/input.h b/khotkeys/shared/input.h index 08b71b761..ac1f70f65 100644 --- a/khotkeys/shared/input.h +++ b/khotkeys/shared/input.h @@ -29,7 +29,7 @@ namespace KHotKeys class Kbd_receiver { public: - virtual bool handle_key( const KShortcut& shortcut_P ) = 0; + virtual bool handle_key( const TDEShortcut& shortcut_P ) = 0; }; class Kbd @@ -39,15 +39,15 @@ class Kbd public: Kbd( bool grabbing_enabled_P, TQObject* parent_P ); virtual ~Kbd(); - void insert_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P ); - void remove_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P ); + void insert_item( const TDEShortcut& shortcut_P, Kbd_receiver* receiver_P ); + void remove_item( const TDEShortcut& shortcut_P, Kbd_receiver* receiver_P ); void activate_receiver( Kbd_receiver* receiver_P ); void deactivate_receiver( Kbd_receiver* receiver_P ); static bool send_macro_key( const KKey& key, Window window_P = InputFocus ); protected: bool x11EventFilter( const XEvent* ); - void grab_shortcut( const KShortcut& shortcut_P ); - void ungrab_shortcut( const KShortcut& shortcut_P ); + void grab_shortcut( const TDEShortcut& shortcut_P ); + void ungrab_shortcut( const TDEShortcut& shortcut_P ); private slots: void key_slot( TQString key_P ); void update_connections(); @@ -55,11 +55,11 @@ class Kbd struct Receiver_data { Receiver_data(); - TQValueList< KShortcut > shortcuts; + TQValueList< TDEShortcut > shortcuts; bool active; }; TQMap< Kbd_receiver*, Receiver_data > receivers; - TQMap< KShortcut, int > grabs; + TQMap< TDEShortcut, int > grabs; TDEGlobalAccel* kga; }; diff --git a/khotkeys/shared/khlistview.cpp b/khotkeys/shared/khlistview.cpp index 2afa9db17..ae348af33 100644 --- a/khotkeys/shared/khlistview.cpp +++ b/khotkeys/shared/khlistview.cpp @@ -22,7 +22,7 @@ namespace KHotKeys { KHListView::KHListView( TQWidget* parent_P, const char* name_P ) - : KListView( parent_P, name_P ), saved_current_item( NULL ), + : TDEListView( parent_P, name_P ), saved_current_item( NULL ), in_clear( false ), ignore( false ), force_select( false ) { connect( this, TQT_SIGNAL( selectionChanged( TQListViewItem* )), @@ -72,7 +72,7 @@ void KHListView::slot_current_changed( TQListViewItem* item_P ) void KHListView::clear() { in_clear = true; - KListView::clear(); + TDEListView::clear(); in_clear = false; slot_selection_changed( NULL ); } @@ -82,7 +82,7 @@ void KHListView::insertItem( TQListViewItem* item_P ) bool set = false; if( !in_clear ) set = childCount() == 0; - KListView::insertItem( item_P ); + TDEListView::insertItem( item_P ); if( set && force_select ) { bool block = signalsBlocked(); @@ -96,7 +96,7 @@ void KHListView::insertItem( TQListViewItem* item_P ) void KHListView::clearSelection() { - KListView::clearSelection(); + TDEListView::clearSelection(); slot_current_changed( currentItem()); } @@ -113,7 +113,7 @@ void KHListView::contentsDropEvent( TQDropEvent* e ) { bool save_ignore = ignore; ignore = true; - KListView::contentsDropEvent( e ); + TDEListView::contentsDropEvent( e ); ignore = save_ignore; } diff --git a/khotkeys/shared/khlistview.h b/khotkeys/shared/khlistview.h index 0a0118a63..619fbb1e7 100644 --- a/khotkeys/shared/khlistview.h +++ b/khotkeys/shared/khlistview.h @@ -20,7 +20,7 @@ namespace KHotKeys { class KDE_EXPORT KHListView - : public KListView + : public TDEListView { Q_OBJECT TQ_PROPERTY( bool forceSelect READ forceSelect WRITE setForceSelect ) diff --git a/khotkeys/shared/settings.cpp b/khotkeys/shared/settings.cpp index 16e071a1e..2820c2c5d 100644 --- a/khotkeys/shared/settings.cpp +++ b/khotkeys/shared/settings.cpp @@ -114,7 +114,7 @@ bool Settings::read_settings( TDEConfig& cfg_P, bool include_disabled_P, ImportT delete gestures_exclude; gestures_exclude = new Windowdef_list( cfg_P ); cfg_P.setGroup( "Voice" ); - voice_shortcut=KShortcut( cfg_P.readEntry("Shortcut" , "") ); + voice_shortcut=TDEShortcut( cfg_P.readEntry("Shortcut" , "") ); return true; } @@ -252,12 +252,12 @@ void Settings::read_settings_v1( TDEConfig& cfg_P ) menuentries->set_conditions( new Condition_list( "", menuentries )); } ( void ) new Menuentry_shortcut_action_data( menuentries, name, "", - KShortcut( shortcut ), run ); + TDEShortcut( shortcut ), run ); } else { ( void ) new Command_url_shortcut_action_data( actions, name, "", - KShortcut( shortcut ), run ); + TDEShortcut( shortcut ), run ); } } } diff --git a/khotkeys/shared/settings.h b/khotkeys/shared/settings.h index c758764b4..c7b16287f 100644 --- a/khotkeys/shared/settings.h +++ b/khotkeys/shared/settings.h @@ -39,7 +39,7 @@ class KDE_EXPORT Settings int gesture_timeout; bool daemon_disabled; Windowdef_list* gestures_exclude; - KShortcut voice_shortcut; + TDEShortcut voice_shortcut; protected: bool read_settings( TDEConfig& cfg_P, bool include_disabled_P, ImportType import_P ); void read_settings_v1( TDEConfig& cfg_P ); diff --git a/khotkeys/shared/triggers.cpp b/khotkeys/shared/triggers.cpp index fe167789b..29cd1025e 100644 --- a/khotkeys/shared/triggers.cpp +++ b/khotkeys/shared/triggers.cpp @@ -117,7 +117,7 @@ void Trigger_list::activate( bool activate_P ) // Shortcut_trigger -Shortcut_trigger::Shortcut_trigger( Action_data* data_P, const KShortcut& shortcut_P ) +Shortcut_trigger::Shortcut_trigger( Action_data* data_P, const TDEShortcut& shortcut_P ) : Trigger( data_P ), _shortcut( shortcut_P ) { keyboard_handler->insert_item( shortcut(), this ); @@ -154,7 +154,7 @@ const TQString Shortcut_trigger::description() const // CHECKME i18n pro toString() ? } -bool Shortcut_trigger::handle_key( const KShortcut& shortcut_P ) +bool Shortcut_trigger::handle_key( const TDEShortcut& shortcut_P ) { if( shortcut() == shortcut_P ) { diff --git a/khotkeys/shared/triggers.h b/khotkeys/shared/triggers.h index cf511f975..c74a3a54a 100644 --- a/khotkeys/shared/triggers.h +++ b/khotkeys/shared/triggers.h @@ -66,17 +66,17 @@ class KDE_EXPORT Shortcut_trigger { typedef Trigger base; public: - Shortcut_trigger( Action_data* data_P, const KShortcut& shortcut_P ); + Shortcut_trigger( Action_data* data_P, const TDEShortcut& shortcut_P ); Shortcut_trigger( TDEConfig& cfg_P, Action_data* data_P ); virtual ~Shortcut_trigger(); virtual void cfg_write( TDEConfig& cfg_P ) const; virtual Shortcut_trigger* copy( Action_data* data_P ) const; virtual const TQString description() const; - const KShortcut& shortcut() const; - virtual bool handle_key( const KShortcut& shortcut_P ); + const TDEShortcut& shortcut() const; + virtual bool handle_key( const TDEShortcut& shortcut_P ); virtual void activate( bool activate_P ); private: - KShortcut _shortcut; + TDEShortcut _shortcut; }; class KDE_EXPORT Window_trigger @@ -206,7 +206,7 @@ const TQString& Trigger_list::comment() const // Shortcut_trigger inline -const KShortcut& Shortcut_trigger::shortcut() const +const TDEShortcut& Shortcut_trigger::shortcut() const { return _shortcut; } diff --git a/khotkeys/shared/voices.cpp b/khotkeys/shared/voices.cpp index 07ab899f6..fd0c759f4 100644 --- a/khotkeys/shared/voices.cpp +++ b/khotkeys/shared/voices.cpp @@ -199,7 +199,7 @@ void Voice::slot_sound_recorded(const Sound &sound_P) */ -void Voice::set_shortcut( const KShortcut &shortcut) +void Voice::set_shortcut( const TDEShortcut &shortcut) { _shortcut = shortcut; if( !_enabled ) diff --git a/khotkeys/shared/voices.h b/khotkeys/shared/voices.h index abb5858b2..145652a9b 100644 --- a/khotkeys/shared/voices.h +++ b/khotkeys/shared/voices.h @@ -40,7 +40,7 @@ class KDE_EXPORT Voice : public TQObject void unregister_handler( Voice_trigger* ); // bool x11Event( XEvent* e ); - void set_shortcut( const KShortcut &k); + void set_shortcut( const TDEShortcut &k); /** * return TQString::null is a new signature is far enough from others signature @@ -69,7 +69,7 @@ class KDE_EXPORT Voice : public TQObject TQValueList<Voice_trigger *> _references; SoundRecorder *_recorder; - KShortcut _shortcut; + TDEShortcut _shortcut; TDEGlobalAccel *_kga; TQTimer *_timer; diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index ad687839d..92420e652 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -924,9 +924,9 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions, reconfigure(); // initialize clock widget slotUpdate(); - if (kapp->authorizeKAction("kicker_rmb")) + if (kapp->authorizeTDEAction("kicker_rmb")) { - menu = new KPopupMenu(); + menu = new TDEPopupMenu(); connect(menu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShowContextMenu())); connect(menu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); setCustomMenu(menu); @@ -1485,7 +1485,7 @@ void ClockApplet::toggleCalendar() void ClockApplet::openContextMenu() { - if (!menu || !kapp->authorizeKAction("kicker_rmb")) + if (!menu || !kapp->authorizeTDEAction("kicker_rmb")) return; menu->exec( TQCursor::pos() ); @@ -1544,7 +1544,7 @@ void ClockApplet::aboutToShowContextMenu() TQDateTime dt = TQDateTime::currentDateTime(); dt = TQT_TQDATETIME_OBJECT(dt.addSecs(TZoffset)); - KPopupMenu *copyMenu = new KPopupMenu( menu ); + TDEPopupMenu *copyMenu = new TDEPopupMenu( menu ); copyMenu->insertItem(loc->formatDateTime(dt), 201); copyMenu->insertItem(loc->formatDate(TQT_TQDATE_OBJECT(dt.date())), 202); copyMenu->insertItem(loc->formatDate(TQT_TQDATE_OBJECT(dt.date()), true), 203); @@ -1558,7 +1558,7 @@ void ClockApplet::aboutToShowContextMenu() if (!bImmutable) { - KPopupMenu *zoneMenu = new KPopupMenu( menu ); + TDEPopupMenu *zoneMenu = new TDEPopupMenu( menu ); connect(zoneMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); for (int i = 0; i <= zone->remoteZoneCount(); i++) { @@ -1575,7 +1575,7 @@ void ClockApplet::aboutToShowContextMenu() zoneMenu->insertSeparator(); zoneMenu->insertItem(SmallIcon("configure"), i18n("&Configure Timezones..."), 110); - KPopupMenu *type_menu = new KPopupMenu(menu); + TDEPopupMenu *type_menu = new TDEPopupMenu(menu); connect(type_menu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); type_menu->insertItem(i18n("&Plain"), Prefs::EnumType::Plain, 1); type_menu->insertItem(i18n("&Digital"), Prefs::EnumType::Digital, 2); diff --git a/kicker/applets/clock/clock.h b/kicker/applets/clock/clock.h index 34d73cf83..36e5f00bf 100644 --- a/kicker/applets/clock/clock.h +++ b/kicker/applets/clock/clock.h @@ -48,7 +48,7 @@ class TQBoxLayout; class DatePicker; class TQPixmap; class Zone; -class KPopupMenu; +class TDEPopupMenu; class Prefs; class ClockApplet; @@ -342,7 +342,7 @@ class ClockApplet : public KPanelApplet, public KickerTip::Client, public DCOPOb bool showDayOfWeek; bool m_updateOnTheMinute; TQStringList _remotezonelist; - KPopupMenu* menu; + TDEPopupMenu* menu; ClockAppletToolTip m_tooltip; KTextShadowEngine *m_shadowEngine; }; diff --git a/kicker/applets/clock/fuzzy.ui b/kicker/applets/clock/fuzzy.ui index 6906808c7..28bcd7185 100644 --- a/kicker/applets/clock/fuzzy.ui +++ b/kicker/applets/clock/fuzzy.ui @@ -252,7 +252,7 @@ <cstring>kcfg_Fuzzyness</cstring> </property> </widget> - <widget class="KFontRequester" row="2" column="1" rowspan="1" colspan="2"> + <widget class="TDEFontRequester" row="2" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_FuzzyFont</cstring> </property> diff --git a/kicker/applets/clock/settings.ui b/kicker/applets/clock/settings.ui index 560ddcc7f..170a830f4 100644 --- a/kicker/applets/clock/settings.ui +++ b/kicker/applets/clock/settings.ui @@ -291,7 +291,7 @@ </size> </property> </spacer> - <widget class="KFontRequester" row="2" column="1" rowspan="1" colspan="3"> + <widget class="TDEFontRequester" row="2" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_PlainFont</cstring> </property> @@ -394,7 +394,7 @@ <string>Font:</string> </property> </widget> - <widget class="KFontRequester"> + <widget class="TDEFontRequester"> <property name="name"> <cstring>kcfg_DateFont</cstring> </property> @@ -441,7 +441,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>City</string> diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp index c43b76db1..f8c2fc59a 100644 --- a/kicker/applets/clock/zone.cpp +++ b/kicker/applets/clock/zone.cpp @@ -91,7 +91,7 @@ int Zone::calc_TZ_offset(const TQString& zone, bool /* reset */) return 0; } -void Zone::readZoneList(KListView *listView ) +void Zone::readZoneList(TDEListView *listView ) { const KTimezones::ZoneMap zones = m_zoneDb.allZones(); TQMap<TQString, TQListViewItem*> KontinentMap; @@ -130,7 +130,7 @@ void Zone::readZoneList(KListView *listView ) } } -void Zone::getSelectedZonelist(KListView *listView) +void Zone::getSelectedZonelist(TDEListView *listView) { _remotezonelist.clear(); diff --git a/kicker/applets/clock/zone.h b/kicker/applets/clock/zone.h index caaa112f9..cfe934790 100644 --- a/kicker/applets/clock/zone.h +++ b/kicker/applets/clock/zone.h @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqstringlist.h> class TDEConfig; -class KListView; +class TDEListView; class Zone { @@ -48,8 +48,8 @@ public: void nextZone(); void prevZone(); int calc_TZ_offset(const TQString& zone, bool reset=false); - void readZoneList(KListView *listView); - void getSelectedZonelist(KListView *listView); + void readZoneList(TDEListView *listView); + void getSelectedZonelist(TDEListView *listView); protected: KTimezones m_zoneDb; diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp index 0563dbb20..c66f4ceb8 100644 --- a/kicker/applets/launcher/quickbutton.cpp +++ b/kicker/applets/launcher/quickbutton.cpp @@ -143,7 +143,7 @@ TQPixmap QuickURL::pixmap( mode_t _mode, KIcon::Group _group, } -QuickButton::QuickButton(const TQString &u, KAction* configAction, +QuickButton::QuickButton(const TQString &u, TDEAction* configAction, TQWidget *parent, const char *name) : SimpleButton(parent, name, KickerSettings::showDeepButtons()), m_flashCounter(0), @@ -174,8 +174,8 @@ QuickButton::QuickButton(const TQString &u, KAction* configAction, _popup->insertItem(SmallIcon("remove"), i18n("Remove Application"), this, TQT_SLOT(removeApp())); - m_stickyAction = new KToggleAction(i18n("Never Remove Automatically"), - KShortcut(), TQT_TQOBJECT(this)); + m_stickyAction = new TDEToggleAction(i18n("Never Remove Automatically"), + TDEShortcut(), TQT_TQOBJECT(this)); connect(m_stickyAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotStickyToggled(bool))); m_stickyAction->plug(_popup, 2); diff --git a/kicker/applets/launcher/quickbutton.h b/kicker/applets/launcher/quickbutton.h index d4f5be29e..4629093cc 100644 --- a/kicker/applets/launcher/quickbutton.h +++ b/kicker/applets/launcher/quickbutton.h @@ -40,8 +40,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "simplebutton.h" class TQPopupMenu; -class KAction; -class KToggleAction; +class TDEAction; +class TDEToggleAction; class QuickURL { public: @@ -71,7 +71,7 @@ class QuickButton: public SimpleButton, public KickerTip::Client { public: enum { DEFAULT_ICON_DIM = 16 }; enum { ICON_MARGIN = 1 }; - QuickButton(const TQString &u, KAction* configAction, + QuickButton(const TQString &u, TDEAction* configAction, TQWidget *parent=0, const char *name=0); ~QuickButton(); TQString url() const; @@ -116,7 +116,7 @@ private: bool _highlight, _changeCursorOverItem, _dragEnabled; int _iconDim; bool m_sticky; - KToggleAction *m_stickyAction; + TDEToggleAction *m_stickyAction; int m_stickyId; KPanelApplet::Direction m_popupDirection; }; diff --git a/kicker/applets/launcher/quictdelauncher.cpp b/kicker/applets/launcher/quictdelauncher.cpp index 87ac35387..15439f9c9 100644 --- a/kicker/applets/launcher/quictdelauncher.cpp +++ b/kicker/applets/launcher/quictdelauncher.cpp @@ -107,7 +107,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions, m_oldButtons = 0; m_dragButtons = 0; - m_configAction = new KAction(i18n("Configure Quictdelauncher..."), "configure", KShortcut(), + m_configAction = new TDEAction(i18n("Configure Quictdelauncher..."), "configure", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), TQT_TQOBJECT(this)); m_saveTimer = new TQTimer(this, "m_saveTimer"); diff --git a/kicker/applets/launcher/quictdelauncher.h b/kicker/applets/launcher/quictdelauncher.h index c6fe1d2bb..71bd1c841 100644 --- a/kicker/applets/launcher/quictdelauncher.h +++ b/kicker/applets/launcher/quictdelauncher.h @@ -39,7 +39,7 @@ class ConfigDlg; class TQPopupMenu; class QuickButtonGroup; class PopularityStatistics; -class KAction; +class TDEAction; typedef QuickButtonGroup ButtonGroup; @@ -128,7 +128,7 @@ protected: bool m_dragAccepted, m_refreshEnabled, m_needsSave, m_needsRefresh; std::map<TQString, int> m_appOrdering; Prefs* m_settings; - KAction *m_configAction; + TDEAction *m_configAction; ConfigDlg *m_configDialog; PopularityStatistics* m_popularity; TQImage m_stickyHighlightLayer; diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp index b55aae92d..26803ddaa 100644 --- a/kicker/applets/lockout/lockout.cpp +++ b/kicker/applets/lockout/lockout.cpp @@ -185,7 +185,7 @@ void Lockout::propagateMouseEvent(TQMouseEvent* e) bool Lockout::eventFilter( TQObject *o, TQEvent *e ) { - if (!kapp->authorizeKAction("kicker_rmb")) + if (!kapp->authorizeTDEAction("kicker_rmb")) return false; // Process event normally: if( e->type() == TQEvent::MouseButtonPress ) diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp index f8a1ac630..b6e1e7995 100644 --- a/kicker/applets/media/mediaapplet.cpp +++ b/kicker/applets/media/mediaapplet.cpp @@ -427,7 +427,7 @@ void MediaApplet::mousePressEvent(TQMouseEvent *e) { if(e->button()==Qt::RightButton) { - KPopupMenu menu(this); + TDEPopupMenu menu(this); menu.insertTitle(i18n("Media")); menu.insertItem(SmallIcon("configure"), i18n("&Configure..."), 1); diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp index 0f240fcea..a180cfbd9 100644 --- a/kicker/applets/media/mediumbutton.cpp +++ b/kicker/applets/media/mediumbutton.cpp @@ -48,7 +48,7 @@ MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem) : PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)), mFileItem(fileItem), mOpenTimer(0, "MediumButton::mOpenTimer") { - KAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), + TDEAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), &mActions, "pasteto"); a->setShortcut(0); a = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), &mActions, "copy"); @@ -110,7 +110,7 @@ void MediumButton::initPopup() KonqPopupMenu *new_popup = new KonqPopupMenu(0L, items, KURL("media:/"), mActions, 0L, this, kpf, bef); - KPopupTitle *title = new KPopupTitle(new_popup); + TDEPopupTitle *title = new TDEPopupTitle(new_popup); title->setTitle(mFileItem.text()); new_popup->insertItem(title, -1, 0); diff --git a/kicker/applets/media/mediumbutton.h b/kicker/applets/media/mediumbutton.h index 5f6a2b80b..1bc6380c2 100644 --- a/kicker/applets/media/mediumbutton.h +++ b/kicker/applets/media/mediumbutton.h @@ -58,7 +58,7 @@ protected slots: void slotDragOpen(); private: - KActionCollection mActions; + TDEActionCollection mActions; KFileItem mFileItem; TQTimer mOpenTimer; }; diff --git a/kicker/applets/media/preferencesdialog.cpp b/kicker/applets/media/preferencesdialog.cpp index f53381a10..bd1a21b0d 100644 --- a/kicker/applets/media/preferencesdialog.cpp +++ b/kicker/applets/media/preferencesdialog.cpp @@ -63,7 +63,7 @@ PreferencesDialog::PreferencesDialog(KFileItemList media, TQWidget *parent, mMedia(media) { TQVBox *types_page = addVBoxPage( i18n("Medium Types") ); - mpMediumTypesListView = new KListView(types_page); + mpMediumTypesListView = new TDEListView(types_page); //mpMediumTypesListView->setFullWidth(true); mpMediumTypesListView->addColumn( i18n("Types to Display") ); @@ -72,7 +72,7 @@ PreferencesDialog::PreferencesDialog(KFileItemList media, TQWidget *parent, TQVBox *media_page = addVBoxPage( i18n("Media") ); - mpMediaListView = new KListView(media_page); + mpMediaListView = new TDEListView(media_page); //mpMediaListView->setFullWidth(true); mpMediaListView->addColumn( i18n("Media to Display") ); diff --git a/kicker/applets/media/preferencesdialog.h b/kicker/applets/media/preferencesdialog.h index f758d280b..b29f697ae 100644 --- a/kicker/applets/media/preferencesdialog.h +++ b/kicker/applets/media/preferencesdialog.h @@ -45,8 +45,8 @@ protected slots: void slotDefault(); private: - KListView *mpMediumTypesListView; - KListView *mpMediaListView; + TDEListView *mpMediumTypesListView; + TDEListView *mpMediaListView; KFileItemList mMedia; }; diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp index 8a9f68095..ee3bb175c 100644 --- a/kicker/applets/menu/menuapplet.cpp +++ b/kicker/applets/menu/menuapplet.cpp @@ -292,7 +292,7 @@ void Applet::setBackground() void Applet::claimSelection() { assert( selection == NULL ); - selection = new KSelectionOwner( makeSelectionAtom(), DefaultScreen( tqt_xdisplay())); + selection = new TDESelectionOwner( makeSelectionAtom(), DefaultScreen( tqt_xdisplay())); // force taking the selection, but don't kill previous owner if( selection->claim( true, false )) { @@ -327,7 +327,7 @@ void Applet::lostSelection() active_menu = NULL; if( selection_watcher == NULL ) { - selection_watcher = new KSelectionWatcher( makeSelectionAtom(), DefaultScreen( tqt_xdisplay())); + selection_watcher = new TDESelectionWatcher( makeSelectionAtom(), DefaultScreen( tqt_xdisplay())); connect( selection_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( claimSelection())); } delete module; diff --git a/kicker/applets/menu/menuapplet.h b/kicker/applets/menu/menuapplet.h index 5ba54cd66..0b09334b6 100644 --- a/kicker/applets/menu/menuapplet.h +++ b/kicker/applets/menu/menuapplet.h @@ -51,7 +51,7 @@ class MenuEmbed; * * @description All status change, such as when an window is activated, * a new window popped up, etc, is received via @ref KWin::WindowInfo and @ref - * NETWinInfo. Status changes for X selections are done via KSelectionWatcher. + * NETWinInfo. Status changes for X selections are done via TDESelectionWatcher. * * How it works in broad terms: KickerMenuApplet gets notified as soon a window * changes(a new pops up etc.) and accordingly updates the list @ref menus, @@ -158,12 +158,12 @@ private: */ MenuEmbed* active_menu; - KSelectionOwner* selection; + TDESelectionOwner* selection; /** * Only the messenger. Dispatches signals to claimSelection(). */ - KSelectionWatcher* selection_watcher; + TDESelectionWatcher* selection_watcher; /** * Whether the Desktop menu should be used, when a window diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp index 9d12279c2..6662d57d4 100644 --- a/kicker/applets/minipager/pagerapplet.cpp +++ b/kicker/applets/minipager/pagerapplet.cpp @@ -143,7 +143,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions, connect( m_twin, TQT_SIGNAL( desktopNamesChanged() ), this, TQT_SLOT( slotDesktopNamesChanged() ) ); connect( kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int)) ); - if (kapp->authorizeKAction("kicker_rmb") && kapp->authorizeControlModule("tde-kcmtaskbar.desktop")) + if (kapp->authorizeTDEAction("kicker_rmb") && kapp->authorizeControlModule("tde-kcmtaskbar.desktop")) { m_contextMenu = new TQPopupMenu(); connect(m_contextMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShowContextMenu())); @@ -365,7 +365,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y) if( m_desktopLayoutOwner == NULL ) { // must own manager selection before setting global desktop layout int screen = DefaultScreen( tqt_xdisplay()); - m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(), + m_desktopLayoutOwner = new TDESelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(), screen, TQT_TQOBJECT(this) ); if( !m_desktopLayoutOwner->claim( false )) { @@ -717,7 +717,7 @@ void KMiniPager::aboutToShowContextMenu() .arg(twin()->desktopName(m_rmbDesk)), RenameDesktop); m_contextMenu->insertSeparator(); - KPopupMenu* showMenu = new KPopupMenu(m_contextMenu); + TDEPopupMenu* showMenu = new TDEPopupMenu(m_contextMenu); showMenu->setCheckable(true); showMenu->insertTitle(i18n("Pager Layout")); diff --git a/kicker/applets/minipager/pagerapplet.h b/kicker/applets/minipager/pagerapplet.h index 9abe65f34..1f0edc409 100644 --- a/kicker/applets/minipager/pagerapplet.h +++ b/kicker/applets/minipager/pagerapplet.h @@ -40,7 +40,7 @@ class TQTimer; class TDEProcess; class KWinModule; class KTextShadowEngine; -class KSelectionOwner; +class TDESelectionOwner; class PagerSettings; @@ -128,7 +128,7 @@ private: int desktopLayoutOrientation; int desktopLayoutX; int desktopLayoutY; - KSelectionOwner* m_desktopLayoutOwner; + TDESelectionOwner* m_desktopLayoutOwner; KWinModule *m_twin; KTextShadowEngine* m_shadowEngine; diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index 835174f92..850e4a519 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -246,8 +246,8 @@ void SystemTrayApplet::preferences() m_showClockSettingCB = new TQCheckBox("Show Clock in Tray", settingsGrid); m_showClockSettingCB->setChecked(m_showClockInTray); - //m_iconSelector = new KActionSelector(m_settingsDialog); - m_iconSelector = new KActionSelector(settingsGrid); + //m_iconSelector = new TDEActionSelector(m_settingsDialog); + m_iconSelector = new TDEActionSelector(settingsGrid); m_iconSelector->setAvailableLabel(i18n("Hidden icons:")); m_iconSelector->setSelectedLabel(i18n("Visible icons:")); //m_settingsDialog->setMainWidget(m_iconSelector); diff --git a/kicker/applets/systemtray/systemtrayapplet.h b/kicker/applets/systemtray/systemtrayapplet.h index 92aab7268..332da2f84 100644 --- a/kicker/applets/systemtray/systemtrayapplet.h +++ b/kicker/applets/systemtray/systemtrayapplet.h @@ -44,7 +44,7 @@ class TQTimer; class KWinModule; class TrayEmbed; class KDialogBase; -class KActionSelector; +class TDEActionSelector; class SystemTrayApplet : public KPanelApplet, public DCOPObject { @@ -114,7 +114,7 @@ private: TQWidget *m_rightSpacer; ClockApplet *m_clockApplet; KDialogBase* m_settingsDialog; - KActionSelector* m_iconSelector; + TDEActionSelector* m_iconSelector; TQTimer* m_autoRetractTimer; bool m_autoRetract; int m_iconSize; diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp index 1f45e1fb4..fe8ad3200 100644 --- a/kicker/applets/trash/trashbutton.cpp +++ b/kicker/applets/trash/trashbutton.cpp @@ -39,7 +39,7 @@ TrashButton::TrashButton(TQWidget *parent) TDEIO::NetAccess::stat("trash:/", entry, 0L); mFileItem.assign(KFileItem(entry, "trash:/")); - KAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), + TDEAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), &mActions, "paste"); a->setShortcut(0); @@ -93,7 +93,7 @@ void TrashButton::initPopup() KonqPopupMenu *new_popup = new KonqPopupMenu(0L, items, KURL("trash:/"), mActions, 0L, this, kpf, bef); - KPopupTitle *title = new KPopupTitle(new_popup); + TDEPopupTitle *title = new TDEPopupTitle(new_popup); title->setTitle(i18n("Trash")); new_popup->insertItem(title, -1, 0); diff --git a/kicker/applets/trash/trashbutton.h b/kicker/applets/trash/trashbutton.h index 0ddad290e..15c5d598f 100644 --- a/kicker/applets/trash/trashbutton.h +++ b/kicker/applets/trash/trashbutton.h @@ -53,7 +53,7 @@ protected slots: void slotPaste(); private: - KActionCollection mActions; + TDEActionCollection mActions; KFileItem mFileItem; }; diff --git a/kicker/extensions/dockbar/dockcontainer.cpp b/kicker/extensions/dockbar/dockcontainer.cpp index 9c90caac4..5a9ea355a 100644 --- a/kicker/extensions/dockbar/dockcontainer.cpp +++ b/kicker/extensions/dockbar/dockcontainer.cpp @@ -170,7 +170,7 @@ void DockContainer::popupMenu(TQPoint p) { int r; { - KPopupMenu pm(this); + TDEPopupMenu pm(this); pm.insertItem( i18n("Kill This Applet"), 0); pm.insertItem( i18n("Change Command"), 1); r = pm.exec(p); diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp index 6545f57eb..912c9b0d3 100644 --- a/kicker/extensions/kasbar/kasclockitem.cpp +++ b/kicker/extensions/kasbar/kasclockitem.cpp @@ -115,6 +115,6 @@ void KasClockItem::showMenuAt( TQPoint p ) if ( !bar ) return; - KPopupMenu *menu = bar->contextMenu(); + TDEPopupMenu *menu = bar->contextMenu(); menu->exec( p ); } diff --git a/kicker/extensions/kasbar/kasloaditem.cpp b/kicker/extensions/kasbar/kasloaditem.cpp index 6fa1f9b2a..f89e210ed 100644 --- a/kicker/extensions/kasbar/kasloaditem.cpp +++ b/kicker/extensions/kasbar/kasloaditem.cpp @@ -125,6 +125,6 @@ void KasLoadItem::showMenuAt( TQPoint p ) if ( !bar ) return; - KPopupMenu *menu = bar->contextMenu(); + TDEPopupMenu *menu = bar->contextMenu(); menu->exec( p ); } diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp index 86d688b27..54ed56e4a 100644 --- a/kicker/extensions/kasbar/kastasker.cpp +++ b/kicker/extensions/kasbar/kastasker.cpp @@ -146,32 +146,32 @@ KasTasker::~KasTasker() delete grouper; } -KPopupMenu *KasTasker::contextMenu() +TDEPopupMenu *KasTasker::contextMenu() { if ( !menu ) { - menu = new KPopupMenu; + menu = new TDEPopupMenu; - showAllWindowsAction = new KToggleAction( i18n("Show &All Windows"), KShortcut(), + showAllWindowsAction = new TDEToggleAction( i18n("Show &All Windows"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_show_all_windows" ); showAllWindowsAction->setChecked( showAllWindows() ); showAllWindowsAction->plug( menu ); connect( showAllWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowAllWindows(bool)) ); connect( TQT_TQOBJECT(this), TQT_SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, TQT_SLOT(setChecked(bool)) ); - groupWindowsAction = new KToggleAction( i18n("&Group Windows"), KShortcut(), + groupWindowsAction = new TDEToggleAction( i18n("&Group Windows"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_group_windows" ); groupWindowsAction->setChecked( groupWindows() ); groupWindowsAction->plug( menu ); connect( groupWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setGroupWindows(bool)) ); connect( TQT_TQOBJECT(this), TQT_SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, TQT_SLOT(setChecked(bool)) ); - showClockAction = new KToggleAction( i18n("Show &Clock"), KShortcut(), TQT_TQOBJECT(this), "toggle_show_clock" ); + showClockAction = new TDEToggleAction( i18n("Show &Clock"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_show_clock" ); showClockAction->setChecked( showClock() ); showClockAction->plug( menu ); connect( showClockAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowClock(bool)) ); connect( TQT_TQOBJECT(this), TQT_SIGNAL(showClockChanged(bool)), showClockAction, TQT_SLOT(setChecked(bool)) ); - showLoadAction = new KToggleAction( i18n("Show &Load Meter"), KShortcut(), TQT_TQOBJECT(this), "toggle_show_load" ); + showLoadAction = new TDEToggleAction( i18n("Show &Load Meter"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_show_load" ); showLoadAction->setChecked( showLoad() ); showLoadAction->plug( menu ); connect( showLoadAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowLoad(bool)) ); @@ -180,14 +180,14 @@ KPopupMenu *KasTasker::contextMenu() menu->insertSeparator(); if ( !standalone_ ) { - toggleDetachedAction = new KToggleAction( i18n("&Floating"), KShortcut(), TQT_TQOBJECT(this), "toggle_detached" ); + toggleDetachedAction = new TDEToggleAction( i18n("&Floating"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_detached" ); toggleDetachedAction->setChecked( isDetached() ); toggleDetachedAction->plug( menu ); connect( toggleDetachedAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setDetached(bool)) ); connect( TQT_TQOBJECT(this), TQT_SIGNAL(detachedChanged(bool)), toggleDetachedAction, TQT_SLOT(setChecked(bool)) ); } - rotateBarAction = new KAction( i18n("R&otate Bar"), TQString("rotate"), KShortcut(), + rotateBarAction = new TDEAction( i18n("R&otate Bar"), TQString("rotate"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( toggleOrientation() ), TQT_TQOBJECT(this), "rotate_bar" ); rotateBarAction->plug( menu ); @@ -201,7 +201,7 @@ KPopupMenu *KasTasker::contextMenu() menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), TQT_TQOBJECT(this), TQT_SLOT( showPreferences() ) ); // Help menu - KPopupMenu *help = new KPopupMenu; + TDEPopupMenu *help = new TDEPopupMenu; help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), TQT_TQOBJECT(this), TQT_SLOT( showAbout() ) ); menu->insertItem( SmallIcon("help"), i18n("&Help"), help ); diff --git a/kicker/extensions/kasbar/kastasker.h b/kicker/extensions/kasbar/kastasker.h index 27dc2ff44..93cddd1ce 100644 --- a/kicker/extensions/kasbar/kastasker.h +++ b/kicker/extensions/kasbar/kastasker.h @@ -64,9 +64,9 @@ class TDEConfig; class KPixmap; -class KPopupMenu; -class KAction; -class KToggleAction; +class TDEPopupMenu; +class TDEAction; +class TDEToggleAction; class Task; class Startup; @@ -105,7 +105,7 @@ public: virtual ~KasTasker(); /** Factory method that returns the default menu for items in the bar. */ - virtual KPopupMenu *contextMenu(); + virtual TDEPopupMenu *contextMenu(); virtual KasTasker *createChildBar( Qt::Orientation o, TQWidget *parent, const char *name=0 ); @@ -246,15 +246,15 @@ protected slots: void readConfig( TDEConfig *conf ); private: - KPopupMenu *menu; + TDEPopupMenu *menu; TDEConfig *conf; KasGrouper *grouper; - KToggleAction *toggleDetachedAction; - KToggleAction *showAllWindowsAction; - KToggleAction *groupWindowsAction; - KToggleAction *showClockAction; - KToggleAction *showLoadAction; - KAction *rotateBarAction; + TDEToggleAction *toggleDetachedAction; + TDEToggleAction *showAllWindowsAction; + TDEToggleAction *groupWindowsAction; + TDEToggleAction *showClockAction; + TDEToggleAction *showLoadAction; + TDEAction *rotateBarAction; bool standalone_; bool passive_; diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp index ae775171f..b986ea54a 100644 --- a/kicker/extensions/kasbar/kastaskitem.cpp +++ b/kicker/extensions/kasbar/kastaskitem.cpp @@ -377,7 +377,7 @@ void KasTaskItem::showPropertiesDialog() // // Title // - KPopupTitle *title = new KPopupTitle( dlg, "title" ); + TDEPopupTitle *title = new TDEPopupTitle( dlg, "title" ); dlg->setCaption( i18n("Task Properties") ); title->setText( i18n("Task Properties") ); title->setIcon( icon() ); @@ -415,7 +415,7 @@ TQWidget *KasTaskItem::createTaskProps( TQObject *target, TQWidget *parent, bool vb->setMargin( KDialog::marginHint() ); // Create List View - KListView *taskprops = new KListView( vb, "props_view" ); + TDEListView *taskprops = new TDEListView( vb, "props_view" ); taskprops->setResizeMode( TQListView::LastColumn ); taskprops->addColumn( i18n("Property"), 0 ); taskprops->addColumn( i18n("Type"), 0 ); @@ -426,7 +426,7 @@ TQWidget *KasTaskItem::createTaskProps( TQObject *target, TQWidget *parent, bool for ( int i = 0; i < mo->numProperties( recursive ); i++ ) { const TQMetaProperty *p = mo->property(i, recursive); - (void) new KListViewItem( taskprops, + (void) new TDEListViewItem( taskprops, p->name(), p->type(), target->property( p->name() ).toString() ); } diff --git a/kicker/kicker/buttons/bookmarksbutton.cpp b/kicker/kicker/buttons/bookmarksbutton.cpp index e267848ef..5dc8190ac 100644 --- a/kicker/kicker/buttons/bookmarksbutton.cpp +++ b/kicker/kicker/buttons/bookmarksbutton.cpp @@ -40,8 +40,8 @@ BookmarksButton::BookmarksButton(TQWidget* parent) actionCollection(0), bookmarkOwner(0) { - actionCollection = new KActionCollection( this ); - bookmarkParent = new KPopupMenu(this, "bookmarks"); + actionCollection = new TDEActionCollection( this ); + bookmarkParent = new TDEPopupMenu(this, "bookmarks"); bookmarkOwner = new KBookmarkOwner; bookmarkMenu = new KBookmarkMenu(KonqBookmarkManager::self(), bookmarkOwner, diff --git a/kicker/kicker/buttons/bookmarksbutton.h b/kicker/kicker/buttons/bookmarksbutton.h index 82c0df75d..bb6d450e1 100644 --- a/kicker/kicker/buttons/bookmarksbutton.h +++ b/kicker/kicker/buttons/bookmarksbutton.h @@ -26,9 +26,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "panelbutton.h" -class KPopupMenu; +class TDEPopupMenu; class KBookmarkMenu; -class KActionCollection; +class TDEActionCollection; class KBookmarkOwner; /** @@ -49,9 +49,9 @@ protected: virtual TQString tileName() { return "WindowList"; } virtual void initPopup(); - KPopupMenu* bookmarkParent; + TDEPopupMenu* bookmarkParent; KBookmarkMenu* bookmarkMenu; - KActionCollection* actionCollection; + TDEActionCollection* actionCollection; KBookmarkOwner* bookmarkOwner; }; diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp index de596a052..92be0c00b 100644 --- a/kicker/kicker/core/applethandle.cpp +++ b/kicker/kicker/core/applethandle.cpp @@ -58,7 +58,7 @@ AppletHandle::AppletHandle(AppletContainer* parent) m_dragBar->installEventFilter(this); m_layout->addWidget(m_dragBar); - if (kapp->authorizeKAction("kicker_rmb")) + if (kapp->authorizeTDEAction("kicker_rmb")) { m_menuButton = new AppletHandleButton( this ); m_menuButton->installEventFilter(this); @@ -252,7 +252,7 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e) void AppletHandle::menuButtonPressed() { - if (!kapp->authorizeKAction("kicker_rmb")) + if (!kapp->authorizeTDEAction("kicker_rmb")) { return; } diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp index d3d7f10ba..969a81847 100644 --- a/kicker/kicker/core/container_applet.cpp +++ b/kicker/kicker/core/container_applet.cpp @@ -139,7 +139,7 @@ void AppletContainer::configure() if (isImmutable() || KickerSettings::hideAppletHandles() || - !kapp->authorizeKAction("kicker_rmb")) + !kapp->authorizeTDEAction("kicker_rmb")) { if (_handle->isVisibleTo(this)) { @@ -216,7 +216,7 @@ void AppletContainer::signalToBeRemoved() void AppletContainer::showAppletMenu() { - if (!kapp->authorizeKAction("kicker_rmb")) + if (!kapp->authorizeTDEAction("kicker_rmb")) { return; } @@ -461,7 +461,7 @@ void AppletContainer::setImmutable(bool immutable) BaseContainer::setImmutable(immutable); if (isImmutable() || KickerSettings::hideAppletHandles() || - !kapp->authorizeKAction("kicker_rmb")) + !kapp->authorizeTDEAction("kicker_rmb")) { if (_handle->isVisibleTo(this)) { diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp index 8196127e9..189ab5df5 100644 --- a/kicker/kicker/core/container_button.cpp +++ b/kicker/kicker/core/container_button.cpp @@ -244,7 +244,7 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) case Qt::RightButton: { - if (!kapp->authorizeKAction("kicker_rmb") || + if (!kapp->authorizeTDEAction("kicker_rmb") || isImmutable()) { break; diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index 381b36d4f..769f8408d 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -371,7 +371,7 @@ void ExtensionContainer::writeConfig() void ExtensionContainer::showPanelMenu( const TQPoint& globalPos ) { - if (!kapp->authorizeKAction("kicker_rmb")) + if (!kapp->authorizeTDEAction("kicker_rmb")) { return; } diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp index c42ffc13a..32a5cdfa5 100644 --- a/kicker/kicker/core/containerarea.cpp +++ b/kicker/kicker/core/containerarea.cpp @@ -325,7 +325,7 @@ void ContainerArea::loadContainers(const TQStringList& containers) a = new DesktopButtonContainer(group, m_opMenu, m_contents); else if (appletType == "WindowListButton") a = new WindowListButtonContainer(group, m_opMenu, m_contents); - else if ((appletType == "BookmarksButton") && kapp->authorizeKAction("bookmarks")) + else if ((appletType == "BookmarksButton") && kapp->authorizeTDEAction("bookmarks")) a = new BookmarksButtonContainer(group, m_opMenu, m_contents); else if (appletType == "ServiceButton") a = new ServiceButtonContainer(group, m_opMenu, m_contents); @@ -438,7 +438,7 @@ const TQWidget* ContainerArea::addButton(const AppletInfo& info) if (buttonType == "BookmarksButton") { - if (kapp->authorizeKAction("bookmarks")) + if (kapp->authorizeTDEAction("bookmarks")) { return addBookmarksButton(); } diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp index 1ef72d2c7..86c5e386e 100644 --- a/kicker/kicker/ui/appletop_mnu.cpp +++ b/kicker/kicker/ui/appletop_mnu.cpp @@ -175,7 +175,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP insertItem(SmallIcon("about_kde"), i18n("Switch to Trinity Classic Menu Style"), this, TQT_SLOT(toggleLegacy())); } - if ((actions & PanelAppletOpMenu::KMenuEditor) && kapp->authorizeKAction("menuedit")) + if ((actions & PanelAppletOpMenu::KMenuEditor) && kapp->authorizeTDEAction("menuedit")) { if (needSeparator) { @@ -187,7 +187,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP } if ((actions & PanelAppletOpMenu::BookmarkEditor) && - kapp->authorizeKAction("edit_bookmarks")) + kapp->authorizeTDEAction("edit_bookmarks")) { if (needSeparator) { diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp index ee82bc91f..6d0f2b542 100644 --- a/kicker/kicker/ui/itemview.cpp +++ b/kicker/kicker/ui/itemview.cpp @@ -618,7 +618,7 @@ void ItemViewTip::maybeTip( const TQPoint &pos ) // -------------------------------------------------------------------------- ItemView::ItemView(TQWidget* parent, const char* name) - : KListView(parent, name), m_spacer( 0 ), + : TDEListView(parent, name), m_spacer( 0 ), m_mouseMoveSelects(true), m_iconSize(32) { setHScrollBarMode( TQScrollView::AlwaysOff ); @@ -746,7 +746,7 @@ void ItemView::moveItemToIndex(KMenuItem* item, int nIndex) if (nIndex <= 0) { takeItem(item); - KListView::insertItem(item); + TDEListView::insertItem(item); } else { item->moveItem(itemAtIndex(nIndex)); @@ -909,7 +909,7 @@ void ItemView::slotItemClicked(TQListViewItem* item) void ItemView::contentsMousePressEvent ( TQMouseEvent * e ) { - KListView::contentsMousePressEvent( e ); + TDEListView::contentsMousePressEvent( e ); TQPoint vp = contentsToViewport(e->pos()); KMenuItemSeparator *si = dynamic_cast<KMenuItemSeparator*>( itemAt( vp ) ); @@ -936,15 +936,15 @@ void ItemView::contentsMouseMoveEvent(TQMouseEvent *e) return; } - KListView::contentsMouseMoveEvent(e); + TDEListView::contentsMouseMoveEvent(e); if (m_mouseMoveSelects) { if(i && i->isEnabled() && !i->isSelected() && // FIXME: This is wrong if you drag over the items. (e->state() & (Qt::LeftButton|Qt::MidButton|Qt::RightButton)) == 0) - KListView::setSelected(i, true); + TDEListView::setSelected(i, true); else if (!i && selectedItem()) - KListView::setSelected(selectedItem(), false); + TDEListView::setSelected(selectedItem(), false); } if ( link_cursor ) @@ -956,14 +956,14 @@ void ItemView::contentsMouseMoveEvent(TQMouseEvent *e) void ItemView::leaveEvent(TQEvent* e) { - KListView::leaveEvent(e); + TDEListView::leaveEvent(e); clearSelection(); } void ItemView::resizeEvent ( TQResizeEvent * e ) { - KListView::resizeEvent( e ); + TDEListView::resizeEvent( e ); // if ( m_lastOne ) // int diff = itemRect( m_lastOne ).bottom() - viewport()->height(); } @@ -971,7 +971,7 @@ void ItemView::resizeEvent ( TQResizeEvent * e ) void ItemView::viewportPaintEvent ( TQPaintEvent * pe ) { //kdDebug() << "viewportPaintEvent " << pe->rect() << " " << contentsY () << " " << m_old_contentY << endl; - KListView::viewportPaintEvent( pe ); + TDEListView::viewportPaintEvent( pe ); if ( m_lastOne && m_old_contentY != contentsY() ) { m_old_contentY = contentsY(); @@ -981,7 +981,7 @@ void ItemView::viewportPaintEvent ( TQPaintEvent * pe ) void ItemView::clear() { - KListView::clear(); + TDEListView::clear(); m_lastOne = 0; m_old_contentY = -1; m_back_url = TQString(); @@ -989,7 +989,7 @@ void ItemView::clear() void ItemView::contentsWheelEvent(TQWheelEvent *e) { - KListView::contentsWheelEvent(e); + TDEListView::contentsWheelEvent(e); TQPoint vp = contentsToViewport(e->pos()); TQListViewItem * i = itemAt( vp ); @@ -997,9 +997,9 @@ void ItemView::contentsWheelEvent(TQWheelEvent *e) if(i && i->isEnabled() && !i->isSelected() && // FIXME: This is wrong if you drag over the items. (e->state() & (Qt::LeftButton|Qt::MidButton|Qt::RightButton)) == 0) - KListView::setSelected(i, true); + TDEListView::setSelected(i, true); else if (!i && selectedItem()) - KListView::setSelected(selectedItem(), false); + TDEListView::setSelected(selectedItem(), false); } TQDragObject * ItemView::dragObject() diff --git a/kicker/kicker/ui/itemview.h b/kicker/kicker/ui/itemview.h index c8b95ee42..995cc57b4 100644 --- a/kicker/kicker/ui/itemview.h +++ b/kicker/kicker/ui/itemview.h @@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class KickerClientMenu; class KBookmarkMenu; -class KActionCollection; +class TDEActionCollection; class KBookmarkOwner; class Panel; class TQWidgetStack; @@ -152,7 +152,7 @@ public: void setHeight(int); }; -class ItemView : public KListView +class ItemView : public TDEListView { friend class KMenuItem; diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index eb87f02d0..f19d59d8b 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -83,7 +83,7 @@ PanelKMenu::PanelKMenu() client_id = 10000; // Don't automatically clear the main menu. disableAutoClear(); - actionCollection = new KActionCollection(this); + actionCollection = new TDEActionCollection(this); setCaption(i18n("TDE Menu")); connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), this, TQT_SLOT(configChanged())); @@ -263,7 +263,7 @@ void PanelKMenu::initialize() // Insert search field if (KickerSettings::useSearchBar()) { TQHBox* hbox = new TQHBox( this ); - KToolBarButton *clearButton = new KToolBarButton( "locationbar_erase", 0, hbox ); + TDEToolBarButton *clearButton = new TDEToolBarButton( "locationbar_erase", 0, hbox ); searchEdit = new KPIM::ClickLineEdit(hbox, " "+i18n("Press '/' to search...")); hbox->setFocusPolicy(TQ_StrongFocus); hbox->setFocusProxy(searchEdit); @@ -295,10 +295,10 @@ void PanelKMenu::initialize() bool need_separator = false; // insert bookmarks - if (KickerSettings::useBookmarks() && kapp->authorizeKAction("bookmarks")) + if (KickerSettings::useBookmarks() && kapp->authorizeTDEAction("bookmarks")) { // Need to create a new popup each time, it's deleted by subMenus.clear() - KPopupMenu * bookmarkParent = new KPopupMenu( this, "bookmarks" ); + TDEPopupMenu * bookmarkParent = new TDEPopupMenu( this, "bookmarks" ); if(!bookmarkOwner) bookmarkOwner = new KBookmarkOwner; delete bookmarkMenu; // can't reuse old one, the popup has been deleted diff --git a/kicker/kicker/ui/k_mnu.h b/kicker/kicker/ui/k_mnu.h index 53a29d809..7c76f55ed 100644 --- a/kicker/kicker/ui/k_mnu.h +++ b/kicker/kicker/ui/k_mnu.h @@ -39,7 +39,7 @@ namespace KPIM { class KickerClientMenu; class KBookmarkMenu; -class KActionCollection; +class TDEActionCollection; class KBookmarkOwner; class Panel; @@ -112,7 +112,7 @@ private: bool delay_init; TQIntDict<KickerClientMenu> clients; KBookmarkMenu *bookmarkMenu; - KActionCollection *actionCollection; + TDEActionCollection *actionCollection; KBookmarkOwner *bookmarkOwner; PopupMenuList dynamicSubMenus; KPIM::ClickLineEdit *searchEdit; diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index 464dd87de..a8d69c220 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -176,7 +176,7 @@ KMenu::KMenu() // set the first client id to some arbitrarily large value. client_id = 10000; // Don't automatically clear the main menu. - actionCollection = new KActionCollection(this); + actionCollection = new TDEActionCollection(this); connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), this, TQT_SLOT(configChanged())); @@ -1825,7 +1825,7 @@ void KMenu::createRecentMenuItems() m_recentlyView->insertSeparator( nId++, i18n( "Documents" ), -1 ); - TQStringList fileList = KRecentDocument::recentDocuments(); + TQStringList fileList = TDERecentDocument::recentDocuments(); kdDebug() << "createRecentMenuItems=" << fileList << endl; for (TQStringList::ConstIterator it = fileList.begin(); it != fileList.end(); @@ -1876,7 +1876,7 @@ void KMenu::clearRecentAppsItems() void KMenu::clearRecentDocsItems() { - KRecentDocument::clear(); + TDERecentDocument::clear(); updateRecent(); } @@ -2748,7 +2748,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos } } - m_popupMenu = new KPopupMenu(this); + m_popupMenu = new TDEPopupMenu(this); connect(m_popupMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotContextMenu(int))); bool hasEntries = false; @@ -2801,7 +2801,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos m_popupMenu->insertItem(SmallIconSet("desktop"), i18n("Add Item to Desktop"), AddItemToDesktop); } - if (kapp->authorizeKAction("kicker_rmb") && !Kicker::the()->isImmutable()) + if (kapp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable()) { hasEntries = true; if (m_popupPath.menuPath.endsWith("/")) @@ -2811,7 +2811,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos m_popupMenu->insertItem(SmallIconSet("kicker"), i18n("Add Item to Main Panel"), AddItemToPanel); } - if (kapp->authorizeKAction("menuedit") && !kitem->menuPath().isEmpty()) + if (kapp->authorizeTDEAction("menuedit") && !kitem->menuPath().isEmpty()) { hasEntries = true; if (kitem->menuPath().endsWith("/")) @@ -2841,7 +2841,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos _items.append( item ); const KURL kurl(uri); - KActionCollection act(this); + TDEActionCollection act(this); KonqPopupMenu * konqPopupMenu = new KonqPopupMenu( KonqBookmarkManager::self(), _items, kurl, act, (KNewMenu*)NULL, this, @@ -2855,7 +2855,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos } else { delete m_popupMenu; - m_popupMenu = (KPopupMenu*)konqPopupMenu; + m_popupMenu = (TDEPopupMenu*)konqPopupMenu; m_popupMenu->insertTitle(SmallIcon(kitem->icon()),kitem->title(),-1,0); } hasEntries = true; diff --git a/kicker/kicker/ui/k_new_mnu.h b/kicker/kicker/ui/k_new_mnu.h index 8a9970789..344be9b89 100644 --- a/kicker/kicker/ui/k_new_mnu.h +++ b/kicker/kicker/ui/k_new_mnu.h @@ -46,7 +46,7 @@ class KickerClientMenu; class KickoffTabBar; class KBookmarkMenu; -class KActionCollection; +class TDEActionCollection; class KBookmarkOwner; class Panel; class TQWidgetStack; @@ -210,7 +210,7 @@ private: int client_id; bool delay_init; TQIntDict<KickerClientMenu> clients; - KActionCollection *actionCollection; + TDEActionCollection *actionCollection; PopupMenuList dynamicSubMenus; TQTimer m_sloppyTimer; @@ -290,7 +290,7 @@ private: enum KickoffTabEntry { FavoriteTab, ApplicationsTab, ComputerTab, HistoryTab, LeaveTab, SearchTab, NumTabs }; - KPopupMenu* m_popupMenu; + TDEPopupMenu* m_popupMenu; KService* m_popupService; PopupPath m_popupPath; diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp index 62cc7ec75..baea6a54b 100644 --- a/kicker/kicker/ui/service_mnu.cpp +++ b/kicker/kicker/ui/service_mnu.cpp @@ -587,7 +587,7 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev) contextKSycocaEntry_ = entryMap_[id]; delete popupMenu_; - popupMenu_ = new KPopupMenu(this); + popupMenu_ = new TDEPopupMenu(this); connect(popupMenu_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotContextMenu(int))); bool hasEntries = false; @@ -600,13 +600,13 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev) popupMenu_->insertItem(SmallIconSet("desktop"), i18n("Add Item to Desktop"), AddItemToDesktop); } - if (kapp->authorizeKAction("kicker_rmb") && !Kicker::the()->isImmutable()) + if (kapp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable()) { hasEntries = true; popupMenu_->insertItem(SmallIconSet("kicker"), i18n("Add Item to Main Panel"), AddItemToPanel); } - if (kapp->authorizeKAction("menuedit")) + if (kapp->authorizeTDEAction("menuedit")) { hasEntries = true; popupMenu_->insertItem(SmallIconSet("kmenuedit"), @@ -627,13 +627,13 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev) popupMenu_->insertItem(SmallIconSet("desktop"), i18n("Add Menu to Desktop"), AddMenuToDesktop); } - if (kapp->authorizeKAction("kicker_rmb") && !Kicker::the()->isImmutable()) + if (kapp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable()) { hasEntries = true; popupMenu_->insertItem(SmallIconSet("kicker"), i18n("Add Menu to Main Panel"), AddMenuToPanel); } - if (kapp->authorizeKAction("menuedit")) + if (kapp->authorizeTDEAction("menuedit")) { hasEntries = true; popupMenu_->insertItem(SmallIconSet("kmenuedit"), diff --git a/kicker/kicker/ui/service_mnu.h b/kicker/kicker/ui/service_mnu.h index dbc8f496c..89e66937d 100644 --- a/kicker/kicker/ui/service_mnu.h +++ b/kicker/kicker/ui/service_mnu.h @@ -131,7 +131,7 @@ private slots: private: enum ContextMenuEntry { AddItemToPanel, EditItem, AddMenuToPanel, EditMenu, AddItemToDesktop, AddMenuToDesktop, PutIntoRunDialog }; - KPopupMenu* popupMenu_; + TDEPopupMenu* popupMenu_; KSycocaEntry* contextKSycocaEntry_; void readConfig(); }; diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp index d2fb755bb..6cdc1dbac 100644 --- a/kicker/menuext/konsole/konsole_mnu.cpp +++ b/kicker/menuext/konsole/konsole_mnu.cpp @@ -57,7 +57,7 @@ KonsoleMenu::~KonsoleMenu() TDEGlobal::locale()->removeCatalogue("libkickermenu_konsole"); } -static void insertItemSorted(KPopupMenu *menu, +static void insertItemSorted(TDEPopupMenu *menu, const TQIconSet &iconSet, const TQString &txt, int id) { @@ -196,7 +196,7 @@ void KonsoleMenu::initialize() id = 0; delete m_profileMenu; - m_profileMenu = new KPopupMenu(this); + m_profileMenu = new TDEPopupMenu(this); TQStringList profiles = TDEGlobal::dirs()->findAllResources("data", "konsole/profiles/*", false, true ); diff --git a/kicker/menuext/konsole/konsole_mnu.h b/kicker/menuext/konsole/konsole_mnu.h index e64c53212..4272fbaf9 100644 --- a/kicker/menuext/konsole/konsole_mnu.h +++ b/kicker/menuext/konsole/konsole_mnu.h @@ -54,8 +54,8 @@ private: TQStringList sessionList; TQStringList screenList; TQValueVector<TQString> m_profiles; - KPopupMenu* m_profileMenu; - KPopupMenu* m_bookmarksSession; + TDEPopupMenu* m_profileMenu; + TDEPopupMenu* m_bookmarksSession; KonsoleBookmarkHandler *m_bookmarkHandlerSession; }; diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.cpp b/kicker/menuext/konsole/konsolebookmarkhandler.cpp index 34bfb9649..314ceae10 100644 --- a/kicker/menuext/konsole/konsolebookmarkhandler.cpp +++ b/kicker/menuext/konsole/konsolebookmarkhandler.cpp @@ -21,7 +21,7 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( KonsoleMenu *konsole, bool ) m_konsole( konsole ), m_importStream( 0L ) { - m_menu = new KPopupMenu( konsole, "bookmark menu" ); + m_menu = new TDEPopupMenu( konsole, "bookmark menu" ); TQString file = locate( "data", "konsole/bookmarks.xml" ); if ( file.isEmpty() ) diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.h b/kicker/menuext/konsole/konsolebookmarkhandler.h index 733e52442..a1d2f54de 100644 --- a/kicker/menuext/konsole/konsolebookmarkhandler.h +++ b/kicker/menuext/konsole/konsolebookmarkhandler.h @@ -8,7 +8,7 @@ class TQTextStream; -class KPopupMenu; +class TDEPopupMenu; class KonsoleBookmarkMenu; class KonsoleMenu; @@ -26,7 +26,7 @@ public: { emit openURL( url, title ); } virtual TQString currentURL() const; - KPopupMenu *menu() const { return m_menu; } + TDEPopupMenu *menu() const { return m_menu; } signals: void openURL( const TQString& url, const TQString& title ); @@ -45,7 +45,7 @@ private: void importOldBookmarks( const TQString& path, const TQString& destinationPath ); KonsoleMenu *m_konsole; - KPopupMenu *m_menu; + TDEPopupMenu *m_menu; KonsoleBookmarkMenu *m_bookmarkMenu; TQTextStream *m_importStream; diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp index 1643195e8..3284c7a03 100644 --- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp +++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp @@ -21,8 +21,8 @@ KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr, - KonsoleBookmarkHandler * _owner, KPopupMenu * _parentMenu, - KActionCollection *collec, bool _isRoot, bool _add, + KonsoleBookmarkHandler * _owner, TDEPopupMenu * _parentMenu, + TDEActionCollection *collec, bool _isRoot, bool _add, const TQString & parentAddress ) : KBookmarkMenu( mgr, _owner, _parentMenu, collec, _isRoot, _add, parentAddress), @@ -47,7 +47,7 @@ KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr, * * Why did I do this? * - when KBookmarkMenu::fillbBookmarkMenu() creates sub-KBookmarkMenus. - * - when ... adds KActions, it uses KBookmarkMenu::slotBookmarkSelected() + * - when ... adds TDEActions, it uses KBookmarkMenu::slotBookmarkSelected() * instead of KonsoleBookmarkMenu::slotBookmarkSelected(). */ void KonsoleBookmarkMenu::slotAboutToShow2() @@ -64,7 +64,7 @@ void KonsoleBookmarkMenu::refill() { //kdDebug(1203) << "KBookmarkMenu::refill()" << endl; m_lstSubMenus.clear(); - TQPtrListIterator<KAction> it( m_actions ); + TQPtrListIterator<TDEAction> it( m_actions ); for (; it.current(); ++it ) it.current()->unplug( m_parentMenu ); m_parentMenu->clear(); @@ -90,7 +90,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() { m_parentMenu->insertSeparator(); - KActionMenu * actionMenu = new KActionMenu( i18n("Netscape Bookmarks"), + TDEActionMenu * actionMenu = new TDEActionMenu( i18n("Netscape Bookmarks"), "netscape", m_actionCollection, 0L ); actionMenu->plug( m_parentMenu ); @@ -127,7 +127,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() { // kdDebug(1203) << "Creating URL bookmark menu item for " << bm.text() << endl; // create a normal URL item, with ID as a name - KAction * action = new KAction( text, bm.icon(), 0, + TDEAction * action = new TDEAction( text, bm.icon(), 0, this, TQT_SLOT( slotBookmarkSelected() ), m_actionCollection, bm.url().url().utf8() ); @@ -140,7 +140,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() else { // kdDebug(1203) << "Creating bookmark submenu named " << bm.text() << endl; - KActionMenu * actionMenu = new KActionMenu( text, bm.icon(), + TDEActionMenu * actionMenu = new TDEActionMenu( text, bm.icon(), m_actionCollection, 0L ); actionMenu->plug( m_parentMenu ); m_actions.append( actionMenu ); @@ -162,26 +162,26 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() void KonsoleBookmarkMenu::slotBookmarkSelected() { - KAction * a; + TDEAction * a; TQString b; if ( !m_pOwner ) return; // this view doesn't handle bookmarks... - a = (KAction*)sender(); + a = (TDEAction*)sender(); b = a->text(); m_kOwner->openBookmarkURL( TQString::fromUtf8(TQT_TQOBJECT_CONST(sender())->name()), /* URL */ - ( (KAction *)sender() )->text() /* Title */ ); + ( (TDEAction *)sender() )->text() /* Title */ ); } void KonsoleBookmarkMenu::slotNSBookmarkSelected() { - KAction *a; + TDEAction *a; TQString b; TQString link(TQT_TQOBJECT_CONST(sender())->name()+8); - a = (KAction*)sender(); + a = (TDEAction*)sender(); b = a->text(); m_kOwner->openBookmarkURL( link, /*URL */ - ( (KAction *)sender() )->text() /* Title */ ); + ( (TDEAction *)sender() )->text() /* Title */ ); } #include "konsolebookmarkmenu.moc" diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.h b/kicker/menuext/konsole/konsolebookmarkmenu.h index a2325e264..103b6bc19 100644 --- a/kicker/menuext/konsole/konsolebookmarkmenu.h +++ b/kicker/menuext/konsole/konsolebookmarkmenu.h @@ -13,12 +13,12 @@ class TQString; class KBookmark; -class KAction; -class KActionMenu; -class KActionCollection; +class TDEAction; +class TDEActionMenu; +class TDEActionCollection; class KBookmarkOwner; class KBookmarkMenu; -class KPopupMenu; +class TDEPopupMenu; class KonsoleBookmarkMenu; class KonsoleBookmarkMenu : public KBookmarkMenu @@ -27,8 +27,8 @@ class KonsoleBookmarkMenu : public KBookmarkMenu public: KonsoleBookmarkMenu( KBookmarkManager* mgr, - KonsoleBookmarkHandler * _owner, KPopupMenu * _parentMenu, - KActionCollection *collec, bool _isRoot, + KonsoleBookmarkHandler * _owner, TDEPopupMenu * _parentMenu, + TDEActionCollection *collec, bool _isRoot, bool _add = true, const TQString & parentAddress = ""); void fillBookmarkMenu(); diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp index 3fb0b76d9..95f46dadc 100644 --- a/kicker/menuext/recentdocs/recentdocsmenu.cpp +++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp @@ -41,7 +41,7 @@ K_EXPORT_KICKER_MENUEXT(recentdocs, RecentDocsMenu) RecentDocsMenu::RecentDocsMenu(TQWidget *parent, const char *name, const TQStringList &/*args*/) - : KPanelMenu(KRecentDocument::recentDocumentDirectory(), parent, name) + : KPanelMenu(TDERecentDocument::recentDocumentDirectory(), parent, name) { } @@ -55,7 +55,7 @@ void RecentDocsMenu::initialize() { insertItem(SmallIconSet("history_clear"), i18n("Clear History"), this, TQT_SLOT(slotClearHistory())); insertSeparator(); - _fileList = KRecentDocument::recentDocuments(); + _fileList = TDERecentDocument::recentDocuments(); if (_fileList.isEmpty()) { insertItem(i18n("No Entries"), 0); @@ -90,7 +90,7 @@ void RecentDocsMenu::initialize() { } void RecentDocsMenu::slotClearHistory() { - KRecentDocument::clear(); + TDERecentDocument::clear(); reinitialize(); } diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc index 100045339..a02d88a6a 100644 --- a/kicker/menuext/tom/tom.cc +++ b/kicker/menuext/tom/tom.cc @@ -87,7 +87,7 @@ TQObject* TOMFactory::createObject(TQObject *parent, const char *name, const cha class runMenuWidget : public TQWidget, public QMenuItem { public: - runMenuWidget(KPopupMenu* parent, int index) + runMenuWidget(TDEPopupMenu* parent, int index) : TQWidget (parent), m_menu(parent), m_index(index) @@ -164,7 +164,7 @@ class runMenuWidget : public TQWidget, public QMenuItem } private: - KPopupMenu* m_menu; + TDEPopupMenu* m_menu; KHistoryCombo* m_runEdit; TQPixmap icon; TQRect textRect; @@ -220,7 +220,7 @@ void TOM::initializeRecentDocs() this, TQT_SLOT(clearRecentDocHistory())); m_recentDocsMenu->insertSeparator(); - m_recentDocURLs = KRecentDocument::recentDocuments(); + m_recentDocURLs = TDERecentDocument::recentDocuments(); if (m_recentDocURLs.isEmpty()) { @@ -267,10 +267,10 @@ int TOM::appendTaskGroup(TDEConfig& config, bool inSubMenu) return 0; } - KPopupMenu* taskGroup; + TDEPopupMenu* taskGroup; if( inSubMenu ) { - taskGroup = new KPopupMenu(this); + taskGroup = new TDEPopupMenu(this); if (icon != TQString::null) { @@ -370,8 +370,8 @@ int TOM::appendTaskGroup(TDEConfig& config, bool inSubMenu) if (inSubMenu) { - TQObject::connect(taskGroup, TQT_SIGNAL(aboutToShowContextMenu(KPopupMenu*, int, TQPopupMenu*)), - this, TQT_SLOT(contextualizeRMBmenu(KPopupMenu*, int, TQPopupMenu*))); + TQObject::connect(taskGroup, TQT_SIGNAL(aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*)), + this, TQT_SLOT(contextualizeRMBmenu(TDEPopupMenu*, int, TQPopupMenu*))); m_submenus.append(taskGroup); @@ -384,7 +384,7 @@ int TOM::appendTaskGroup(TDEConfig& config, bool inSubMenu) taskGroup->insertItem("Modify These Tasks", configureMenuID); TQPopupMenu* rmbMenu = taskGroup->contextMenu(); rmbMenu->setFont(m_largerFont); - KPopupTitle* title = new KPopupTitle(); + TDEPopupTitle* title = new TDEPopupTitle(); title->setText(i18n("%1 Menu Editor").arg(name)); rmbMenu->insertItem(title, contextMenuTitleID); rmbMenu->insertItem(i18n("Add This Task to Panel")); @@ -492,14 +492,14 @@ void TOM::initialize() // RECENTLY USED ITEMS insertTitle(i18n("Recently Used Items"), contextMenuTitleID); - m_recentDocsMenu = new KPopupMenu(this, "recentDocs"); + m_recentDocsMenu = new TDEPopupMenu(this, "recentDocs"); m_recentDocsMenu->setFont(m_largerFont); connect(m_recentDocsMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(initializeRecentDocs())); connect(m_recentDocsMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(openRecentDocument(int))); insertItem(DesktopIcon("document", KIcon::SizeMedium), i18n("Recent Documents"), m_recentDocsMenu); m_submenus.append(m_recentDocsMenu); - KPopupMenu* recentApps = new KPopupMenu(this, "recentApps"); + TDEPopupMenu* recentApps = new TDEPopupMenu(this, "recentApps"); recentApps->setFont(m_largerFont); recentApps->setKeyboardShortcutsEnabled(true); initializeRecentApps(recentApps); @@ -573,7 +573,7 @@ void TOM::reload() initialize(); } -void TOM::contextualizeRMBmenu(KPopupMenu* menu, int menuItem, TQPopupMenu* ctxMenu) +void TOM::contextualizeRMBmenu(TDEPopupMenu* menu, int menuItem, TQPopupMenu* ctxMenu) { if (menuItem == configureMenuID) { @@ -588,7 +588,7 @@ void TOM::contextualizeRMBmenu(KPopupMenu* menu, int menuItem, TQPopupMenu* ctxM { text = text.left(parens); } - KPopupTitle* title = new KPopupTitle(); + TDEPopupTitle* title = new TDEPopupTitle(); title->setText(i18n("The \"%2\" Task").arg(text)); ctxMenu->insertItem(title, contextMenuTitleID, 0); } @@ -608,14 +608,14 @@ void TOM::slotExec(int /* id */) void TOM::removeTask() { // TODO: write this change out to the appropriate config file - TQString task = KPopupMenu::contextMenuFocus()->text(KPopupMenu::contextMenuFocusItem()); + TQString task = TDEPopupMenu::contextMenuFocus()->text(TDEPopupMenu::contextMenuFocusItem()); if (KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure you want to remove the <strong>%1</strong> task?<p>" "<em>Tip: You can restore the task after it has been removed by selecting the "Modify These Tasks" entry</em></qt>").arg(task), i18n("Remove Task?"),KStdGuiItem::del()) == KMessageBox::Continue) { - m_tasks.remove(KPopupMenu::contextMenuFocusItem()); - KPopupMenu::contextMenuFocus()->removeItem(KPopupMenu::contextMenuFocusItem()); + m_tasks.remove(TDEPopupMenu::contextMenuFocusItem()); + TDEPopupMenu::contextMenuFocus()->removeItem(TDEPopupMenu::contextMenuFocusItem()); } } @@ -833,7 +833,7 @@ void TOM::runTask(int id) void TOM::clearRecentDocHistory() { - KRecentDocument::clear(); + TDERecentDocument::clear(); } void TOM::openRecentDocument(int id) diff --git a/kicker/menuext/tom/tom.h b/kicker/menuext/tom/tom.h index e4b8cc884..b67f2bd6c 100644 --- a/kicker/menuext/tom/tom.h +++ b/kicker/menuext/tom/tom.h @@ -24,7 +24,7 @@ #include <kpanelmenu.h> #include <klibloader.h> -class KPopupMenu; +class TDEPopupMenu; class TQPopupMenu; typedef TQPtrList<TQPopupMenu> PopupMenuList; @@ -49,7 +49,7 @@ class TOM : public KPanelMenu void slotExec(int); //void configChanged(); void initialize(); - void contextualizeRMBmenu(KPopupMenu* menu, int menuItem, TQPopupMenu* ctxMenu); + void contextualizeRMBmenu(TDEPopupMenu* menu, int menuItem, TQPopupMenu* ctxMenu); //void paletteChanged(); void clearRecentDocHistory(); void runCommand(); @@ -91,7 +91,7 @@ class TOM : public KPanelMenu bool m_detailedTaskEntries; bool m_detailedNamesFirst; TaskMap m_tasks; - KPopupMenu* m_recentDocsMenu; + TDEPopupMenu* m_recentDocsMenu; TQStringList m_recentDocURLs; }; diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp index 9d259176f..dd5cfff4d 100644 --- a/kicker/taskbar/taskcontainer.cpp +++ b/kicker/taskbar/taskcontainer.cpp @@ -1212,7 +1212,7 @@ void TaskContainer::popupMenu(int action) } else if (action == m_settingsObject->ShowOperationsMenu) { - if (!kapp->authorizeKAction("twin_rmb")) + if (!kapp->authorizeTDEAction("twin_rmb")) { return; } diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp index fd81beffc..0c1b5379a 100644 --- a/klipper/configdialog.cpp +++ b/klipper/configdialog.cpp @@ -214,7 +214,7 @@ void ListView::rename( TQListViewItem* item, int c ) } else - KListView::rename( item ,c ); + TDEListView::rename( item ,c ); } @@ -250,8 +250,8 @@ ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget, connect( listView, TQT_SIGNAL( selectionChanged ( TQListViewItem * )), TQT_SLOT(selectionChanged ( TQListViewItem * ))); connect(listView, - TQT_SIGNAL(contextMenu(KListView *, TQListViewItem *, const TQPoint&)), - TQT_SLOT( slotContextMenu(KListView*, TQListViewItem*, const TQPoint&))); + TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint&)), + TQT_SLOT( slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); ClipAction *action = 0L; ClipCommand *command = 0L; @@ -321,14 +321,14 @@ void ActionWidget::selectionChanged ( TQListViewItem * item) delActionButton->setEnabled(item!=0); } -void ActionWidget::slotContextMenu( KListView *, TQListViewItem *item, +void ActionWidget::slotContextMenu( TDEListView *, TQListViewItem *item, const TQPoint& pos ) { if ( !item ) return; int addCmd = 0, rmCmd = 0; - KPopupMenu *menu = new KPopupMenu; + TDEPopupMenu *menu = new TDEPopupMenu; addCmd = menu->insertItem( i18n("Add Command") ); rmCmd = menu->insertItem( i18n("Remove Command") ); if ( !item->parent() ) {// no "command" item @@ -451,7 +451,7 @@ void AdvancedWidget::setWMClasses( const TQStringList& items ) ////////// /* -KeysWidget::KeysWidget( KAccelActions &keyMap, TQWidget *parent, const char *name) +KeysWidget::KeysWidget( TDEAccelActions &keyMap, TQWidget *parent, const char *name) : TQVBox( parent, name ) { keyChooser = new KKeyChooser( keyMap, this ); diff --git a/klipper/configdialog.h b/klipper/configdialog.h index 7db964b4c..c77514857 100644 --- a/klipper/configdialog.h +++ b/klipper/configdialog.h @@ -37,7 +37,7 @@ class TDEGlobalAccel; class KKeyChooser; -class KListView; +class TDEListView; class TQPushButton; class TQDialog; class ConfigDialog; @@ -106,11 +106,11 @@ private slots: void slotDeleteAction(); void slotItemChanged( TQListViewItem *, const TQPoint& , int ); void slotAdvanced(); - void slotContextMenu( KListView *, TQListViewItem *, const TQPoint& ); + void slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint& ); void selectionChanged ( TQListViewItem *); private: - KListView *listView; + TDEListView *listView; TQStringList m_wmClasses; AdvancedWidget *advancedWidget; TQPushButton *delActionButton; @@ -124,7 +124,7 @@ private: friend class ConfigDialog; public: - KeysWidget( KAccelActions &keyMap, TQWidget *parent, const char *name ); + KeysWidget( TDEAccelActions &keyMap, TQWidget *parent, const char *name ); ~KeysWidget(); private: @@ -231,11 +231,11 @@ private: }; -class ListView : public KListView +class ListView : public TDEListView { public: ListView( ConfigDialog* configWidget, TQWidget *parent, const char *name ) - : KListView( parent, name ), _configWidget( configWidget ), + : TDEListView( parent, name ), _configWidget( configWidget ), _regExpEditor(0L) {} // TQListView has a weird idea of a sizeHint... virtual TQSize sizeHint () const { diff --git a/klipper/klipperpopup.cpp b/klipper/klipperpopup.cpp index 3e1db75bd..048ea8b1b 100644 --- a/klipper/klipperpopup.cpp +++ b/klipper/klipperpopup.cpp @@ -94,7 +94,7 @@ protected: }; KlipperPopup::KlipperPopup( History* history, TQWidget* parent, const char* name ) - : KPopupMenu( parent, name ), + : TDEPopupMenu( parent, name ), m_dirty( true ), QSempty( i18n( "<empty clipboard>" ) ), QSnomatch( i18n( "<no matches>" ) ), @@ -155,7 +155,7 @@ void KlipperPopup::buildFromScratch() { // Insert Help-menu at the butttom of the "default" group. TQString group; TQString defaultGroup( "default" ); - for ( KAction* action = m_actions.first(); action; action = m_actions.next() ) { + for ( TDEAction* action = m_actions.first(); action; action = m_actions.next() ) { group = action->group(); if ( group != lastGroup ) { if ( lastGroup == defaultGroup ) { @@ -213,7 +213,7 @@ void KlipperPopup::rebuild( const TQString& filter ) { } -void KlipperPopup::plugAction( KAction* action ) { +void KlipperPopup::plugAction( TDEAction* action ) { m_actions.append( action ); } @@ -233,9 +233,9 @@ void KlipperPopup::keyPressEvent( TQKeyEvent* e ) { e->text(), e->isAutoRepeat(), e->count() ); - KPopupMenu::keyPressEvent( &ke ); + TDEPopupMenu::keyPressEvent( &ke ); #ifdef DEBUG_EVENTS__ - kdDebug() << "Passing this event to ancestor (KPopupMenu): " << e "->" << ke << endl; + kdDebug() << "Passing this event to ancestor (TDEPopupMenu): " << e "->" << ke << endl; #endif if ( ke.isAccepted() ) { e->accept(); @@ -260,9 +260,9 @@ void KlipperPopup::keyPressEvent( TQKeyEvent* e ) { case Qt::Key_Enter: { #ifdef DEBUG_EVENTS__ - kdDebug() << "Passing this event to ancestor (KPopupMenu): " << e << endl; + kdDebug() << "Passing this event to ancestor (TDEPopupMenu): " << e << endl; #endif - KPopupMenu::keyPressEvent( e ); + TDEPopupMenu::keyPressEvent( e ); if ( isItemActive( m_filterWidgetId ) ) { setActiveItem( TOP_HISTORY_ITEM_INDEX ); } diff --git a/klipper/klipperpopup.h b/klipper/klipperpopup.h index 50ca55938..a9849e8c3 100644 --- a/klipper/klipperpopup.h +++ b/klipper/klipperpopup.h @@ -27,7 +27,7 @@ class History; class KlipperWidget; class KHelpMenu; -class KAction; +class TDEAction; class PopupProxy; class KLineEdit; @@ -35,14 +35,14 @@ class KLineEdit; * Default view of clipboard history. * */ -class KlipperPopup : public KPopupMenu +class KlipperPopup : public TDEPopupMenu { Q_OBJECT public: KlipperPopup( History* history, TQWidget* parent=0, const char* name=0 ); ~KlipperPopup(); - void plugAction( KAction* action ); + void plugAction( TDEAction* action ); /** * Normally, the popupmenu is only rebuilt just before showing. @@ -95,7 +95,7 @@ private: /** * (unowned) actions to plug into the primary popup menu */ - TQPtrList<KAction> m_actions; + TQPtrList<TDEAction> m_actions; /** * Proxy helper object used to track history items diff --git a/klipper/popupproxy.cpp b/klipper/popupproxy.cpp index bf4863607..d5c572690 100644 --- a/klipper/popupproxy.cpp +++ b/klipper/popupproxy.cpp @@ -49,13 +49,13 @@ void PopupProxy::slotHistoryChanged() { } void PopupProxy::deleteMoreMenus() { - const KPopupMenu* myParent = parent(); + const TDEPopupMenu* myParent = parent(); if ( myParent != proxy_for_menu ) { - const KPopupMenu* delme = proxy_for_menu;; - proxy_for_menu = static_cast<KPopupMenu*>( proxy_for_menu->parent() ); + const TDEPopupMenu* delme = proxy_for_menu;; + proxy_for_menu = static_cast<TDEPopupMenu*>( proxy_for_menu->parent() ); while ( proxy_for_menu != myParent ) { delme = proxy_for_menu; - proxy_for_menu = static_cast<KPopupMenu*>( proxy_for_menu->parent() ); + proxy_for_menu = static_cast<TDEPopupMenu*>( proxy_for_menu->parent() ); } delete delme; } @@ -150,7 +150,7 @@ int PopupProxy::insertFromSpill( int index ) { // If there is more items in the history, insert a new "More..." menu and // make *this a proxy for that menu ('s content). if ( spillPointer.current() ) { - KPopupMenu* moreMenu = new KPopupMenu( proxy_for_menu, "a more menu" ); + TDEPopupMenu* moreMenu = new TDEPopupMenu( proxy_for_menu, "a more menu" ); proxy_for_menu->insertItem( i18n( "&More" ), moreMenu, -1, index ); connect( moreMenu, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) ); proxy_for_menu = moreMenu; diff --git a/klipper/popupproxy.h b/klipper/popupproxy.h index 78dbbdc09..6526a8c55 100644 --- a/klipper/popupproxy.h +++ b/klipper/popupproxy.h @@ -81,7 +81,7 @@ private: void deleteMoreMenus(); private: - KPopupMenu* proxy_for_menu; + TDEPopupMenu* proxy_for_menu; History::iterator spillPointer; TQRegExp m_filter; int m_menu_height; diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp index b7832aae5..f9254dee3 100644 --- a/klipper/toplevel.cpp +++ b/klipper/toplevel.cpp @@ -150,13 +150,13 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config ) m_history = new History( this, "main_history" ); - // we need that collection, otherwise KToggleAction is not happy :} + // we need that collection, otherwise TDEToggleAction is not happy :} TQString defaultGroup( "default" ); - KActionCollection *collection = new KActionCollection( this, "my collection" ); - toggleURLGrabAction = new KToggleAction( collection, "toggleUrlGrabAction" ); + TDEActionCollection *collection = new TDEActionCollection( this, "my collection" ); + toggleURLGrabAction = new TDEToggleAction( collection, "toggleUrlGrabAction" ); toggleURLGrabAction->setEnabled( true ); toggleURLGrabAction->setGroup( defaultGroup ); - clearHistoryAction = new KAction( i18n("C&lear Clipboard History"), + clearHistoryAction = new TDEAction( i18n("C&lear Clipboard History"), "history_clear", 0, TQT_TQOBJECT(history()), @@ -165,7 +165,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config ) "clearHistoryAction" ); connect( clearHistoryAction, TQT_SIGNAL( activated() ), TQT_SLOT( slotClearClipboard() ) ); clearHistoryAction->setGroup( defaultGroup ); - configureAction = new KAction( i18n("&Configure Klipper..."), + configureAction = new TDEAction( i18n("&Configure Klipper..."), "configure", 0, TQT_TQOBJECT(this), @@ -173,7 +173,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config ) collection, "configureAction" ); configureAction->setGroup( defaultGroup ); - quitAction = new KAction( i18n("&Quit"), + quitAction = new TDEAction( i18n("&Quit"), "exit", 0, TQT_TQOBJECT(this), diff --git a/klipper/toplevel.h b/klipper/toplevel.h index 1d967a213..dc2682ea2 100644 --- a/klipper/toplevel.h +++ b/klipper/toplevel.h @@ -30,13 +30,13 @@ #include <tqtimer.h> class TQClipboard; -class KToggleAction; +class TDEToggleAction; class TDEAboutData; class URLGrabber; class ClipboardPoll; class TQTime; class History; -class KAction; +class TDEAction; class TQMimeSource; class HistoryItem; class KlipperSessionManaged; @@ -168,10 +168,10 @@ private: int m_lastSelection; History* m_history; int m_overflowCounter; - KToggleAction *toggleURLGrabAction; - KAction* clearHistoryAction; - KAction* configureAction; - KAction* quitAction; + TDEToggleAction *toggleURLGrabAction; + TDEAction* clearHistoryAction; + TDEAction* configureAction; + TDEAction* quitAction; TQPixmap m_pixmap; TQPixmap m_scaledpixmap; int m_iconOrigWidth; diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp index c2952a736..5a93f1c10 100644 --- a/klipper/urlgrabber.cpp +++ b/klipper/urlgrabber.cpp @@ -40,7 +40,7 @@ // TODO: // - script-interface? -// - Bug in KPopupMenu::clear() (insertTitle() doesn't go away sometimes) +// - Bug in TDEPopupMenu::clear() (insertTitle() doesn't go away sometimes) #define URL_EDIT_ITEM 10 #define DO_NOTHING_ITEM 11 @@ -163,7 +163,7 @@ void URLGrabber::actionMenu( bool wm_class_check ) myPopupKillTimer->stop(); delete myMenu; - myMenu = new KPopupMenu; + myMenu = new TDEPopupMenu; connect( myMenu, TQT_SIGNAL( activated( int )), TQT_SLOT( slotItemSelected( int ))); diff --git a/klipper/urlgrabber.h b/klipper/urlgrabber.h index a40e48bf6..fd97067dc 100644 --- a/klipper/urlgrabber.h +++ b/klipper/urlgrabber.h @@ -32,7 +32,7 @@ class TQTimer; class TDEConfig; -class KPopupMenu; +class TDEPopupMenu; class ClipAction; struct ClipCommand; @@ -85,7 +85,7 @@ private: ClipAction *myCurrentAction; TQIntDict<ClipCommand> myCommandMapper; TQIntDict<TQStringList> myGroupingMapper; - KPopupMenu *myMenu; + TDEPopupMenu *myMenu; TQTimer *myPopupKillTimer; int myPopupKillTimeout; bool m_stripWhiteSpace; diff --git a/kmenuedit/basictab.cpp b/kmenuedit/basictab.cpp index bdee0e3b3..ce1667cae 100644 --- a/kmenuedit/basictab.cpp +++ b/kmenuedit/basictab.cpp @@ -219,8 +219,8 @@ BasicTab::BasicTab( TQWidget *parent, const char *name ) //connect( _keyButton, TQT_SIGNAL( clicked()), this, TQT_SLOT( keyButtonPressed())); _keyEdit = new KKeyButton(general_group_keybind); grid_keybind->addWidget(new TQLabel(_keyEdit, i18n("Current shortcut &key:"), general_group_keybind), 0, 0); - connect( _keyEdit, TQT_SIGNAL(capturedShortcut(const KShortcut&)), - this, TQT_SLOT(slotCapturedShortcut(const KShortcut&))); + connect( _keyEdit, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), + this, TQT_SLOT(slotCapturedShortcut(const TDEShortcut&))); grid_keybind->addWidget(_keyEdit, 0, 1); //grid_keybind->addWidget(_keyButton, 0, 2 ); @@ -321,7 +321,7 @@ void BasicTab::setEntryInfo(MenuEntryInfo *entryInfo) _iconButton->setIcon(TQString::null); // key binding part - _keyEdit->setShortcut( KShortcut(), false ); + _keyEdit->setShortcut( TDEShortcut(), false ); _execEdit->lineEdit()->setText(TQString::null); _systrayCB->setChecked(false); @@ -463,7 +463,7 @@ void BasicTab::slotExecSelected() _execEdit->lineEdit()->setText(TDEProcess::quote(path)); } -void BasicTab::slotCapturedShortcut(const KShortcut& cut) +void BasicTab::slotCapturedShortcut(const TDEShortcut& cut) { if (signalsBlocked()) return; diff --git a/kmenuedit/basictab.h b/kmenuedit/basictab.h index fb4555c6a..947a2a14a 100644 --- a/kmenuedit/basictab.h +++ b/kmenuedit/basictab.h @@ -49,7 +49,7 @@ public: signals: void changed( MenuFolderInfo * ); void changed( MenuEntryInfo * ); - void findServiceShortcut(const KShortcut&, KService::Ptr &); + void findServiceShortcut(const TDEShortcut&, KService::Ptr &); public slots: void setFolderInfo(MenuFolderInfo *folderInfo); @@ -61,7 +61,7 @@ protected slots: void systraycb_clicked(); void termcb_clicked(); void uidcb_clicked(); - void slotCapturedShortcut(const KShortcut&); + void slotCapturedShortcut(const TDEShortcut&); void slotExecSelected(); protected: diff --git a/kmenuedit/kmenuedit.cpp b/kmenuedit/kmenuedit.cpp index 48af13124..80f5eabf0 100644 --- a/kmenuedit/kmenuedit.cpp +++ b/kmenuedit/kmenuedit.cpp @@ -38,7 +38,7 @@ #include "kmenuedit.moc" KMenuEdit::KMenuEdit (bool controlCenter, TQWidget *, const char *name) - : KMainWindow (0, name), m_tree(0), m_basicTab(0), m_splitter(0), m_controlCenter(controlCenter) + : TDEMainWindow (0, name), m_tree(0), m_basicTab(0), m_splitter(0), m_controlCenter(controlCenter) { #if 0 m_showHidden = config->readBoolEntry("ShowHidden"); @@ -62,12 +62,12 @@ KMenuEdit::~KMenuEdit() void KMenuEdit::setupActions() { - (void)new KAction(i18n("&New Submenu..."), "menu_new", 0, actionCollection(), "newsubmenu"); - (void)new KAction(i18n("New &Item..."), "filenew", KStdAccel::openNew(), actionCollection(), "newitem"); + (void)new TDEAction(i18n("&New Submenu..."), "menu_new", 0, actionCollection(), "newsubmenu"); + (void)new TDEAction(i18n("New &Item..."), "filenew", TDEStdAccel::openNew(), actionCollection(), "newitem"); if (!m_controlCenter) - (void)new KAction(i18n("New S&eparator"), "menu_new_sep", 0, actionCollection(), "newsep"); + (void)new TDEAction(i18n("New S&eparator"), "menu_new_sep", 0, actionCollection(), "newsep"); - (void)new KAction(i18n("Save && Quit"), "filesave_and_close", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSave_and_close()), actionCollection(), "file_save_and_quit"); + (void)new TDEAction(i18n("Save && Quit"), "filesave_and_close", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSave_and_close()), actionCollection(), "file_save_and_quit"); m_actionDelete = 0; @@ -97,8 +97,8 @@ void KMenuEdit::setupView() connect(m_basicTab, TQT_SIGNAL(changed(MenuEntryInfo *)), m_tree, TQT_SLOT(currentChanged(MenuEntryInfo *))); - connect(m_basicTab, TQT_SIGNAL(findServiceShortcut(const KShortcut&, KService::Ptr &)), - m_tree, TQT_SLOT(findServiceShortcut(const KShortcut&, KService::Ptr &))); + connect(m_basicTab, TQT_SIGNAL(findServiceShortcut(const TDEShortcut&, KService::Ptr &)), + m_tree, TQT_SLOT(findServiceShortcut(const TDEShortcut&, KService::Ptr &))); // restore splitter sizes TDEConfig* config = TDEGlobal::config(); @@ -126,14 +126,14 @@ void KMenuEdit::slotChangeView() delete m_actionDelete; - m_actionDelete = new KAction(i18n("&Delete"), "editdelete", Key_Delete, actionCollection(), "delete"); + m_actionDelete = new TDEAction(i18n("&Delete"), "editdelete", Key_Delete, actionCollection(), "delete"); if (!m_splitter) setupView(); if (m_controlCenter) - setupGUI(KMainWindow::ToolBar|Keys|Save|Create, "kcontroleditui.rc"); + setupGUI(TDEMainWindow::ToolBar|Keys|Save|Create, "kcontroleditui.rc"); else - setupGUI(KMainWindow::ToolBar|Keys|Save|Create, "kmenueditui.rc"); + setupGUI(TDEMainWindow::ToolBar|Keys|Save|Create, "kmenueditui.rc"); m_tree->setViewMode(m_showHidden); } diff --git a/kmenuedit/kmenuedit.h b/kmenuedit/kmenuedit.h index bc9bd13c1..fdd79bcef 100644 --- a/kmenuedit/kmenuedit.h +++ b/kmenuedit/kmenuedit.h @@ -25,10 +25,10 @@ class BasicTab; class TQSplitter; -class KAction; -class KToggleAction; +class TDEAction; +class TDEToggleAction; -class KMenuEdit : public KMainWindow +class KMenuEdit : public TDEMainWindow { Q_OBJECT @@ -54,8 +54,8 @@ protected: BasicTab *m_basicTab; TQSplitter *m_splitter; - KAction *m_actionDelete; - KToggleAction *m_actionShowHidden; + TDEAction *m_actionDelete; + TDEToggleAction *m_actionShowHidden; bool m_showHidden; bool m_controlCenter; }; diff --git a/kmenuedit/menuinfo.cpp b/kmenuedit/menuinfo.cpp index e04f92c18..03c3a2e57 100644 --- a/kmenuedit/menuinfo.cpp +++ b/kmenuedit/menuinfo.cpp @@ -254,7 +254,7 @@ bool MenuFolderInfo::hasDirt() return false; } -KService::Ptr MenuFolderInfo::findServiceShortcut(const KShortcut&cut) +KService::Ptr MenuFolderInfo::findServiceShortcut(const TDEShortcut&cut) { KService::Ptr result; // Check sub-menus @@ -382,7 +382,7 @@ void MenuEntryInfo::setIcon(const TQString &_icon) desktopFile()->writeEntry("Icon", icon); } -KShortcut MenuEntryInfo::shortcut() +TDEShortcut MenuEntryInfo::shortcut() { if (!shortcutLoaded) { @@ -395,7 +395,7 @@ KShortcut MenuEntryInfo::shortcut() return shortCut; } -static bool isEmpty(const KShortcut &shortCut) +static bool isEmpty(const TDEShortcut &shortCut) { for(int i = shortCut.count(); i--;) { @@ -405,7 +405,7 @@ static bool isEmpty(const KShortcut &shortCut) return true; } -static void freeShortcut(const KShortcut &shortCut) +static void freeShortcut(const TDEShortcut &shortCut) { if (!isEmpty(shortCut)) { @@ -420,7 +420,7 @@ static void freeShortcut(const KShortcut &shortCut) } } -static void allocateShortcut(const KShortcut &shortCut) +static void allocateShortcut(const TDEShortcut &shortCut) { if (!isEmpty(shortCut)) { @@ -435,7 +435,7 @@ static void allocateShortcut(const KShortcut &shortCut) } } -void MenuEntryInfo::setShortcut(const KShortcut &_shortcut) +void MenuEntryInfo::setShortcut(const TDEShortcut &_shortcut) { if (shortCut == _shortcut) return; @@ -445,7 +445,7 @@ void MenuEntryInfo::setShortcut(const KShortcut &_shortcut) shortCut = _shortcut; if (isEmpty(shortCut)) - shortCut = KShortcut(); // Normalize + shortCut = TDEShortcut(); // Normalize shortcutLoaded = true; shortcutDirty = true; @@ -455,8 +455,8 @@ void MenuEntryInfo::setInUse(bool inUse) { if (inUse) { - KShortcut temp = shortcut(); - shortCut = KShortcut(); + TDEShortcut temp = shortcut(); + shortCut = TDEShortcut(); if (isShortcutAvailable(temp)) shortCut = temp; else @@ -478,7 +478,7 @@ void MenuEntryInfo::setInUse(bool inUse) } } -bool MenuEntryInfo::isShortcutAvailable(const KShortcut &_shortcut) +bool MenuEntryInfo::isShortcutAvailable(const TDEShortcut &_shortcut) { if (shortCut == _shortcut) return true; diff --git a/kmenuedit/menuinfo.h b/kmenuedit/menuinfo.h index 1d9cbeb8e..616df68ad 100644 --- a/kmenuedit/menuinfo.h +++ b/kmenuedit/menuinfo.h @@ -119,7 +119,7 @@ public: void save(MenuFile *); // Search service by shortcut - KService::Ptr findServiceShortcut(const KShortcut&); + KService::Ptr findServiceShortcut(const TDEShortcut&); // Set whether the entry is in active use (as opposed to in the clipboard/deleted) void setInUse(bool inUse); @@ -160,9 +160,9 @@ public: TQString file() const { return service->desktopEntryPath(); } - KShortcut shortcut(); - void setShortcut(const KShortcut &_shortcut); - bool isShortcutAvailable(const KShortcut &_shortcut); + TDEShortcut shortcut(); + void setShortcut(const TDEShortcut &_shortcut); + bool isShortcutAvailable(const TDEShortcut &_shortcut); void setDirty(); @@ -182,7 +182,7 @@ public: TQString icon; KService::Ptr service; KDesktopFile *df; - KShortcut shortCut; + TDEShortcut shortCut; bool shortcutLoaded; bool shortcutDirty; bool dirty; diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp index 1947af3e3..c58d7bf0f 100644 --- a/kmenuedit/treeview.cpp +++ b/kmenuedit/treeview.cpp @@ -146,8 +146,8 @@ static TQPixmap appIcon(const TQString &iconName) } -TreeView::TreeView( bool controlCenter, KActionCollection *ac, TQWidget *parent, const char *name ) - : KListView(parent, name), m_ac(ac), m_rmb(0), m_clipboard(0), +TreeView::TreeView( bool controlCenter, TDEActionCollection *ac, TQWidget *parent, const char *name ) + : TDEListView(parent, name), m_ac(ac), m_rmb(0), m_clipboard(0), m_clipboardFolderInfo(0), m_clipboardEntryInfo(0), m_controlCenter(controlCenter), m_layoutDirty(false) { @@ -209,7 +209,7 @@ void TreeView::setViewMode(bool showHidden) // setup rmb menu m_rmb = new TQPopupMenu(this); - KAction *action; + TDEAction *action; action = m_ac->action("edit_cut"); if(action) { @@ -1574,7 +1574,7 @@ bool TreeView::dirty() return m_layoutDirty || m_rootFolder->hasDirt() || m_menuFile->dirty() || isLayoutDirty(); } -void TreeView::findServiceShortcut(const KShortcut&cut, KService::Ptr &service) +void TreeView::findServiceShortcut(const TDEShortcut&cut, KService::Ptr &service) { service = m_rootFolder->findServiceShortcut(cut); } diff --git a/kmenuedit/treeview.h b/kmenuedit/treeview.h index 5811a2159..562a33301 100644 --- a/kmenuedit/treeview.h +++ b/kmenuedit/treeview.h @@ -28,13 +28,13 @@ #include <kservicegroup.h> class TQPopupMenu; -class KActionCollection; +class TDEActionCollection; class KDesktopFile; class MenuFile; class MenuFolderInfo; class MenuEntryInfo; class MenuSeparatorInfo; -class KShortcut; +class TDEShortcut; class TreeItem : public TQListViewItem { @@ -85,12 +85,12 @@ private: MenuEntryInfo *m_entryInfo; }; -class TreeView : public KListView +class TreeView : public TDEListView { friend class TreeItem; Q_OBJECT public: - TreeView(bool controlCenter, KActionCollection *ac, TQWidget *parent=0, const char *name=0); + TreeView(bool controlCenter, TDEActionCollection *ac, TQWidget *parent=0, const char *name=0); ~TreeView(); void readMenuFolderInfo(MenuFolderInfo *folderInfo=0, KServiceGroup::Ptr folder=0, const TQString &prefix=TQString::null); @@ -105,7 +105,7 @@ public: public slots: void currentChanged(MenuFolderInfo *folderInfo); void currentChanged(MenuEntryInfo *entryInfo); - void findServiceShortcut(const KShortcut&, KService::Ptr &); + void findServiceShortcut(const TDEShortcut&, KService::Ptr &); signals: void entrySelected(MenuFolderInfo *folderInfo); @@ -154,7 +154,7 @@ protected: virtual void startDrag(); private: - KActionCollection *m_ac; + TDEActionCollection *m_ac; TQPopupMenu *m_rmb; int m_clipboard; MenuFolderInfo *m_clipboardFolderInfo; diff --git a/konqueror/ChangeLog b/konqueror/ChangeLog index 19c0a00eb..f83f0e17c 100644 --- a/konqueror/ChangeLog +++ b/konqueror/ChangeLog @@ -20,7 +20,7 @@ 2001-04-28 Simon Hausmann <[email protected]> * konq_actions.h (class KonqGoURLAction): new class, derived - from KAction, used for the 'go url' action. when plugging the + from TDEAction, used for the 'go url' action. when plugging the action into a toolbar make sure to align the button right. Otherwise the toolbar layout completely fucks up and QToolBar starts flickering like mad, when the window width is getting @@ -74,7 +74,7 @@ 2001-01-28 Stephan Kulow <[email protected]> - * konq_mainwindow.cc (initActions): Plug the actions into a KAccel to + * konq_mainwindow.cc (initActions): Plug the actions into a TDEAccel to fix short cuts in full screen mode 2001-01-16 Simon Hausmann <[email protected]> @@ -158,8 +158,8 @@ 2000-12-27 Simon Hausmann <[email protected]> * konq_mainwindow.cc (enableAllActions): for iterating over all actions - don't use the action( int index ) method of KActionCollection but instead - retrieve a QValueList<KAction *> and iterate over that, as the =+(int) + don't use the action( int index ) method of TDEActionCollection but instead + retrieve a QValueList<TDEAction *> and iterate over that, as the =+(int) operator of QDictIterator isn't really fast ----- KDE 2.1 BETA 1 RELEASE ---- @@ -190,7 +190,7 @@ 2000-12-09 Simon Hausmann <[email protected]> - * konq_actions.{cc,h}: Added KonqViewModeAction, a KRadioAction + * konq_actions.{cc,h}: Added KonqViewModeAction, a TDERadioAction with an additional delayed popupmenu * konq_mainwindow.{cc,h}: Changed the toolbar viewmode buttons to @@ -244,7 +244,7 @@ * konq_actions.cc: Accel (Alt+O in English) to give focus to location bar, shown by the label. - * konq_profiledlg.cc: Ported to KListView to fix problems with selection. + * konq_profiledlg.cc: Ported to TDEListView to fix problems with selection. 2000-11-26 David Faure <[email protected]> @@ -258,7 +258,7 @@ * konq_mainwindow.cc : Icons for the configure submenu. - * konq_actions.cc : KonqHistoryAction turned into KToolBarPopupAction. + * konq_actions.cc : KonqHistoryAction turned into TDEToolBarPopupAction. Drag the "Location" label to start a drag with the current URL. 2000-11-25 Simon Hausmann <[email protected]> @@ -319,7 +319,7 @@ Sat Nov 25 17:38:27 2000 Carsten Pfeiffer <[email protected]> * konq_drag.cc: Export URLs as text/plain as well. - * konq_mainwindow.cc: Implemented auto-saving of toolbars (KMainWindow), + * konq_mainwindow.cc: Implemented auto-saving of toolbars (TDEMainWindow), removed "Save Settings". Fixed "clicking on directory in dirtree uses wrong view mode for dirs". * konq_iconview.cc: Added +/- buttons for changing the icon size. @@ -398,7 +398,7 @@ Sat Nov 25 17:38:27 2000 Carsten Pfeiffer <[email protected]> * listview/konq_textviewwidget.cc: Only the Name column is now selected, and used as a drop area - like in other listviews. - This requires the fix in KListView to work properly. + This requires the fix in TDEListView to work properly. 2000-10-21 David Faure <[email protected]> diff --git a/konqueror/KonqMainWindowIface.cc b/konqueror/KonqMainWindowIface.cc index 7fce12205..6010aa502 100644 --- a/konqueror/KonqMainWindowIface.cc +++ b/konqueror/KonqMainWindowIface.cc @@ -35,7 +35,7 @@ KonqMainWindowIface::KonqMainWindowIface( KonqMainWindow * mainWindow ) : // ARGL I hate this "virtual public DCOPObject" stuff! DCOPObject( mainWindow->name() ), - KMainWindowInterface( mainWindow ), m_pMainWindow( mainWindow ) + TDEMainWindowInterface( mainWindow ), m_pMainWindow( mainWindow ) { m_dcopActionProxy = new KDCOPActionProxy( mainWindow->actionCollection(), this ); } @@ -137,9 +137,9 @@ DCOPRef KonqMainWindowIface::action( const TQCString &name ) QCStringList KonqMainWindowIface::actions() { QCStringList res; - TQValueList<KAction *> lst = m_dcopActionProxy->actions(); - TQValueList<KAction *>::ConstIterator it = lst.begin(); - TQValueList<KAction *>::ConstIterator end = lst.end(); + TQValueList<TDEAction *> lst = m_dcopActionProxy->actions(); + TQValueList<TDEAction *>::ConstIterator it = lst.begin(); + TQValueList<TDEAction *>::ConstIterator end = lst.end(); for (; it != end; ++it ) res.append( (*it)->name() ); diff --git a/konqueror/KonqMainWindowIface.h b/konqueror/KonqMainWindowIface.h index fc853e536..c6ce6443d 100644 --- a/konqueror/KonqMainWindowIface.h +++ b/konqueror/KonqMainWindowIface.h @@ -32,7 +32,7 @@ class KDCOPActionProxy; /** * DCOP interface for a konqueror main window */ -class KonqMainWindowIface : public KMainWindowInterface +class KonqMainWindowIface : public TDEMainWindowInterface { K_DCOP public: diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc index 7b608fe7c..b9c596db9 100644 --- a/konqueror/about/konq_aboutpage.cc +++ b/konqueror/about/konq_aboutpage.cc @@ -438,7 +438,7 @@ KonqAboutPage::KonqAboutPage( //KonqMainWindow * else setCharset("iso-8859-1", true); // about:blah isn't a tdeioslave -> disable View source - KAction * act = actionCollection()->action("viewDocumentSource"); + TDEAction * act = actionCollection()->action("viewDocumentSource"); if ( act ) act->setEnabled( false ); } diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc index 7ce0752e2..ff125a916 100644 --- a/konqueror/iconview/konq_iconview.cc +++ b/konqueror/iconview/konq_iconview.cc @@ -209,49 +209,49 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons // Don't repaint on configuration changes during construction m_bInit = true; - m_paDotFiles = new KToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ), + m_paDotFiles = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ), actionCollection(), "show_dot" ); // m_paDotFiles->setCheckedState(i18n("Hide &Hidden Files")); m_paDotFiles->setToolTip( i18n( "Toggle displaying of hidden dot files" ) ); - m_paDirectoryOverlays = new KToggleAction( i18n( "&Folder Icons Reflect Contents" ), 0, this, TQT_SLOT( slotShowDirectoryOverlays() ), + m_paDirectoryOverlays = new TDEToggleAction( i18n( "&Folder Icons Reflect Contents" ), 0, this, TQT_SLOT( slotShowDirectoryOverlays() ), actionCollection(), "show_directory_overlays" ); - m_pamPreview = new KActionMenu( i18n( "&Preview" ), actionCollection(), "iconview_preview" ); + m_pamPreview = new TDEActionMenu( i18n( "&Preview" ), actionCollection(), "iconview_preview" ); - m_paEnablePreviews = new KToggleAction( i18n("Enable Previews"), 0, actionCollection(), "iconview_preview_all" ); + m_paEnablePreviews = new TDEToggleAction( i18n("Enable Previews"), 0, actionCollection(), "iconview_preview_all" ); m_paEnablePreviews->setCheckedState( i18n("Disable Previews") ); connect( m_paEnablePreviews, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPreview( bool ) ) ); m_paEnablePreviews->setIcon("thumbnail"); m_pamPreview->insert( m_paEnablePreviews ); - m_pamPreview->insert( new KActionSeparator(this) ); + m_pamPreview->insert( new TDEActionSeparator(this) ); TDETrader::OfferList plugins = TDETrader::self()->query( "ThumbCreator" ); - TQMap< TQString, KToggleAction* > previewActions; + TQMap< TQString, TDEToggleAction* > previewActions; for ( TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it ) { - if ( KToggleAction*& preview = previewActions[ ( *it )->name() ] ) + if ( TDEToggleAction*& preview = previewActions[ ( *it )->name() ] ) preview->setName( TQCString( preview->name() ) + ',' + ( *it )->desktopEntryName().latin1() ); else { - preview = new KToggleAction( (*it)->name(), 0, actionCollection(), (*it)->desktopEntryName().latin1() ); + preview = new TDEToggleAction( (*it)->name(), 0, actionCollection(), (*it)->desktopEntryName().latin1() ); connect( preview, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPreview( bool ) ) ); m_pamPreview->insert( preview ); m_paPreviewPlugins.append( preview ); } } - KToggleAction *soundPreview = new KToggleAction( i18n("Sound Files"), 0, actionCollection(), "audio/" ); + TDEToggleAction *soundPreview = new TDEToggleAction( i18n("Sound Files"), 0, actionCollection(), "audio/" ); connect( soundPreview, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPreview( bool ) ) ); m_pamPreview->insert( soundPreview ); m_paPreviewPlugins.append( soundPreview ); - // m_pamSort = new KActionMenu( i18n( "Sort..." ), actionCollection(), "sort" ); + // m_pamSort = new TDEActionMenu( i18n( "Sort..." ), actionCollection(), "sort" ); - KToggleAction *aSortByNameCS = new KRadioAction( i18n( "By Name (Case Sensitive)" ), 0, actionCollection(), "sort_nc" ); - KToggleAction *aSortByNameCI = new KRadioAction( i18n( "By Name (Case Insensitive)" ), 0, actionCollection(), "sort_nci" ); - KToggleAction *aSortBySize = new KRadioAction( i18n( "By Size" ), 0, actionCollection(), "sort_size" ); - KToggleAction *aSortByType = new KRadioAction( i18n( "By Type" ), 0, actionCollection(), "sort_type" ); - KToggleAction *aSortByDate = new KRadioAction( i18n( "By Date" ), 0, actionCollection(), "sort_date" ); + TDEToggleAction *aSortByNameCS = new TDERadioAction( i18n( "By Name (Case Sensitive)" ), 0, actionCollection(), "sort_nc" ); + TDEToggleAction *aSortByNameCI = new TDERadioAction( i18n( "By Name (Case Insensitive)" ), 0, actionCollection(), "sort_nci" ); + TDEToggleAction *aSortBySize = new TDERadioAction( i18n( "By Size" ), 0, actionCollection(), "sort_size" ); + TDEToggleAction *aSortByType = new TDERadioAction( i18n( "By Type" ), 0, actionCollection(), "sort_type" ); + TDEToggleAction *aSortByDate = new TDERadioAction( i18n( "By Date" ), 0, actionCollection(), "sort_date" ); aSortByNameCS->setExclusiveGroup( "sorting" ); aSortByNameCI->setExclusiveGroup( "sorting" ); @@ -273,11 +273,11 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons //enable menu item representing the saved sorting criterion TQString sortcrit = KonqIconViewFactory::defaultViewProps()->sortCriterion(); - KRadioAction *sort_action = tqt_dynamic_cast<KRadioAction *>(actionCollection()->action(sortcrit.latin1())); + TDERadioAction *sort_action = tqt_dynamic_cast<TDERadioAction *>(actionCollection()->action(sortcrit.latin1())); if(sort_action!=NULL) sort_action->activate(); - m_paSortDirsFirst = new KToggleAction( i18n( "Folders First" ), 0, actionCollection(), "sort_directoriesfirst" ); - KToggleAction *aSortDescending = new KToggleAction( i18n( "Descending" ), 0, actionCollection(), "sort_descend" ); + m_paSortDirsFirst = new TDEToggleAction( i18n( "Folders First" ), 0, actionCollection(), "sort_directoriesfirst" ); + TDEToggleAction *aSortDescending = new TDEToggleAction( i18n( "Descending" ), 0, actionCollection(), "sort_descend" ); m_paSortDirsFirst->setChecked( KonqIconViewFactory::defaultViewProps()->isDirsFirst() ); @@ -302,14 +302,14 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons m_pamSort->insert( aSortDescending ); */ - m_paSelect = new KAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQT_SLOT( slotSelect() ), + m_paSelect = new TDEAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQT_SLOT( slotSelect() ), actionCollection(), "select" ); - m_paUnselect = new KAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQT_SLOT( slotUnselect() ), + m_paUnselect = new TDEAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQT_SLOT( slotUnselect() ), actionCollection(), "unselect" ); m_paSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), actionCollection(), "selectall" ); - m_paUnselectAll = new KAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQT_SLOT( slotUnselectAll() ), + m_paUnselectAll = new TDEAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQT_SLOT( slotUnselectAll() ), actionCollection(), "unselectall" ); - m_paInvertSelection = new KAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, + m_paInvertSelection = new TDEAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, this, TQT_SLOT( slotInvertSelection() ), actionCollection(), "invertselection" ); @@ -319,8 +319,8 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons m_paUnselectAll->setToolTip( i18n( "Unselects all selected items" ) ); m_paInvertSelection->setToolTip( i18n( "Inverts the current selection of items" ) ); - //m_paBottomText = new KToggleAction( i18n( "Text at &Bottom" ), 0, actionCollection(), "textbottom" ); - //m_paRightText = new KToggleAction( i18n( "Text at &Right" ), 0, actionCollection(), "textright" ); + //m_paBottomText = new TDEToggleAction( i18n( "Text at &Bottom" ), 0, actionCollection(), "textbottom" ); + //m_paRightText = new TDEToggleAction( i18n( "Text at &Right" ), 0, actionCollection(), "textright" ); //m_paBottomText->setExclusiveGroup( "TextPos" ); //m_paRightText->setExclusiveGroup( "TextPos" ); //connect( m_paBottomText, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotTextBottom( bool ) ) ); diff --git a/konqueror/iconview/konq_iconview.h b/konqueror/iconview/konq_iconview.h index 56bef37dc..c05362b9d 100644 --- a/konqueror/iconview/konq_iconview.h +++ b/konqueror/iconview/konq_iconview.h @@ -31,9 +31,9 @@ class KonqPropsView; class KFileItem; class KDirLister; -class KAction; -class KToggleAction; -class KActionMenu; +class TDEAction; +class TDEToggleAction; +class TDEActionMenu; class TQIconViewItem; class IconViewBrowserExtension; @@ -194,25 +194,25 @@ protected: SortCriterion m_eSortCriterion; - KToggleAction *m_paDotFiles; - KToggleAction *m_paDirectoryOverlays; - KToggleAction *m_paEnablePreviews; + TDEToggleAction *m_paDotFiles; + TDEToggleAction *m_paDirectoryOverlays; + TDEToggleAction *m_paEnablePreviews; TQPtrList<KFileIVI> m_paOutstandingOverlays; TQTimer *m_paOutstandingOverlaysTimer; -/* KToggleAction *m_paImagePreview; - KToggleAction *m_paTextPreview; - KToggleAction *m_paHTMLPreview;*/ - KActionMenu *m_pamPreview; - TQPtrList<KToggleAction> m_paPreviewPlugins; - KActionMenu *m_pamSort; - - KAction *m_paSelect; - KAction *m_paUnselect; - KAction *m_paSelectAll; - KAction *m_paUnselectAll; - KAction *m_paInvertSelection; - - KToggleAction *m_paSortDirsFirst; +/* TDEToggleAction *m_paImagePreview; + TDEToggleAction *m_paTextPreview; + TDEToggleAction *m_paHTMLPreview;*/ + TDEActionMenu *m_pamPreview; + TQPtrList<TDEToggleAction> m_paPreviewPlugins; + TDEActionMenu *m_pamSort; + + TDEAction *m_paSelect; + TDEAction *m_paUnselect; + TDEAction *m_paSelectAll; + TDEAction *m_paUnselectAll; + TDEAction *m_paInvertSelection; + + TDEToggleAction *m_paSortDirsFirst; KonqIconViewWidget *m_pIconView; diff --git a/konqueror/keditbookmarks/TODO b/konqueror/keditbookmarks/TODO index 875dea715..98e379560 100644 --- a/konqueror/keditbookmarks/TODO +++ b/konqueror/keditbookmarks/TODO @@ -64,19 +64,19 @@ on startup: ==31246== at 0x4026A4DF: KEBListViewItem::paintCell(QPainter*, QColorGroup const&, int, int, int) (listview.cpp:786) ==31246== by 0x40FD9CA7: QListView::drawContentsOffset(QPainter*, int, int, int, int, int, int) (qlistview.cpp:2905) ==31246== by 0x41013A5D: QScrollView::viewportPaintEvent(QPaintEvent*) (qscrollview.cpp:1702) - ==31246== by 0x407E7051: KListView::viewportPaintEvent(QPaintEvent*) (klistview.cpp:1872) + ==31246== by 0x407E7051: TDEListView::viewportPaintEvent(QPaintEvent*) (klistview.cpp:1872) ==31246== ==31246== Conditional jump or move depends on uninitialised value(s) ==31246== at 0x4026A4E4: KEBListViewItem::paintCell(QPainter*, QColorGroup const&, int, int, int) (listview.cpp:786) ==31246== by 0x40FD9CA7: QListView::drawContentsOffset(QPainter*, int, int, int, int, int, int) (qlistview.cpp:2905) ==31246== by 0x41013A5D: QScrollView::viewportPaintEvent(QPaintEvent*) (qscrollview.cpp:1702) - ==31246== by 0x407E7051: KListView::viewportPaintEvent(QPaintEvent*) (klistview.cpp:1872) + ==31246== by 0x407E7051: TDEListView::viewportPaintEvent(QPaintEvent*) (klistview.cpp:1872) ==31246== ==31246== Conditional jump or move depends on uninitialised value(s) ==31246== at 0x4026A4E8: KEBListViewItem::paintCell(QPainter*, QColorGroup const&, int, int, int) (listview.cpp:786) ==31246== by 0x40FD9CA7: QListView::drawContentsOffset(QPainter*, int, int, int, int, int, int) (qlistview.cpp:2905) ==31246== by 0x41013A5D: QScrollView::viewportPaintEvent(QPaintEvent*) (qscrollview.cpp:1702) - ==31246== by 0x407E7051: KListView::viewportPaintEvent(QPaintEvent*) (klistview.cpp:1872) + ==31246== by 0x407E7051: TDEListView::viewportPaintEvent(QPaintEvent*) (klistview.cpp:1872) ==31246== lots of crap when using file->open diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp index 23e6fe16d..81d47f07e 100644 --- a/konqueror/keditbookmarks/actionsimpl.cpp +++ b/konqueror/keditbookmarks/actionsimpl.cpp @@ -98,116 +98,116 @@ void KEBApp::createActions() { (void) KStdAction::print(TQT_TQOBJECT(actn), TQT_SLOT( slotPrint() ), actionCollection()); // settings menu - (void) new KToggleAction( + (void) new TDEToggleAction( i18n("&Show Netscape Bookmarks in Konqueror"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotShowNS() ), actionCollection(), "settings_showNS"); // actions - (void) new KAction( + (void) new TDEAction( i18n("&Delete"), "editdelete", Key_Delete, TQT_TQOBJECT(actn), TQT_SLOT( slotDelete() ), actionCollection(), "delete"); - (void) new KAction( + (void) new TDEAction( i18n("Rename"), "text", Key_F2, TQT_TQOBJECT(actn), TQT_SLOT( slotRename() ), actionCollection(), "rename"); - (void) new KAction( + (void) new TDEAction( i18n("C&hange URL"), "text", Key_F3, TQT_TQOBJECT(actn), TQT_SLOT( slotChangeURL() ), actionCollection(), "changeurl"); - (void) new KAction( + (void) new TDEAction( i18n("C&hange Comment"), "text", Key_F4, TQT_TQOBJECT(actn), TQT_SLOT( slotChangeComment() ), actionCollection(), "changecomment"); - (void) new KAction( + (void) new TDEAction( i18n("Chan&ge Icon..."), "icons", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotChangeIcon() ), actionCollection(), "changeicon"); - (void) new KAction( + (void) new TDEAction( i18n("Update Favicon"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon"); - (void) new KAction( + (void) new TDEAction( i18n("Recursive Sort"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort"); - (void) new KAction( + (void) new TDEAction( i18n("&New Folder..."), "folder_new", CTRL+Key_N, TQT_TQOBJECT(actn), TQT_SLOT( slotNewFolder() ), actionCollection(), "newfolder"); - (void) new KAction( + (void) new TDEAction( i18n("&New Bookmark"), "www", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark"); - (void) new KAction( + (void) new TDEAction( i18n("&Insert Separator"), CTRL+Key_I, TQT_TQOBJECT(actn), TQT_SLOT( slotInsertSeparator() ), actionCollection(), "insertseparator"); - (void) new KAction( + (void) new TDEAction( i18n("&Sort Alphabetically"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotSort() ), actionCollection(), "sort"); - (void) new KAction( + (void) new TDEAction( i18n("Set as T&oolbar Folder"), "bookmark_toolbar", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar"); - (void) new KAction( + (void) new TDEAction( i18n("Show in T&oolbar"), "bookmark_toolbar", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar"); - (void) new KAction( + (void) new TDEAction( i18n("Hide in T&oolbar"), "bookmark_toolbar", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar"); - (void) new KAction( + (void) new TDEAction( i18n("&Expand All Folders"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotExpandAll() ), actionCollection(), "expandall"); - (void) new KAction( + (void) new TDEAction( i18n("Collapse &All Folders"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" ); - (void) new KAction( + (void) new TDEAction( i18n("&Open in Konqueror"), "fileopen", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" ); - (void) new KAction( + (void) new TDEAction( i18n("Check &Status"), "bookmark", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotTestSelection() ), actionCollection(), "testlink" ); - (void) new KAction( + (void) new TDEAction( i18n("Check Status: &All"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotTestAll() ), actionCollection(), "testall" ); - (void) new KAction( + (void) new TDEAction( i18n("Update All &Favicons"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotUpdateAllFavIcons() ), actionCollection(), "updateallfavicons" ); - (void) new KAction( + (void) new TDEAction( i18n("Cancel &Checks"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" ); - (void) new KAction( + (void) new TDEAction( i18n("Cancel &Favicon Updates"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotCancelFavIconUpdates() ), actionCollection(), "cancelfaviconupdates" ); - (void) new KAction( + (void) new TDEAction( i18n("Import &Netscape Bookmarks..."), "netscape", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importNS"); - (void) new KAction( + (void) new TDEAction( i18n("Import &Opera Bookmarks..."), "opera", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importOpera"); - (void) new KAction( + (void) new TDEAction( i18n("Import All &Crash Sessions as Bookmarks..."), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importCrashes"); - (void) new KAction( + (void) new TDEAction( i18n("Import &Galeon Bookmarks..."), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importGaleon"); - (void) new KAction( + (void) new TDEAction( i18n("Import &KDE2/KDE3 Bookmarks..."), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importKDE2"); - (void) new KAction( + (void) new TDEAction( i18n("Import &IE Bookmarks..."), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importIE"); - (void) new KAction( + (void) new TDEAction( i18n("Import &Mozilla Bookmarks..."), "mozilla", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importMoz"); - (void) new KAction( + (void) new TDEAction( i18n("Export to &Netscape Bookmarks"), "netscape", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotExportNS() ), actionCollection(), "exportNS"); - (void) new KAction( + (void) new TDEAction( i18n("Export to &Opera Bookmarks..."), "opera", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotExportOpera() ), actionCollection(), "exportOpera"); - (void) new KAction( + (void) new TDEAction( i18n("Export to &HTML Bookmarks..."), "html", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotExportHTML() ), actionCollection(), "exportHTML"); - (void) new KAction( + (void) new TDEAction( i18n("Export to &IE Bookmarks..."), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotExportIE() ), actionCollection(), "exportIE"); - (void) new KAction( + (void) new TDEAction( i18n("Export to &Mozilla Bookmarks..."), "mozilla", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotExportMoz() ), actionCollection(), "exportMoz"); } @@ -272,7 +272,7 @@ void CurrentMgr::doExport(ExportType type, const TQString & _path) { } void KEBApp::setActionsEnabled(SelcAbilities sa) { - KActionCollection * coll = actionCollection(); + TDEActionCollection * coll = actionCollection(); TQStringList toEnable; diff --git a/konqueror/keditbookmarks/commands.h b/konqueror/keditbookmarks/commands.h index 3df5d3acf..84268a698 100644 --- a/konqueror/keditbookmarks/commands.h +++ b/konqueror/keditbookmarks/commands.h @@ -204,7 +204,7 @@ class MoveCommand : public KCommand, public IKEBCommand { public: // "Create it with itemsAlreadyMoved=true since - // "KListView moves the item before telling us about it." + // "TDEListView moves the item before telling us about it." MoveCommand(const TQString &from, const TQString &to, const TQString &name = TQString::null) : KCommand(), m_from(from), m_to(to), m_mytext(name) { ; } diff --git a/konqueror/keditbookmarks/kebsearchline.cpp b/konqueror/keditbookmarks/kebsearchline.cpp index 973f737b5..2e2a2f2c9 100644 --- a/konqueror/keditbookmarks/kebsearchline.cpp +++ b/konqueror/keditbookmarks/kebsearchline.cpp @@ -19,21 +19,21 @@ #include "kebsearchline.h" #include "kebsearchline.moc" -KEBSearchLine::KEBSearchLine(TQWidget *parent, KListView *listView, const char *name) - : KListViewSearchLine(parent, listView, name) +KEBSearchLine::KEBSearchLine(TQWidget *parent, TDEListView *listView, const char *name) + : TDEListViewSearchLine(parent, listView, name) { mmode = AND; } KEBSearchLine::KEBSearchLine(TQWidget *parent, const char *name) - :KListViewSearchLine(parent, name) + :TDEListViewSearchLine(parent, name) { mmode = AND; } void KEBSearchLine::updateSearch(const TQString &s) { - KListViewSearchLine::updateSearch(s); + TDEListViewSearchLine::updateSearch(s); emit searchUpdated(); } @@ -44,7 +44,7 @@ KEBSearchLine::~KEBSearchLine() bool KEBSearchLine::itemMatches(const TQListViewItem *item, const TQString &s) const { if(mmode == EXACTLY) - return KListViewSearchLine::itemMatches(item, s); + return TDEListViewSearchLine::itemMatches(item, s); if(lastpattern != s) { @@ -60,12 +60,12 @@ bool KEBSearchLine::itemMatches(const TQListViewItem *item, const TQString &s) c if(it == end) //Nothing to match return true; for( ; it != end; ++it) - if(KListViewSearchLine::itemMatches(item, *it)) + if(TDEListViewSearchLine::itemMatches(item, *it)) return true; } else if(mmode == AND) for( ; it != end; ++it) - if(! KListViewSearchLine::itemMatches(item, *it)) + if(! TDEListViewSearchLine::itemMatches(item, *it)) return false; return (mmode == AND); diff --git a/konqueror/keditbookmarks/kebsearchline.h b/konqueror/keditbookmarks/kebsearchline.h index cfaee61c5..b2cdfce60 100644 --- a/konqueror/keditbookmarks/kebsearchline.h +++ b/konqueror/keditbookmarks/kebsearchline.h @@ -22,11 +22,11 @@ #include <klistviewsearchline.h> #include <tqobject.h> -class KEBSearchLine : public KListViewSearchLine +class KEBSearchLine : public TDEListViewSearchLine { Q_OBJECT public: - KEBSearchLine(TQWidget *parent = 0, KListView *listView = 0, const char *name = 0); + KEBSearchLine(TQWidget *parent = 0, TDEListView *listView = 0, const char *name = 0); KEBSearchLine(TQWidget *parent, const char *name); diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp index 3a2b14d5e..55f28b90a 100644 --- a/konqueror/keditbookmarks/listview.cpp +++ b/konqueror/keditbookmarks/listview.cpp @@ -546,7 +546,7 @@ void ListView::slotBkInfoUpdateListViewItem() { i->setText(KEBListView::CommentColumn, commentStr); } -void ListView::handleContextMenu(KEBListView *, KListView *, TQListViewItem *qitem, const TQPoint &p) { +void ListView::handleContextMenu(KEBListView *, TDEListView *, TQListViewItem *qitem, const TQPoint &p) { KEBListViewItem *item = static_cast<KEBListViewItem *>(qitem); const char *type = ( !item || (item == m_listView->rootItem()) @@ -716,7 +716,7 @@ void KEBListView::init() { setTabOrderedRenaming(false); setSorting(-1, false); setDragEnabled(true); - setSelectionModeExt((!m_folderList) ? KListView::Extended: KListView::Single); + setSelectionModeExt((!m_folderList) ? TDEListView::Extended: TDEListView::Single); setAllColumnsShowFocus(true); connect(header(), TQT_SIGNAL(sizeChange(int, int, int)), this, TQT_SLOT(slotColumnSizeChanged(int, int, int))); @@ -725,8 +725,8 @@ void KEBListView::init() { void KEBListView::makeConnections() { connect(this, TQT_SIGNAL( moved() ), TQT_SLOT( slotMoved() )); - connect(this, TQT_SIGNAL( contextMenu(KListView *, TQListViewItem*, const TQPoint &) ), - TQT_SLOT( slotContextMenu(KListView *, TQListViewItem *, const TQPoint &) )); + connect(this, TQT_SIGNAL( contextMenu(TDEListView *, TQListViewItem*, const TQPoint &) ), + TQT_SLOT( slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &) )); connect(this, TQT_SIGNAL( itemRenamed(TQListViewItem *, const TQString &, int) ), TQT_SLOT( slotItemRenamed(TQListViewItem *, const TQString &, int) )); connect(this, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ), @@ -744,7 +744,7 @@ void KEBListView::readonlyFlagInit(bool readonly) { void KEBListView::slotMoved() { ListView::self()->handleMoved(this); } -void KEBListView::slotContextMenu(KListView *a, TQListViewItem *b, const TQPoint &c) +void KEBListView::slotContextMenu(TDEListView *a, TQListViewItem *b, const TQPoint &c) { ListView::self()->handleContextMenu(this, a,b,c); } void KEBListView::slotItemRenamed(TQListViewItem *a, const TQString &b, int c) { ListView::self()->handleItemRenamed(this, a,b,c); } @@ -768,7 +768,7 @@ void KEBListView::rename(TQListViewItem *qitem, int column) { ListView::startRename(column, item); KeyPressEater *keyPressEater = new KeyPressEater(this); renameLineEdit()->installEventFilter(keyPressEater); - KListView::rename(item, column); + TDEListView::rename(item, column); } KEBListViewItem* KEBListView::rootItem() const { diff --git a/konqueror/keditbookmarks/listview.h b/konqueror/keditbookmarks/listview.h index 7ffe76c37..1ada9506c 100644 --- a/konqueror/keditbookmarks/listview.h +++ b/konqueror/keditbookmarks/listview.h @@ -34,7 +34,7 @@ #include "toplevel.h" class TQSplitter; -class KListViewSearchLine; +class TDEListViewSearchLine; class KEBListViewItem : public TQListViewItem { @@ -80,7 +80,7 @@ private: void boldStyle(TQPainter *); }; -class KEBListView : public KListView +class KEBListView : public TDEListView { Q_OBJECT public: @@ -92,7 +92,7 @@ public: AddressColumn = 4 }; KEBListView(TQWidget *parent, bool folderList) - : KListView(parent), m_folderList(folderList) {} + : TDEListView(parent), m_folderList(folderList) {} virtual ~KEBListView() {} void init(); @@ -111,7 +111,7 @@ public: public slots: virtual void rename(TQListViewItem *item, int c); void slotMoved(); - void slotContextMenu(KListView *, TQListViewItem *, const TQPoint &); + void slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &); void slotItemRenamed(TQListViewItem *, const TQString &, int); void slotDoubleClicked(TQListViewItem *, const TQPoint &, int); void slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*); @@ -135,7 +135,7 @@ public: void initListViews(); void updateListViewSetup(bool readOnly); void connectSignals(); - void setSearchLine(KListViewSearchLine * searchline) { m_searchline = searchline; }; + void setSearchLine(TDEListViewSearchLine * searchline) { m_searchline = searchline; }; // selected item stuff void selected(KEBListViewItem * item, bool s); @@ -179,7 +179,7 @@ public: void handleMoved(KEBListView *); void handleDropped(KEBListView *, TQDropEvent *, TQListViewItem *, TQListViewItem *); - void handleContextMenu(KEBListView *, KListView *, TQListViewItem *, const TQPoint &); + void handleContextMenu(KEBListView *, TDEListView *, TQListViewItem *, const TQPoint &); void handleDoubleClicked(KEBListView *, TQListViewItem *, const TQPoint &, int); void handleItemRenamed(KEBListView *, TQListViewItem *, const TQString &, int); @@ -200,7 +200,7 @@ private: ListView(); KEBListView *m_listView; - KListViewSearchLine * m_searchline; + TDEListViewSearchLine * m_searchline; // Actually this is a std:set, the bool is ignored TQMap<KEBListViewItem *, bool> mSelectedItems; diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp index eea4d8c58..24ab4fbbb 100644 --- a/konqueror/keditbookmarks/toplevel.cpp +++ b/konqueror/keditbookmarks/toplevel.cpp @@ -58,7 +58,7 @@ CmdHistory* CmdHistory::s_self = 0; -CmdHistory::CmdHistory(KActionCollection *collection) +CmdHistory::CmdHistory(TDEActionCollection *collection) : m_commandHistory(collection) { connect(&m_commandHistory, TQT_SIGNAL( commandExecuted(KCommand *) ), TQT_SLOT( slotCommandExecuted(KCommand *) )); @@ -196,7 +196,7 @@ KEBApp *KEBApp::s_topLevel = 0; KEBApp::KEBApp( const TQString &bookmarksFile, bool readonly, const TQString &address, bool browser, const TQString &caption -) : KMainWindow(), m_dcopIface(0), m_bookmarksFilename(bookmarksFile), +) : TDEMainWindow(), m_dcopIface(0), m_bookmarksFilename(bookmarksFile), m_caption(caption), m_readOnly(readonly), m_browser(browser) { m_cmdHistory = new CmdHistory(actionCollection()); @@ -207,9 +207,9 @@ KEBApp::KEBApp( TQSplitter *vsplitter = new TQSplitter(this); - KToolBar *quicksearch = new KToolBar(vsplitter, "search toolbar"); + TDEToolBar *quicksearch = new TDEToolBar(vsplitter, "search toolbar"); - KAction *resetQuickSearch = new KAction( i18n( "Reset Quick Search" ), + TDEAction *resetQuickSearch = new TDEAction( i18n( "Reset Quick Search" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, actionCollection(), "reset_quicksearch" ); resetQuickSearch->setWhatsThis( i18n( "<b>Reset Quick Search</b><br>" @@ -218,7 +218,7 @@ KEBApp::KEBApp( TQLabel *lbl = new TQLabel(i18n("Se&arch:"), quicksearch, "kde toolbar widget"); - KListViewSearchLine *searchLineEdit = new KEBSearchLine(quicksearch, 0, "KListViewSearchLine"); + TDEListViewSearchLine *searchLineEdit = new KEBSearchLine(quicksearch, 0, "TDEListViewSearchLine"); quicksearch->setStretchableWidget(searchLineEdit); lbl->setBuddy(searchLineEdit); connect(resetQuickSearch, TQT_SIGNAL(activated()), searchLineEdit, TQT_SLOT(clear())); @@ -226,7 +226,7 @@ KEBApp::KEBApp( ListView::createListViews(vsplitter); ListView::self()->initListViews(); - searchLineEdit->setListView(static_cast<KListView*>(ListView::self()->widget())); + searchLineEdit->setListView(static_cast<TDEListView*>(ListView::self()->widget())); ListView::self()->setSearchLine(searchLineEdit); m_bkinfo = new BookmarkInfoWidget(vsplitter); @@ -290,8 +290,8 @@ KEBApp::~KEBApp() { delete ListView::self(); } -KToggleAction* KEBApp::getToggleAction(const char *action) const { - return static_cast<KToggleAction*>(actionCollection()->action(action)); +TDEToggleAction* KEBApp::getToggleAction(const char *action) const { + return static_cast<TDEToggleAction*>(actionCollection()->action(action)); } void KEBApp::resetActions() { diff --git a/konqueror/keditbookmarks/toplevel.h b/konqueror/keditbookmarks/toplevel.h index 7b1ec5f81..31f10a01a 100644 --- a/konqueror/keditbookmarks/toplevel.h +++ b/konqueror/keditbookmarks/toplevel.h @@ -27,7 +27,7 @@ #include <kbookmark.h> class KBookmarkManager; -class KToggleAction; +class TDEToggleAction; class KBookmarkEditorIface; class ImportCommand; class BookmarkInfoWidget; @@ -48,7 +48,7 @@ struct SelcAbilities { class CmdHistory : public TQObject { Q_OBJECT public: - CmdHistory(KActionCollection *collection); + CmdHistory(TDEActionCollection *collection); virtual ~CmdHistory() { ; } void notifyDocSaved(); @@ -108,7 +108,7 @@ private: uint ignorenext; }; -class KEBApp : public KMainWindow { +class KEBApp : public TDEMainWindow { Q_OBJECT public: static KEBApp* self() { return s_topLevel; } @@ -129,7 +129,7 @@ public: return factory()->container(type, this); } - KToggleAction* getToggleAction(const char *) const; + TDEToggleAction* getToggleAction(const char *) const; TQString caption() const { return m_caption; } bool readonly() const { return m_readOnly; } diff --git a/konqueror/konq_actions.cc b/konqueror/konq_actions.cc index df25a5e6c..ed5a5002b 100644 --- a/konqueror/konq_actions.cc +++ b/konqueror/konq_actions.cc @@ -81,7 +81,7 @@ void KonqBidiHistoryAction::fillHistoryPopup( const TQPtrList<HistoryEntry> &his /////////////////////////////// KonqBidiHistoryAction::KonqBidiHistoryAction ( const TQString & text, TQObject* parent, const char* name ) - : KAction( text, 0, parent, name ) + : TDEAction( text, 0, parent, name ) { setShortcutConfigurable(false); m_firstIndex = 0; @@ -90,7 +90,7 @@ KonqBidiHistoryAction::KonqBidiHistoryAction ( const TQString & text, TQObject* int KonqBidiHistoryAction::plug( TQWidget *widget, int index ) { - if (kapp && !kapp->authorizeKAction(name())) + if (kapp && !kapp->authorizeTDEAction(name())) return -1; // Go menu @@ -108,7 +108,7 @@ int KonqBidiHistoryAction::plug( TQWidget *widget, int index ) m_firstIndex = m_goMenu->count(); return m_goMenu->count(); // hmmm, what should this be ? } - return KAction::plug( widget, index ); + return TDEAction::plug( widget, index ); } void KonqBidiHistoryAction::fillGoMenu( const TQPtrList<HistoryEntry> & history ) @@ -169,30 +169,30 @@ void KonqBidiHistoryAction::slotActivated( int id ) /////////////////////////////// KonqLogoAction::KonqLogoAction( const TQString& text, int accel, TQObject* parent, const char* name ) - : KAction( text, accel, parent, name ) + : TDEAction( text, accel, parent, name ) { } KonqLogoAction::KonqLogoAction( const TQString& text, int accel, TQObject* receiver, const char* slot, TQObject* parent, const char* name ) - : KAction( text, accel, receiver, slot, parent, name ) + : TDEAction( text, accel, receiver, slot, parent, name ) { } KonqLogoAction::KonqLogoAction( const TQString& text, const TQIconSet& pix, int accel, TQObject* parent, const char* name ) - : KAction( text, pix, accel, parent, name ) + : TDEAction( text, pix, accel, parent, name ) { } KonqLogoAction::KonqLogoAction( const TQString& text, const TQIconSet& pix,int accel, TQObject* receiver, const char* slot, TQObject* parent, const char* name ) - : KAction( text, pix, accel, receiver, slot, parent, name ) + : TDEAction( text, pix, accel, receiver, slot, parent, name ) { } KonqLogoAction::KonqLogoAction( const TQStringList& icons, TQObject* receiver, const char* slot, TQObject* parent, const char* name ) - : KAction( 0L, 0, receiver, slot, parent, name ) // text missing ! + : TDEAction( 0L, 0, receiver, slot, parent, name ) // text missing ! { iconList = icons; } @@ -204,9 +204,9 @@ void KonqLogoAction::start() { TQWidget *w = container( i ); - if ( w->inherits( "KToolBar" ) ) + if ( w->inherits( "TDEToolBar" ) ) { - KAnimWidget *anim = ((KToolBar *)w)->animatedWidget( menuId( i ) ); + KAnimWidget *anim = ((TDEToolBar *)w)->animatedWidget( menuId( i ) ); anim->start(); } } @@ -219,9 +219,9 @@ void KonqLogoAction::stop() { TQWidget *w = container( i ); - if ( w->inherits( "KToolBar" ) ) + if ( w->inherits( "TDEToolBar" ) ) { - KAnimWidget *anim = ((KToolBar *)w)->animatedWidget( menuId( i ) ); + KAnimWidget *anim = ((TDEToolBar *)w)->animatedWidget( menuId( i ) ); anim->stop(); } } @@ -231,9 +231,9 @@ void KonqLogoAction::updateIcon(int id) { TQWidget *w = container( id ); - if ( w->inherits( "KToolBar" ) ) + if ( w->inherits( "TDEToolBar" ) ) { - KAnimWidget *anim = ((KToolBar *)w)->animatedWidget( menuId( id ) ); + KAnimWidget *anim = ((TDEToolBar *)w)->animatedWidget( menuId( id ) ); anim->setIcons(icon()); } } @@ -242,22 +242,22 @@ void KonqLogoAction::updateIcon(int id) int KonqLogoAction::plug( TQWidget *widget, int index ) { - if (kapp && !kapp->authorizeKAction(name())) + if (kapp && !kapp->authorizeTDEAction(name())) return -1; /* - if ( widget->inherits( "KMainWindow" ) ) + if ( widget->inherits( "TDEMainWindow" ) ) { - ((KMainWindow*)widget)->setIndicatorWidget(m_logoLabel); + ((TDEMainWindow*)widget)->setIndicatorWidget(m_logoLabel); addContainer( widget, -1 ); return containerCount() - 1; } */ - if ( widget->inherits( "KToolBar" ) ) + if ( widget->inherits( "TDEToolBar" ) ) { - KToolBar *bar = (KToolBar *)widget; + TDEToolBar *bar = (TDEToolBar *)widget; int id_ = getToolButtonID(); @@ -271,7 +271,7 @@ int KonqLogoAction::plug( TQWidget *widget, int index ) return containerCount() - 1; } - int containerId = KAction::plug( widget, index ); + int containerId = TDEAction::plug( widget, index ); return containerId; } @@ -280,7 +280,7 @@ int KonqLogoAction::plug( TQWidget *widget, int index ) KonqViewModeAction::KonqViewModeAction( const TQString &text, const TQString &icon, TQObject *parent, const char *name ) - : KRadioAction( text, icon, 0, parent, name ) + : TDERadioAction( text, icon, 0, parent, name ) { m_menu = new TQPopupMenu; @@ -299,13 +299,13 @@ KonqViewModeAction::~KonqViewModeAction() int KonqViewModeAction::plug( TQWidget *widget, int index ) { - int res = KRadioAction::plug( widget, index ); + int res = TDERadioAction::plug( widget, index ); - if ( widget->inherits( "KToolBar" ) && (res != -1) ) + if ( widget->inherits( "TDEToolBar" ) && (res != -1) ) { - KToolBar *toolBar = static_cast<KToolBar *>( widget ); + TDEToolBar *toolBar = static_cast<TDEToolBar *>( widget ); - KToolBarButton *button = toolBar->getButton( itemId( res ) ); + TDEToolBarButton *button = toolBar->getButton( itemId( res ) ); if ( m_menu->count() > 1 ) button->setDelayedPopup( m_menu, false ); @@ -332,12 +332,12 @@ void KonqViewModeAction::slotPopupAboutToHide() for (; i < containerCount(); ++i ) { TQWidget *widget = container( i ); - if ( !widget->inherits( "KToolBar" ) ) + if ( !widget->inherits( "TDEToolBar" ) ) continue; - KToolBar *tb = static_cast<KToolBar *>( widget ); + TDEToolBar *tb = static_cast<TDEToolBar *>( widget ); - KToolBarButton *button = tb->getButton( itemId( i ) ); + TDEToolBarButton *button = tb->getButton( itemId( i ) ); button->setDown( isChecked() ); } @@ -351,7 +351,7 @@ uint KonqMostOftenURLSAction::s_maxEntries = 0; KonqMostOftenURLSAction::KonqMostOftenURLSAction( const TQString& text, TQObject *parent, const char *name ) - : KActionMenu( text, "goto", parent, name ) + : TDEActionMenu( text, "goto", parent, name ) { setDelayed( false ); diff --git a/konqueror/konq_actions.h b/konqueror/konq_actions.h index 849d45668..8b24c28a6 100644 --- a/konqueror/konq_actions.h +++ b/konqueror/konq_actions.h @@ -31,7 +31,7 @@ class TQPopupMenu; * Plug this action into a menu to get a bidirectional history * (both back and forward, including current location) */ -class KonqBidiHistoryAction : public KAction +class KonqBidiHistoryAction : public TDEAction { Q_OBJECT public: @@ -68,7 +68,7 @@ private: ///// -class KonqLogoAction : public KAction +class KonqLogoAction : public TDEAction { Q_OBJECT public: @@ -93,7 +93,7 @@ private: TQStringList iconList; }; -class KonqViewModeAction : public KRadioAction +class KonqViewModeAction : public TDERadioAction { Q_OBJECT public: @@ -124,7 +124,7 @@ protected: virtual int compareItems( TQPtrCollection::Item, TQPtrCollection::Item ); }; -class KonqMostOftenURLSAction : public KActionMenu +class KonqMostOftenURLSAction : public TDEActionMenu { Q_OBJECT diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc index 6199b59ae..6b814a647 100644 --- a/konqueror/konq_combo.cc +++ b/konqueror/konq_combo.cc @@ -406,8 +406,8 @@ bool KonqCombo::eventFilter( TQObject *o, TQEvent *ev ) return false; } - if ( KKey( e ) == KKey( int( KStdAccel::deleteWordBack() ) ) || - KKey( e ) == KKey( int( KStdAccel::deleteWordForward() ) ) || + if ( KKey( e ) == KKey( int( TDEStdAccel::deleteWordBack() ) ) || + KKey( e ) == KKey( int( TDEStdAccel::deleteWordForward() ) ) || ((e->state() & ControlButton) && (e->key() == Key_Left || e->key() == Key_Right) ) ) { selectWord(e); @@ -429,8 +429,8 @@ void KonqCombo::keyPressEvent( TQKeyEvent *e ) KHistoryCombo::keyPressEvent( e ); // we have to set it as temporary, otherwise we wouldn't get our nice // pixmap. Yes, TQComboBox still sucks. - if ( KKey( e ) == KKey( int( KStdAccel::rotateUp() ) ) || - KKey( e ) == KKey( int( KStdAccel::rotateDown() ) ) ) + if ( KKey( e ) == KKey( int( TDEStdAccel::rotateUp() ) ) || + KKey( e ) == KKey( int( TDEStdAccel::rotateDown() ) ) ) setTemporary( currentText() ); } diff --git a/konqueror/konq_frame.cc b/konqueror/konq_frame.cc index 0764cf0b1..bfc37f6e1 100644 --- a/konqueror/konq_frame.cc +++ b/konqueror/konq_frame.cc @@ -151,13 +151,13 @@ void KonqFrameStatusBar::splitFrameMenu() // We have to ship the remove view action ourselves, // since this may not be the active view (passive view) - KAction actRemoveView(i18n("Close View"), "view_remove", 0, TQT_TQOBJECT(m_pParentKonqFrame), TQT_SLOT(slotRemoveView()), (TQObject*)0, "removethisview"); + TDEAction actRemoveView(i18n("Close View"), "view_remove", 0, TQT_TQOBJECT(m_pParentKonqFrame), TQT_SLOT(slotRemoveView()), (TQObject*)0, "removethisview"); //KonqView * nextView = mw->viewManager()->chooseNextView( m_pParentKonqFrame->childView() ); actRemoveView.setEnabled( mw->mainViewsCount() > 1 || m_pParentKonqFrame->childView()->isToggleView() || m_pParentKonqFrame->childView()->isPassiveMode() ); // For the rest, we borrow them from the main window // ###### might be not right for passive views ! - KActionCollection *actionColl = mw->actionCollection(); + TDEActionCollection *actionColl = mw->actionCollection(); TQPopupMenu menu; diff --git a/konqueror/konq_frame.h b/konqueror/konq_frame.h index 0b5ea4771..e3ae0ba2a 100644 --- a/konqueror/konq_frame.h +++ b/konqueror/konq_frame.h @@ -49,7 +49,7 @@ class KonqFrameTabs; class TDEConfig; class KSeparator; class KProgress; -class KAction; +class TDEAction; class KSqueezedTextLabel; namespace KParts diff --git a/konqueror/konq_guiclients.cc b/konqueror/konq_guiclients.cc index 94aaf8ba1..ffd45fe89 100644 --- a/konqueror/konq_guiclients.cc +++ b/konqueror/konq_guiclients.cc @@ -134,9 +134,9 @@ PopupMenuGUIClient::~PopupMenuGUIClient() { } -KAction *PopupMenuGUIClient::action( const TQDomElement &element ) const +TDEAction *PopupMenuGUIClient::action( const TQDomElement &element ) const { - KAction *res = KXMLGUIClient::action( element ); + TDEAction *res = KXMLGUIClient::action( element ); if ( !res ) res = m_mainWindow->action( element ); @@ -156,7 +156,7 @@ void PopupMenuGUIClient::addEmbeddingService( TQDomElement &menu, int idx, const action.setAttribute( "group", "preview" ); - (void)new KAction( name, service->pixmap( KIcon::Small ), 0, + (void)new TDEAction( name, service->pixmap( KIcon::Small ), 0, TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotOpenEmbedded() ), actionCollection(), actName ); } @@ -195,7 +195,7 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow ) TQString description = i18n( "Show %1" ).arg( (*cIt)->name() ); TQString name = (*cIt)->desktopEntryName(); //kdDebug(1202) << "ToggleViewGUIClient: name=" << name << endl; - KToggleAction *action = new KToggleAction( description, 0, mainWindow->actionCollection(), name.latin1() ); + TDEToggleAction *action = new TDEToggleAction( description, 0, mainWindow->actionCollection(), name.latin1() ); action->setCheckedState( i18n( "Hide %1" ).arg( (*cIt)->name() ) ); // HACK @@ -222,11 +222,11 @@ ToggleViewGUIClient::~ToggleViewGUIClient() { } -TQPtrList<KAction> ToggleViewGUIClient::actions() const +TQPtrList<TDEAction> ToggleViewGUIClient::actions() const { - TQPtrList<KAction> res; + TQPtrList<TDEAction> res; - TQDictIterator<KAction> it( m_actions ); + TQDictIterator<TDEAction> it( m_actions ); for (; it.current(); ++it ) res.append( it.current() ); @@ -322,11 +322,11 @@ void ToggleViewGUIClient::slotViewAdded( KonqView *view ) { TQString name = view->service()->desktopEntryName(); - KAction *action = m_actions[ name ]; + TDEAction *action = m_actions[ name ]; if ( action ) { - static_cast<KToggleAction *>( action )->setChecked( true ); + static_cast<TDEToggleAction *>( action )->setChecked( true ); saveConfig( true, name ); // KonqView::isToggleView() is not set yet.. so just check for the orientation @@ -351,11 +351,11 @@ void ToggleViewGUIClient::slotViewRemoved( KonqView *view ) { TQString name = view->service()->desktopEntryName(); - KAction *action = m_actions[ name ]; + TDEAction *action = m_actions[ name ]; if ( action ) { - static_cast<KToggleAction *>( action )->setChecked( false ); + static_cast<TDEToggleAction *>( action )->setChecked( false ); saveConfig( false, name ); } } diff --git a/konqueror/konq_guiclients.h b/konqueror/konq_guiclients.h index 238153371..73d9b9a60 100644 --- a/konqueror/konq_guiclients.h +++ b/konqueror/konq_guiclients.h @@ -25,8 +25,8 @@ #include <tqdict.h> #include <ktrader.h> -class KAction; -class KActionCollection; +class TDEAction; +class TDEActionCollection; class KonqMainWindow; class KonqView; @@ -59,7 +59,7 @@ public: bool isIntoTrash, bool doTabHandling ); virtual ~PopupMenuGUIClient(); - virtual KAction *action( const TQDomElement &element ) const; + virtual TDEAction *action( const TQDomElement &element ) const; private: void addEmbeddingService( TQDomElement &menu, int idx, const TQString &name, const KService::Ptr &service ); @@ -78,8 +78,8 @@ public: bool empty() const { return m_empty; } - TQPtrList<KAction> actions() const; - KAction *action( const TQString &name ) { return m_actions[ name ]; } + TQPtrList<TDEAction> actions() const; + TDEAction *action( const TQString &name ) { return m_actions[ name ]; } void saveConfig( bool add, const TQString &serviceName ); @@ -89,7 +89,7 @@ private slots: void slotViewRemoved( KonqView *view ); private: KonqMainWindow *m_mainWindow; - TQDict<KAction> m_actions; + TQDict<TDEAction> m_actions; bool m_empty; TQMap<TQString,bool> m_mapOrientation; }; diff --git a/konqueror/konq_main.cc b/konqueror/konq_main.cc index 9be0b538d..9edb00a1b 100644 --- a/konqueror/konq_main.cc +++ b/konqueror/konq_main.cc @@ -75,7 +75,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) int n = 1; while ( KonqMainWindow::canBeRestored( n ) ) { - TQString className = KMainWindow::classNameOfToplevel( n ); + TQString className = TDEMainWindow::classNameOfToplevel( n ); if( className == TQString::fromLatin1( "KonqMainWindow" )) (new KonqMainWindow( KURL(), false ) )->restore( n ); else diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc index 0f3aeeb5e..afe4f8c5a 100644 --- a/konqueror/konq_mainwindow.cc +++ b/konqueror/konq_mainwindow.cc @@ -119,7 +119,7 @@ #include <fixx11h.h> template class TQPtrList<TQPixmap>; -template class TQPtrList<KToggleAction>; +template class TQPtrList<TDEToggleAction>; TQPtrList<KonqMainWindow> *KonqMainWindow::s_lstViews = 0; TDEConfig * KonqMainWindow::s_comboConfig = 0; @@ -245,10 +245,10 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con // Those menus are created by konqueror.rc so their address will never change TQPopupMenu *popup = static_cast<TQPopupMenu*>(factory()->container("edit",this)); if (popup) - KAcceleratorManager::manage(popup); + TDEAcceleratorManager::manage(popup); popup = static_cast<TQPopupMenu*>(factory()->container("tools",this)); if (popup) - KAcceleratorManager::manage(popup); + TDEAcceleratorManager::manage(popup); m_bSaveViewPropertiesLocally = KonqSettings::saveViewPropertiesLocally(); m_bHTMLAllowed = KonqSettings::htmlAllowed(); @@ -349,8 +349,8 @@ TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const T if ( res && (element.tagName() == tagToolBar) && (element.attribute( "name" ) == nameBookmarkBar) ) { - assert( res->inherits( "KToolBar" ) ); - if (!kapp->authorizeKAction("bookmarks")) + assert( res->inherits( "TDEToolBar" ) ); + if (!kapp->authorizeTDEAction("bookmarks")) { delete res; return 0; @@ -360,7 +360,7 @@ TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const T { // The actual menu needs a different action collection, so that the bookmarks // don't appear in kedittoolbar - m_bookmarkBarActionCollection = new KActionCollection( this ); + m_bookmarkBarActionCollection = new TDEActionCollection( this ); m_bookmarkBarActionCollection->setHighlightingEnabled( true ); connectActionCollection( m_bookmarkBarActionCollection ); DelayedInitializer *initializer = new DelayedInitializer( TQEvent::Show, TQT_TQOBJECT(res) ); @@ -373,7 +373,7 @@ TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const T void KonqMainWindow::initBookmarkBar() { - KToolBar * bar = static_cast<KToolBar *>( TQT_TQWIDGET(child( "bookmarkToolBar", "KToolBar" )) ); + TDEToolBar * bar = static_cast<TDEToolBar *>( TQT_TQWIDGET(child( "bookmarkToolBar", "TDEToolBar" )) ); if (!bar) return; @@ -398,7 +398,7 @@ void KonqMainWindow::removeContainer( TQWidget *container, TQWidget *parent, TQD if ( element.tagName() == tagToolBar && element.attribute( "name" ) == nameBookmarkBar ) { - assert( container->inherits( "KToolBar" ) ); + assert( container->inherits( "TDEToolBar" ) ); if (m_paBookmarkBar) m_paBookmarkBar->clear(); } @@ -407,7 +407,7 @@ void KonqMainWindow::removeContainer( TQWidget *container, TQWidget *parent, TQD } // Detect a name filter (e.g. *.txt) in the url. -// Note that KShortURIFilter does the same, but we have no way of getting it from there +// Note that TDEShortURIFilter does the same, but we have no way of getting it from there // // Note: this removes the filter from the URL. static TQString detectNameFilter( KURL & url ) @@ -1269,7 +1269,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs if ( !windowArgs.toolBarsVisible ) { - for ( TQPtrListIterator<KToolBar> it( mainWindow->toolBarIterator() ); it.current(); ++it ) + for ( TQPtrListIterator<TDEToolBar> it( mainWindow->toolBarIterator() ); it.current(); ++it ) { (*it)->hide(); } @@ -1520,7 +1520,7 @@ void KonqMainWindow::slotToolFind() connect( dirPart, TQT_SIGNAL( findClosed(KonqDirPart *) ), this, TQT_SLOT( slotFindClosed(KonqDirPart *) ) ); } - else if ( TQT_TQOBJECT_CONST(sender())->inherits( "KAction" ) ) // don't go there if called by the singleShot below + else if ( TQT_TQOBJECT_CONST(sender())->inherits( "TDEAction" ) ) // don't go there if called by the singleShot below { KURL url; if ( m_currentView && m_currentView->url().isLocalFile() ) @@ -1650,7 +1650,7 @@ void KonqMainWindow::slotViewModeToggle( bool toggle ) // quick viewmode change (iconview) -> find the iconview-konqviewmode // action and set new text,icon,etc. properties, to show the new // current viewmode - TQPtrListIterator<KAction> it( m_toolBarViewModeActions ); + TQPtrListIterator<TDEAction> it( m_toolBarViewModeActions ); for (; it.current(); ++it ) if ( TQString::fromLatin1( it.current()->name() ) == oldService->desktopEntryName() ) { @@ -1846,14 +1846,14 @@ void KonqMainWindow::slotReloadStop() { } void KonqMainWindow::toggleReloadStopButton(bool isReload) { - //m_paStop = new KAction( i18n( "&Stop" ), "stop", Key_Escape, this, TQT_SLOT( slotStop() ), actionCollection(), "stop" ); + //m_paStop = new TDEAction( i18n( "&Stop" ), "stop", Key_Escape, this, TQT_SLOT( slotStop() ), actionCollection(), "stop" ); if (isReload) { m_paReloadStop->setIcon("stop"); m_paReloadStop->setWhatsThis( i18n( "Stop loading the document<p>" "All network transfers will be stopped and Konqueror will display the content " "that has been received so far." ) ); m_paReloadStop->setToolTip( i18n( "Stop loading the document" ) ); - //m_paReloadStop = new KAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQT_SLOT( slotReloadStop() ), actionCollection(), "reload" ); + //m_paReloadStop = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQT_SLOT( slotReloadStop() ), actionCollection(), "reload" ); } else { m_paReloadStop->setIcon("reload"); m_paReloadStop->setWhatsThis( i18n( "Reload the currently displayed document<p>" @@ -1869,7 +1869,7 @@ void KonqMainWindow::slotReloadPopup() slotReload( m_pWorkingTab->activeChildView() ); } -void KonqMainWindow::slotHome(KAction::ActivationReason, TQt::ButtonState state) +void KonqMainWindow::slotHome(TDEAction::ActivationReason, TQt::ButtonState state) { TQString homeURL = m_pViewManager->profileHomeURL(); @@ -1902,7 +1902,7 @@ void KonqMainWindow::slotHome(KAction::ActivationReason, TQt::ButtonState state) void KonqMainWindow::slotHome() { - slotHome(KAction::UnknownActivation, Qt::LeftButton); + slotHome(TDEAction::UnknownActivation, Qt::LeftButton); } void KonqMainWindow::slotGoSystem() @@ -1951,14 +1951,14 @@ void KonqMainWindow::slotGoAutostart() void KonqMainWindow::slotGoHistory() { - KAction *a = m_toggleViewGUIClient->action("konq_sidebartng"); + TDEAction *a = m_toggleViewGUIClient->action("konq_sidebartng"); if (!a) { KMessageBox::sorry(0L, i18n("Your sidebar is not functional or unavailable."), i18n("Show History Sidebar")); return; } // Show the sidebar - if (!static_cast<KToggleAction*>(a)->isChecked()) { + if (!static_cast<TDEToggleAction*>(a)->isChecked()) { a->activate(); TQTimer::singleShot( 0, this, TQT_SLOT(slotGoHistory())); return; @@ -2141,8 +2141,8 @@ void KonqMainWindow::applyKonqMainWindowSettings() for ( ; togIt != togEnd ; ++togIt ) { // Find the action by name - // KAction * act = m_toggleViewGUIClient->actionCollection()->action( (*togIt).latin1() ); - KAction *act = m_toggleViewGUIClient->action( *togIt ); + // TDEAction * act = m_toggleViewGUIClient->actionCollection()->action( (*togIt).latin1() ); + TDEAction *act = m_toggleViewGUIClient->action( *togIt ); if ( act ) act->activate(); else @@ -2207,7 +2207,7 @@ void KonqMainWindow::slotPartActivated( KParts::Part *part ) if ( oldView->part() ) { - KActionCollection *coll = oldView->part()->actionCollection(); + TDEActionCollection *coll = oldView->part()->actionCollection(); if ( coll ) disconnectActionCollection( coll ); } @@ -2242,7 +2242,7 @@ void KonqMainWindow::slotPartActivated( KParts::Part *part ) for ( ; it != itEnd ; ++it ) { - KAction * act = actionCollection()->action( static_cast<const char *>(it.key()) ); + TDEAction * act = actionCollection()->action( static_cast<const char *>(it.key()) ); Q_ASSERT(act); if (act) act->setEnabled( false ); @@ -2257,7 +2257,7 @@ void KonqMainWindow::slotPartActivated( KParts::Part *part ) } createGUI( part ); - KActionCollection *coll = m_currentView->part()->actionCollection(); + TDEActionCollection *coll = m_currentView->part()->actionCollection(); if ( coll ) connectActionCollection( coll ); @@ -2274,7 +2274,7 @@ void KonqMainWindow::slotPartActivated( KParts::Part *part ) // if we just toggled the view mode via the view mode actions, then // we don't need to do all the time-taking stuff below (Simon) const TQString currentServiceDesktopEntryName = m_currentView->service()->desktopEntryName(); - TQPtrListIterator<KRadioAction> it( m_viewModeActions ); + TQPtrListIterator<TDERadioAction> it( m_viewModeActions ); for (; it.current(); ++it ) { if ( it.current()->name() == currentServiceDesktopEntryName ) { it.current()->setChecked( true ); @@ -2282,11 +2282,11 @@ void KonqMainWindow::slotPartActivated( KParts::Part *part ) } } const TQString currentServiceLibrary = viewModeActionKey( m_currentView->service() ); - TQPtrListIterator<KAction> ittb( m_toolBarViewModeActions ); + TQPtrListIterator<TDEAction> ittb( m_toolBarViewModeActions ); for (; ittb.current(); ++ittb ) { KService::Ptr serv = KService::serviceByDesktopName( ittb.current()->name() ); if ( serv && viewModeActionKey( serv ) == currentServiceLibrary ) { - KToggleAction* ta = static_cast<KToggleAction*>( ittb.current() ); + TDEToggleAction* ta = static_cast<TDEToggleAction*>( ittb.current() ); ta->setChecked( false ); TQString servicename = m_currentView->service()->genericName(); if (servicename.isEmpty()) @@ -3110,7 +3110,7 @@ void KonqMainWindow::slotUpAboutToShow() } } -void KonqMainWindow::slotUp(KAction::ActivationReason, TQt::ButtonState state) +void KonqMainWindow::slotUp(TDEAction::ActivationReason, TQt::ButtonState state) { m_goState = state; TQTimer::singleShot( 0, this, TQT_SLOT( slotUpDelayed() ) ); @@ -3231,7 +3231,7 @@ void KonqMainWindow::slotBack() slotGoHistoryActivated(-1); } -void KonqMainWindow::slotBack(KAction::ActivationReason, TQt::ButtonState state) +void KonqMainWindow::slotBack(TDEAction::ActivationReason, TQt::ButtonState state) { slotGoHistoryActivated( -1, state ); } @@ -3253,7 +3253,7 @@ void KonqMainWindow::slotForward() slotGoHistoryActivated( 1 ); } -void KonqMainWindow::slotForward(KAction::ActivationReason, TQt::ButtonState state) +void KonqMainWindow::slotForward(TDEAction::ActivationReason, TQt::ButtonState state) { slotGoHistoryActivated( 1, state ); } @@ -3484,7 +3484,7 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) // but the duplicate_window action also has Ctrl-D as accel and // prevents the lineedit from getting this event. IMHO the accel // should be disabled in favor of the focus-widget. - KAction *duplicate = actionCollection()->action("duplicate_window"); + TDEAction *duplicate = actionCollection()->action("duplicate_window"); if ( duplicate->shortcut() == TQKeySequence(CTRL+Key_D) ) duplicate->setEnabled( false ); @@ -3496,8 +3496,8 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) disconnect( m_paPaste, TQT_SIGNAL( activated() ), ext, TQT_SLOT( paste() ) ); if (slotNames.contains("del()")) disconnect( m_paDelete, TQT_SIGNAL( activated() ), ext, TQT_SLOT( del() ) ); - disconnect( m_paTrash, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ), - this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, TQt::ButtonState ) ) ); + disconnect( m_paTrash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), + this, TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) ); connect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) ); connect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) ); @@ -3525,7 +3525,7 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) // see above in FocusIn for explanation // we use new_window as reference, as it's always in the same state // as duplicate_window - KAction *duplicate = actionCollection()->action("duplicate_window"); + TDEAction *duplicate = actionCollection()->action("duplicate_window"); if ( duplicate->shortcut() == TQKeySequence(CTRL+Key_D) ) duplicate->setEnabled( actionCollection()->action("new_window")->isEnabled() ); @@ -3537,8 +3537,8 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) connect( m_paPaste, TQT_SIGNAL( activated() ), ext, TQT_SLOT( paste() ) ); if (slotNames.contains("del()")) connect( m_paDelete, TQT_SIGNAL( activated() ), ext, TQT_SLOT( del() ) ); - connect( m_paTrash, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ), - this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, TQt::ButtonState ) ) ); + connect( m_paTrash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), + this, TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) ); disconnect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) ); disconnect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) ); @@ -3584,7 +3584,7 @@ void KonqMainWindow::slotCheckComboSelection() m_paCut->setEnabled( hasSelection ); } -void KonqMainWindow::slotClearLocationBar( KAction::ActivationReason, TQt::ButtonState state ) +void KonqMainWindow::slotClearLocationBar( TDEAction::ActivationReason, TQt::ButtonState state ) { kdDebug(1202) << "slotClearLocationBar" << endl; slotStop(); @@ -3624,7 +3624,7 @@ void KonqMainWindow::slotUpdateFullScreen( bool set ) bool haveFullScreenButton = false; //Walk over the toolbars and check whether there is a show fullscreen button in any of them - TQPtrListIterator<KToolBar> barIt = toolBarIterator(); + TQPtrListIterator<TDEToolBar> barIt = toolBarIterator(); for (; barIt.current(); ++barIt ) { //Are we plugged here, in a visible toolbar? @@ -3638,7 +3638,7 @@ void KonqMainWindow::slotUpdateFullScreen( bool set ) if (!haveFullScreenButton) { - TQPtrList<KAction> lst; + TQPtrList<TDEAction> lst; lst.append( m_ptaFullScreen ); plugActionList( "fullscreen", lst ); } @@ -3707,7 +3707,7 @@ void KonqMainWindow::setPageSecurity( PageSecurity pageSecurity ) void KonqMainWindow::showPageSecurity() { if ( m_currentView && m_currentView->part() ) { - KAction *act = m_currentView->part()->action( "security" ); + TDEAction *act = m_currentView->part()->action( "security" ); if ( act ) act->activate(); } @@ -3803,44 +3803,44 @@ void KonqMainWindow::initActions() TQObject::connect( m_pMenuNew->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotFileNewAboutToShow()) ); - (void) new KAction( i18n( "&Edit File Type..." ), 0, actionCollection(), "editMimeType" ); - (void) new KAction( i18n( "Properties" ), ALT+Key_Return, actionCollection(), "properties" ); - (void) new KAction( i18n( "New &Window" ), "window_new", KStdAccel::shortcut(KStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT( slotNewWindow() ), actionCollection(), "new_window" ); - (void) new KAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" ); - (void) new KAction( i18n( "Send &Link Address..." ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendURL() ), actionCollection(), "sendURL" ); - (void) new KAction( i18n( "S&end File..." ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendFile() ), actionCollection(), "sendPage" ); + (void) new TDEAction( i18n( "&Edit File Type..." ), 0, actionCollection(), "editMimeType" ); + (void) new TDEAction( i18n( "Properties" ), ALT+Key_Return, actionCollection(), "properties" ); + (void) new TDEAction( i18n( "New &Window" ), "window_new", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT( slotNewWindow() ), actionCollection(), "new_window" ); + (void) new TDEAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" ); + (void) new TDEAction( i18n( "Send &Link Address..." ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendURL() ), actionCollection(), "sendURL" ); + (void) new TDEAction( i18n( "S&end File..." ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendFile() ), actionCollection(), "sendPage" ); if (kapp->authorize("shell_access")) { - (void) new KAction( i18n( "Open &Terminal" ), "openterm", Key_F4, TQT_TQOBJECT(this), TQT_SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" ); + (void) new TDEAction( i18n( "Open &Terminal" ), "openterm", Key_F4, TQT_TQOBJECT(this), TQT_SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" ); } - (void) new KAction( i18n( "&Open Location..." ), "fileopen", KStdAccel::shortcut(KStdAccel::Open), TQT_TQOBJECT(this), TQT_SLOT( slotOpenLocation() ), actionCollection(), "open_location" ); + (void) new TDEAction( i18n( "&Open Location..." ), "fileopen", TDEStdAccel::shortcut(TDEStdAccel::Open), TQT_TQOBJECT(this), TQT_SLOT( slotOpenLocation() ), actionCollection(), "open_location" ); - m_paFindFiles = new KToggleAction( i18n( "&Find File..." ), "filefind", KStdAccel::shortcut(KStdAccel::Find), TQT_TQOBJECT(this), TQT_SLOT( slotToolFind() ), actionCollection(), "findfile" ); + m_paFindFiles = new TDEToggleAction( i18n( "&Find File..." ), "filefind", TDEStdAccel::shortcut(TDEStdAccel::Find), TQT_TQOBJECT(this), TQT_SLOT( slotToolFind() ), actionCollection(), "findfile" ); m_paPrint = KStdAction::print( 0, 0, actionCollection(), "print" ); (void) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "quit" ); - m_ptaUseHTML = new KToggleAction( i18n( "&Use index.html" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowHTML() ), actionCollection(), "usehtml" ); - m_paLockView = new KToggleAction( i18n( "Lock to Current Location"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotLockView() ), actionCollection(), "lock" ); - m_paLinkView = new KToggleAction( i18n( "Lin&k View"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotLinkView() ), actionCollection(), "link" ); + m_ptaUseHTML = new TDEToggleAction( i18n( "&Use index.html" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowHTML() ), actionCollection(), "usehtml" ); + m_paLockView = new TDEToggleAction( i18n( "Lock to Current Location"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotLockView() ), actionCollection(), "lock" ); + m_paLinkView = new TDEToggleAction( i18n( "Lin&k View"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotLinkView() ), actionCollection(), "link" ); // Go menu - m_paUp = new KToolBarPopupAction( i18n( "&Up" ), "up", KStdAccel::shortcut(KStdAccel::Up), actionCollection(), "up" ); - connect( m_paUp, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this), - TQT_SLOT( slotUp(KAction::ActivationReason, TQt::ButtonState) ) ); + m_paUp = new TDEToolBarPopupAction( i18n( "&Up" ), "up", TDEStdAccel::shortcut(TDEStdAccel::Up), actionCollection(), "up" ); + connect( m_paUp, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this), + TQT_SLOT( slotUp(TDEAction::ActivationReason, TQt::ButtonState) ) ); connect( m_paUp->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotUpAboutToShow() ) ); connect( m_paUp->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotUpActivated( int ) ) ); TQPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward(); - m_paBack = new KToolBarPopupAction( backForward.first, KStdAccel::shortcut(KStdAccel::Back), 0, "", actionCollection(), "back" ); - connect( m_paBack, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this), - TQT_SLOT( slotBack(KAction::ActivationReason, TQt::ButtonState) ) ); + m_paBack = new TDEToolBarPopupAction( backForward.first, TDEStdAccel::shortcut(TDEStdAccel::Back), 0, "", actionCollection(), "back" ); + connect( m_paBack, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this), + TQT_SLOT( slotBack(TDEAction::ActivationReason, TQt::ButtonState) ) ); connect( m_paBack->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotBackAboutToShow() ) ); connect( m_paBack->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotBackActivated( int ) ) ); - m_paForward = new KToolBarPopupAction( backForward.second, KStdAccel::shortcut(KStdAccel::Forward), 0, "", actionCollection(), "forward" ); - connect( m_paForward, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this), - TQT_SLOT( slotForward(KAction::ActivationReason, TQt::ButtonState) ) ); + m_paForward = new TDEToolBarPopupAction( backForward.second, TDEStdAccel::shortcut(TDEStdAccel::Forward), 0, "", actionCollection(), "forward" ); + connect( m_paForward, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this), + TQT_SLOT( slotForward(TDEAction::ActivationReason, TQt::ButtonState) ) ); connect( m_paForward->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotForwardAboutToShow() ) ); connect( m_paForward->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotForwardActivated( int ) ) ); @@ -3848,29 +3848,29 @@ void KonqMainWindow::initActions() connect( m_paHistory, TQT_SIGNAL( menuAboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotGoMenuAboutToShow() ) ); connect( m_paHistory, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotGoHistoryActivated( int ) ) ); - m_paHome = new KAction( i18n( "Home" ), "gohome", KStdAccel::shortcut(KStdAccel::Home), actionCollection(), "home" ); - connect( m_paHome, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this), - TQT_SLOT( slotHome(KAction::ActivationReason, TQt::ButtonState) ) ); - - (void) new KAction( i18n( "S&ystem" ), "system", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoSystem() ), actionCollection(), "go_system" ); - (void) new KAction( i18n( "App&lications" ), "kmenu", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoApplications() ), actionCollection(), "go_applications" ); - (void) new KAction( i18n( "&Storage Media" ), "system", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoMedia() ), actionCollection(), "go_media" ); - (void) new KAction( i18n( "&Network Folders" ), "network", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoNetworkFolders() ), actionCollection(), "go_network_folders" ); - (void) new KAction( i18n( "Sett&ings" ), "kcontrol", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoSettings() ), actionCollection(), "go_settings" ); - //(void) new KAction( i18n( "Sidebar Configuration" ), 0, this, TQT_SLOT( slotGoDirTree() ), actionCollection(), "go_dirtree" ); - (void) new KAction( i18n( "Trash" ), "trashcan_full", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoTrash() ), actionCollection(), "go_trash" ); - (void) new KAction( i18n( "Autostart" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoAutostart() ), actionCollection(), "go_autostart" ); + m_paHome = new TDEAction( i18n( "Home" ), "gohome", TDEStdAccel::shortcut(TDEStdAccel::Home), actionCollection(), "home" ); + connect( m_paHome, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this), + TQT_SLOT( slotHome(TDEAction::ActivationReason, TQt::ButtonState) ) ); + + (void) new TDEAction( i18n( "S&ystem" ), "system", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoSystem() ), actionCollection(), "go_system" ); + (void) new TDEAction( i18n( "App&lications" ), "kmenu", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoApplications() ), actionCollection(), "go_applications" ); + (void) new TDEAction( i18n( "&Storage Media" ), "system", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoMedia() ), actionCollection(), "go_media" ); + (void) new TDEAction( i18n( "&Network Folders" ), "network", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoNetworkFolders() ), actionCollection(), "go_network_folders" ); + (void) new TDEAction( i18n( "Sett&ings" ), "kcontrol", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoSettings() ), actionCollection(), "go_settings" ); + //(void) new TDEAction( i18n( "Sidebar Configuration" ), 0, this, TQT_SLOT( slotGoDirTree() ), actionCollection(), "go_dirtree" ); + (void) new TDEAction( i18n( "Trash" ), "trashcan_full", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoTrash() ), actionCollection(), "go_trash" ); + (void) new TDEAction( i18n( "Autostart" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoAutostart() ), actionCollection(), "go_autostart" ); KonqMostOftenURLSAction *mostOften = new KonqMostOftenURLSAction( i18n("Most Often Visited"), actionCollection(), "go_most_often" ); connect( mostOften, TQT_SIGNAL( activated( const KURL& )), TQT_SLOT( slotOpenURL( const KURL& ))); - (void) new KAction( i18n( "History" ), "history", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoHistory() ), actionCollection(), "go_history" ); + (void) new TDEAction( i18n( "History" ), "history", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoHistory() ), actionCollection(), "go_history" ); // Settings menu - m_paSaveViewProfile = new KAction( i18n( "&Save View Profile..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveViewProfile() ), actionCollection(), "saveviewprofile" ); - m_paSaveViewPropertiesLocally = new KToggleAction( i18n( "Save View Changes per &Folder" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveViewPropertiesLocally() ), actionCollection(), "saveViewPropertiesLocally" ); + m_paSaveViewProfile = new TDEAction( i18n( "&Save View Profile..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveViewProfile() ), actionCollection(), "saveviewprofile" ); + m_paSaveViewPropertiesLocally = new TDEToggleAction( i18n( "Save View Changes per &Folder" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveViewPropertiesLocally() ), actionCollection(), "saveViewPropertiesLocally" ); // "Remove" ? "Reset" ? The former is more correct, the latter is more kcontrol-like... - m_paRemoveLocalProperties = new KAction( i18n( "Remove Folder Properties" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveLocalProperties() ), actionCollection(), "removeLocalProperties" ); + m_paRemoveLocalProperties = new TDEAction( i18n( "Remove Folder Properties" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveLocalProperties() ), actionCollection(), "removeLocalProperties" ); m_configureModules << "kde-filebehavior.desktop" << "kde-fileappearance.desktop" << @@ -3890,52 +3890,52 @@ void KonqMainWindow::initActions() KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() ); KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); - m_paConfigureExtensions = new KAction( i18n("Configure Extensions..."), 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfigureExtensions()), actionCollection(), "options_configure_extensions"); - m_paConfigureSpellChecking = new KAction( i18n("Configure Spell Checking..."), "spellcheck", 0,TQT_TQOBJECT(this), TQT_SLOT( slotConfigureSpellChecking()), actionCollection(), "configurespellcheck"); + m_paConfigureExtensions = new TDEAction( i18n("Configure Extensions..."), 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfigureExtensions()), actionCollection(), "options_configure_extensions"); + m_paConfigureSpellChecking = new TDEAction( i18n("Configure Spell Checking..."), "spellcheck", 0,TQT_TQOBJECT(this), TQT_SLOT( slotConfigureSpellChecking()), actionCollection(), "configurespellcheck"); // Window menu - m_paSplitViewHor = new KAction( i18n( "Split View &Left/Right" ), "view_left_right", CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), TQT_SLOT( slotSplitViewHorizontal() ), actionCollection(), "splitviewh" ); - m_paSplitViewVer = new KAction( i18n( "Split View &Top/Bottom" ), "view_top_bottom", CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), TQT_SLOT( slotSplitViewVertical() ), actionCollection(), "splitviewv" ); - m_paAddTab = new KAction( i18n( "&New Tab" ), "tab_new", "CTRL+SHIFT+N;CTRL+T", TQT_TQOBJECT(this), TQT_SLOT( slotAddTab() ), actionCollection(), "newtab" ); - m_paDuplicateTab = new KAction( i18n( "&Duplicate Current Tab" ), "tab_duplicate", CTRL+SHIFT+Key_D, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateTab() ), actionCollection(), "duplicatecurrenttab" ); - m_paBreakOffTab = new KAction( i18n( "Detach Current Tab" ), "tab_breakoff", CTRL+SHIFT+Key_B, TQT_TQOBJECT(this), TQT_SLOT( slotBreakOffTab() ), actionCollection(), "breakoffcurrenttab" ); - m_paRemoveView = new KAction( i18n( "&Close Active View" ),"view_remove", CTRL+SHIFT+Key_R, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveView() ), actionCollection(), "removeview" ); - m_paRemoveTab = new KAction( i18n( "Close Current Tab" ), "tab_remove", CTRL+Key_W, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveTab() ), actionCollection(), "removecurrenttab" ); - m_paRemoveOtherTabs = new KAction( i18n( "Close &Other Tabs" ), "tab_remove_other", 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveOtherTabsPopup() ), actionCollection(), "removeothertabs" ); - - m_paActivateNextTab = new KAction( i18n( "Activate Next Tab" ), "tab_next", TQApplication::reverseLayout() ? KStdAccel::tabPrev() : KStdAccel::tabNext(), TQT_TQOBJECT(this), TQT_SLOT( slotActivateNextTab() ), actionCollection(), "activatenexttab" ); - m_paActivatePrevTab = new KAction( i18n( "Activate Previous Tab" ), "tab_previous", TQApplication::reverseLayout() ? KStdAccel::tabNext() : KStdAccel::tabPrev(), TQT_TQOBJECT(this), TQT_SLOT( slotActivatePrevTab() ), actionCollection(), "activateprevtab" ); + m_paSplitViewHor = new TDEAction( i18n( "Split View &Left/Right" ), "view_left_right", CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), TQT_SLOT( slotSplitViewHorizontal() ), actionCollection(), "splitviewh" ); + m_paSplitViewVer = new TDEAction( i18n( "Split View &Top/Bottom" ), "view_top_bottom", CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), TQT_SLOT( slotSplitViewVertical() ), actionCollection(), "splitviewv" ); + m_paAddTab = new TDEAction( i18n( "&New Tab" ), "tab_new", "CTRL+SHIFT+N;CTRL+T", TQT_TQOBJECT(this), TQT_SLOT( slotAddTab() ), actionCollection(), "newtab" ); + m_paDuplicateTab = new TDEAction( i18n( "&Duplicate Current Tab" ), "tab_duplicate", CTRL+SHIFT+Key_D, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateTab() ), actionCollection(), "duplicatecurrenttab" ); + m_paBreakOffTab = new TDEAction( i18n( "Detach Current Tab" ), "tab_breakoff", CTRL+SHIFT+Key_B, TQT_TQOBJECT(this), TQT_SLOT( slotBreakOffTab() ), actionCollection(), "breakoffcurrenttab" ); + m_paRemoveView = new TDEAction( i18n( "&Close Active View" ),"view_remove", CTRL+SHIFT+Key_R, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveView() ), actionCollection(), "removeview" ); + m_paRemoveTab = new TDEAction( i18n( "Close Current Tab" ), "tab_remove", CTRL+Key_W, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveTab() ), actionCollection(), "removecurrenttab" ); + m_paRemoveOtherTabs = new TDEAction( i18n( "Close &Other Tabs" ), "tab_remove_other", 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveOtherTabsPopup() ), actionCollection(), "removeothertabs" ); + + m_paActivateNextTab = new TDEAction( i18n( "Activate Next Tab" ), "tab_next", TQApplication::reverseLayout() ? TDEStdAccel::tabPrev() : TDEStdAccel::tabNext(), TQT_TQOBJECT(this), TQT_SLOT( slotActivateNextTab() ), actionCollection(), "activatenexttab" ); + m_paActivatePrevTab = new TDEAction( i18n( "Activate Previous Tab" ), "tab_previous", TQApplication::reverseLayout() ? TDEStdAccel::tabNext() : TDEStdAccel::tabPrev(), TQT_TQOBJECT(this), TQT_SLOT( slotActivatePrevTab() ), actionCollection(), "activateprevtab" ); TQCString actionname; for (int i=1;i<13;i++) { actionname.sprintf("activate_tab_%02d", i); - new KAction(i18n("Activate Tab %1").arg(i), 0, TQT_TQOBJECT(this), TQT_SLOT(slotActivateTab()), actionCollection(), actionname); + new TDEAction(i18n("Activate Tab %1").arg(i), 0, TQT_TQOBJECT(this), TQT_SLOT(slotActivateTab()), actionCollection(), actionname); } - m_paMoveTabLeft = new KAction( i18n("Move Tab Left"), 0 , CTRL+SHIFT+Key_Left,TQT_TQOBJECT(this), TQT_SLOT( slotMoveTabLeft()),actionCollection(),"tab_move_left"); - m_paMoveTabRight = new KAction( i18n("Move Tab Right"), 0 , CTRL+SHIFT+Key_Right,TQT_TQOBJECT(this), TQT_SLOT( slotMoveTabRight()),actionCollection(),"tab_move_right"); + m_paMoveTabLeft = new TDEAction( i18n("Move Tab Left"), 0 , CTRL+SHIFT+Key_Left,TQT_TQOBJECT(this), TQT_SLOT( slotMoveTabLeft()),actionCollection(),"tab_move_left"); + m_paMoveTabRight = new TDEAction( i18n("Move Tab Right"), 0 , CTRL+SHIFT+Key_Right,TQT_TQOBJECT(this), TQT_SLOT( slotMoveTabRight()),actionCollection(),"tab_move_right"); #ifndef NDEBUG - (void) new KAction( i18n( "Dump Debug Info" ), "view_dump_debug_info", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDumpDebugInfo() ), actionCollection(), "dumpdebuginfo" ); + (void) new TDEAction( i18n( "Dump Debug Info" ), "view_dump_debug_info", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDumpDebugInfo() ), actionCollection(), "dumpdebuginfo" ); #endif - m_paSaveRemoveViewProfile = new KAction( i18n( "C&onfigure View Profiles..." ), 0, m_pViewManager, TQT_SLOT( slotProfileDlg() ), actionCollection(), "saveremoveviewprofile" ); - m_pamLoadViewProfile = new KActionMenu( i18n( "Load &View Profile" ), actionCollection(), "loadviewprofile" ); + m_paSaveRemoveViewProfile = new TDEAction( i18n( "C&onfigure View Profiles..." ), 0, m_pViewManager, TQT_SLOT( slotProfileDlg() ), actionCollection(), "saveremoveviewprofile" ); + m_pamLoadViewProfile = new TDEActionMenu( i18n( "Load &View Profile" ), actionCollection(), "loadviewprofile" ); m_pViewManager->setProfiles( m_pamLoadViewProfile ); m_ptaFullScreen = KStdAction::fullScreen( 0, 0, actionCollection(), this ); - KShortcut fullScreenShortcut = m_ptaFullScreen->shortcut(); + TDEShortcut fullScreenShortcut = m_ptaFullScreen->shortcut(); fullScreenShortcut.append( KKey( Key_F11 ) ); m_ptaFullScreen->setShortcut( fullScreenShortcut ); connect( m_ptaFullScreen, TQT_SIGNAL( toggled( bool )), TQT_TQOBJECT(this), TQT_SLOT( slotUpdateFullScreen( bool ))); - KShortcut reloadShortcut = KStdAccel::shortcut(KStdAccel::Reload); + TDEShortcut reloadShortcut = TDEStdAccel::shortcut(TDEStdAccel::Reload); reloadShortcut.append(KKey(CTRL + Key_R)); - m_paReload = new KAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( slotReload() ), actionCollection(), "reload" ); - m_paReloadAllTabs = new KAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, TQT_TQOBJECT(this), TQT_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" ); + m_paReload = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( slotReload() ), actionCollection(), "reload" ); + m_paReloadAllTabs = new TDEAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, TQT_TQOBJECT(this), TQT_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" ); - m_paReloadStop = new KAction( i18n( "&Reload/Stop" ), "reload", 0, TQT_TQOBJECT(this), TQT_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" ); + m_paReloadStop = new TDEAction( i18n( "&Reload/Stop" ), "reload", 0, TQT_TQOBJECT(this), TQT_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" ); m_paUndo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), actionCollection(), "undo" ); //m_paUndo->setEnabled( KonqUndoManager::self()->undoAvailable() ); @@ -3944,20 +3944,20 @@ void KonqMainWindow::initActions() // Those are connected to the browserextension directly m_paCut = KStdAction::cut( 0, 0, actionCollection(), "cut" ); - KShortcut cutShortCut = m_paCut->shortcut(); + TDEShortcut cutShortCut = m_paCut->shortcut(); cutShortCut.remove( KKey( SHIFT + Key_Delete ) ); // used for deleting files m_paCut->setShortcut( cutShortCut ); m_paCopy = KStdAction::copy( 0, 0, actionCollection(), "copy" ); m_paPaste = KStdAction::paste( 0, 0, actionCollection(), "paste" ); - m_paStop = new KAction( i18n( "&Stop" ), "stop", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT( slotStop() ), actionCollection(), "stop" ); + m_paStop = new TDEAction( i18n( "&Stop" ), "stop", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT( slotStop() ), actionCollection(), "stop" ); - m_paRename = new KAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, actionCollection(), "rename" ); - m_paTrash = new KAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, actionCollection(), "trash" ); - connect( m_paTrash, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotTrashActivated( KAction::ActivationReason, TQt::ButtonState ) ) ); + m_paRename = new TDEAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, actionCollection(), "rename" ); + m_paTrash = new TDEAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, actionCollection(), "trash" ); + connect( m_paTrash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), + TQT_TQOBJECT(this), TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) ); - m_paDelete = new KAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, actionCollection(), "del" ); + m_paDelete = new TDEAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, actionCollection(), "del" ); m_paAnimatedLogo = new KonqLogoAction( i18n("Animated Logo"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "animated_logo" ); @@ -3974,21 +3974,21 @@ void KonqMainWindow::initActions() TQWhatsThis::add( m_combo, i18n( "Location Bar<p>" "Enter a web address or search term." ) ); - KAction *clearLocation = new KAction( i18n( "Clear Location Bar" ), + TDEAction *clearLocation = new TDEAction( i18n( "Clear Location Bar" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", CTRL+Key_L, actionCollection(), "clear_location" ); - connect( clearLocation, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ), - TQT_SLOT( slotClearLocationBar( KAction::ActivationReason, TQt::ButtonState ) ) ); + connect( clearLocation, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), + TQT_SLOT( slotClearLocationBar( TDEAction::ActivationReason, TQt::ButtonState ) ) ); clearLocation->setWhatsThis( i18n( "Clear Location bar<p>" "Clears the content of the location bar." ) ); // Bookmarks menu - m_pamBookmarks = new KActionMenu( i18n( "&Bookmarks" ), "bookmark", actionCollection(), "bookmarks" ); + m_pamBookmarks = new TDEActionMenu( i18n( "&Bookmarks" ), "bookmark", actionCollection(), "bookmarks" ); m_pamBookmarks->setDelayed( false ); // The actual menu needs a different action collection, so that the bookmarks // don't appear in kedittoolbar - m_bookmarksActionCollection = new KActionCollection( this ); + m_bookmarksActionCollection = new TDEActionCollection( this ); m_bookmarksActionCollection->setHighlightingEnabled( true ); connectActionCollection( m_bookmarksActionCollection ); @@ -4000,15 +4000,15 @@ void KonqMainWindow::initActions() TQT_SIGNAL( openBookmark(const TQString &, TQt::ButtonState) ), this, TQT_SLOT( slotOpenBookmarkURL(const TQString &, TQt::ButtonState) )); - KAction *addBookmark = actionCollection()->action("add_bookmark"); + TDEAction *addBookmark = actionCollection()->action("add_bookmark"); if (addBookmark) addBookmark->setText(i18n("Bookmark This Location")); m_paShowMenuBar = KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotShowMenuBar() ), actionCollection() ); - (void) new KAction( i18n( "Kon&queror Introduction" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotIntro() ), actionCollection(), "konqintro" ); + (void) new TDEAction( i18n( "Kon&queror Introduction" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotIntro() ), actionCollection(), "konqintro" ); - KAction *goUrl = new KAction( i18n( "Go" ), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT( goURL() ), actionCollection(), "go_url" ); + TDEAction *goUrl = new TDEAction( i18n( "Go" ), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT( goURL() ), actionCollection(), "go_url" ); goUrl->setWhatsThis( i18n( "Go<p>" "Goes to the page that has been entered into the location bar." ) ); @@ -4276,15 +4276,15 @@ void KonqMainWindow::updateViewActions() { // F5 is the default key binding for Reload.... a la Windows. // mc users want F5 for Copy and F6 for move, but I can't make that default. - m_paCopyFiles = new KAction( i18n("Copy &Files..."), Key_F7, TQT_TQOBJECT(this), TQT_SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" ); - m_paMoveFiles = new KAction( i18n("M&ove Files..."), Key_F8, TQT_TQOBJECT(this), TQT_SLOT( slotMoveFiles() ), actionCollection(), "movefiles" ); + m_paCopyFiles = new TDEAction( i18n("Copy &Files..."), Key_F7, TQT_TQOBJECT(this), TQT_SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" ); + m_paMoveFiles = new TDEAction( i18n("M&ove Files..."), Key_F8, TQT_TQOBJECT(this), TQT_SLOT( slotMoveFiles() ), actionCollection(), "movefiles" ); // This action doesn't appear in the GUI, it's for the shortcut only. // KNewMenu takes care of the GUI stuff. - m_paNewDir = new KAction( i18n("Create Folder..." ), Key_F10, TQT_TQOBJECT(this), TQT_SLOT( slotNewDir() ), + m_paNewDir = new TDEAction( i18n("Create Folder..." ), Key_F10, TQT_TQOBJECT(this), TQT_SLOT( slotNewDir() ), actionCollection(), "konq_create_dir" ); - TQPtrList<KAction> lst; + TQPtrList<TDEAction> lst; lst.append( m_paCopyFiles ); lst.append( m_paMoveFiles ); m_paCopyFiles->setEnabled( false ); @@ -4339,7 +4339,7 @@ void KonqMainWindow::connectExtension( KParts::BrowserExtension *ext ) for ( ; it != itEnd ; ++it ) { - KAction * act = actionCollection()->action( static_cast<const char *>(it.key()) ); + TDEAction * act = actionCollection()->action( static_cast<const char *>(it.key()) ); //kdDebug(1202) << it.key() << endl; if ( act ) { @@ -4373,7 +4373,7 @@ void KonqMainWindow::disconnectExtension( KParts::BrowserExtension *ext ) for ( ; it != itEnd ; ++it ) { - KAction * act = actionCollection()->action( static_cast<const char *>(it.key()) ); + TDEAction * act = actionCollection()->action( static_cast<const char *>(it.key()) ); //kdDebug(1202) << it.key() << endl; if ( act && slotNames.contains( it.key()+"()" ) ) { @@ -4383,11 +4383,11 @@ void KonqMainWindow::disconnectExtension( KParts::BrowserExtension *ext ) } } -void KonqMainWindow::slotTrashActivated( KAction::ActivationReason reason, TQt::ButtonState state ) +void KonqMainWindow::slotTrashActivated( TDEAction::ActivationReason reason, TQt::ButtonState state ) { if ( !m_currentView ) return; - if ( reason == KAction::PopupMenuActivation && ( state & TQt::ShiftButton ) ) + if ( reason == TDEAction::PopupMenuActivation && ( state & TQt::ShiftButton ) ) m_currentView->callExtensionMethod( "del()" ); else m_currentView->callExtensionMethod( "trash()" ); @@ -4395,7 +4395,7 @@ void KonqMainWindow::slotTrashActivated( KAction::ActivationReason reason, TQt:: void KonqMainWindow::enableAction( const char * name, bool enabled ) { - KAction * act = actionCollection()->action( name ); + TDEAction * act = actionCollection()->action( name ); if (!act) kdWarning(1202) << "Unknown action " << name << " - can't enable" << endl; else @@ -4421,7 +4421,7 @@ void KonqMainWindow::enableAction( const char * name, bool enabled ) void KonqMainWindow::setActionText( const char * name, const TQString& text ) { - KAction * act = actionCollection()->action( name ); + TDEAction * act = actionCollection()->action( name ); if (!act) kdWarning(1202) << "Unknown action " << name << " - can't enable" << endl; else @@ -4444,12 +4444,12 @@ void KonqMainWindow::enableAllActions( bool enable ) kdDebug(1202) << "KonqMainWindow::enableAllActions " << enable << endl; KParts::BrowserExtension::ActionSlotMap * actionSlotMap = KParts::BrowserExtension::actionSlotMapPtr(); - TQValueList<KAction *> actions = actionCollection()->actions(); - TQValueList<KAction *>::Iterator it = actions.begin(); - TQValueList<KAction *>::Iterator end = actions.end(); + TQValueList<TDEAction *> actions = actionCollection()->actions(); + TQValueList<TDEAction *>::Iterator it = actions.begin(); + TQValueList<TDEAction *>::Iterator end = actions.end(); for (; it != end; ++it ) { - KAction *act = *it; + TDEAction *act = *it; if ( !TQString(act->name()).startsWith("options_configure") /* do not touch the configureblah actions */ && ( !enable || !actionSlotMap->contains( act->name() ) ) ) /* don't enable BE actions */ act->setEnabled( enable ); @@ -4476,8 +4476,8 @@ void KonqMainWindow::enableAllActions( bool enable ) if (m_toggleViewGUIClient) { - TQPtrList<KAction> actions = m_toggleViewGUIClient->actions(); - for ( KAction * it = actions.first(); it ; it = actions.next() ) + TQPtrList<TDEAction> actions = m_toggleViewGUIClient->actions(); + for ( TDEAction * it = actions.first(); it ; it = actions.next() ) it->setEnabled( true ); } @@ -4503,8 +4503,8 @@ void KonqMainWindow::disableActionsNoView() m_paLinkView->setEnabled( false ); if (m_toggleViewGUIClient) { - TQPtrList<KAction> actions = m_toggleViewGUIClient->actions(); - for ( KAction * it = actions.first(); it ; it = actions.next() ) + TQPtrList<TDEAction> actions = m_toggleViewGUIClient->actions(); + for ( TDEAction * it = actions.first(); it ; it = actions.next() ) it->setEnabled( false ); } // There are things we can do, though : bookmarks, view profile, location bar, new window, @@ -4518,7 +4518,7 @@ void KonqMainWindow::disableActionsNoView() "go_url", "go_media", "go_history", "options_configure_extensions", 0 }; for ( int i = 0 ; s_enActions[i] ; ++i ) { - KAction * act = action(s_enActions[i]); + TDEAction * act = action(s_enActions[i]); if (act) act->setEnabled( true ); } @@ -4684,9 +4684,9 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa //kdDebug(1202) << "KonqMainWindow::slotPopupMenu( " << client << "...)" << " current view=" << m_currentView << " " << m_currentView->part()->className() << endl; // This action collection is used to pass actions to KonqPopupMenu. - // It has to be a KActionCollection instead of a KActionPtrList because we need + // It has to be a TDEActionCollection instead of a TDEActionPtrList because we need // the actionStatusText signal... - KActionCollection popupMenuCollection( (TQWidget*)0 ); + TDEActionCollection popupMenuCollection( (TQWidget*)0 ); popupMenuCollection.insert( m_paBack ); popupMenuCollection.insert( m_paForward ); popupMenuCollection.insert( m_paUp ); @@ -4703,7 +4703,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa popupMenuCollection.insert( m_paDelete ); // The pasteto action is used when clicking on a dir, to paste into it. - KAction *actPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPopupPasteTo() ), &popupMenuCollection, "pasteto" ); + TDEAction *actPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPopupPasteTo() ), &popupMenuCollection, "pasteto" ); actPaste->setEnabled( m_paPaste->isEnabled() ); popupMenuCollection.insert( actPaste ); @@ -4772,14 +4772,14 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa // Those actions go into the PopupMenuGUIClient, since that's the one defining them. - KAction *actNewWindow = 0L, *actNewTab = 0L; + TDEAction *actNewWindow = 0L, *actNewTab = 0L; if( doTabHandling ) { if (_args.forcesNewWindow()) { - actNewWindow = new KAction( i18n( "Open in T&his Window" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" ); + actNewWindow = new TDEAction( i18n( "Open in T&his Window" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" ); actNewWindow->setToolTip( i18n( "Open the document in current window" ) ); } - actNewWindow = new KAction( i18n( "Open in New &Window" ), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewWindow() ), konqyMenuClient->actionCollection(), "newview" ); + actNewWindow = new TDEAction( i18n( "Open in New &Window" ), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewWindow() ), konqyMenuClient->actionCollection(), "newview" ); actNewWindow->setToolTip( i18n( "Open the document in a new window" ) ); //Set tab_new_x to point to the correct icon based on NewTabsInFront @@ -4790,12 +4790,12 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa else tab_new_x = "tab_new_bg" ; - KAction *actNewTab = new KAction( i18n( "Open in &Background Tab" ), "tab_new_bg", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), actionCollection(), "openintab" ); + TDEAction *actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), "tab_new_bg", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), actionCollection(), "openintab" ); actNewTab->setStatusText( i18n( "Open the document in a new background tab" ) ); - KAction *actNewTabFront = new KAction( i18n( "Open in &New Tab" ), "tab_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTabAtFront() ), actionCollection(), "openintabfront" ); + TDEAction *actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), "tab_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTabAtFront() ), actionCollection(), "openintabfront" ); actNewTabFront->setStatusText( i18n( "Open the document in a new foreground tab" ) ); - actNewTab = new KAction( i18n( "Open in &Background Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" ); - actNewTabFront = new KAction( i18n( "Open in &New Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTabAtFront() ), konqyMenuClient->actionCollection(), "openintabfront" ); + actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" ); + actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTabAtFront() ), konqyMenuClient->actionCollection(), "openintabfront" ); actNewTab->setToolTip( i18n( "Open the document in a new background tab" ) ); actNewTabFront->setToolTip( i18n( "Open the document in a new foreground tab" ) ); doTabHandling = true; @@ -4853,11 +4853,11 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa delete pPopupMenu; - // We're sort of misusing KActionCollection here, but we need it for the actionStatusText signal... - // Anyway. If the action belonged to the view, and the view got deleted, we don't want ~KActionCollection + // We're sort of misusing TDEActionCollection here, but we need it for the actionStatusText signal... + // Anyway. If the action belonged to the view, and the view got deleted, we don't want ~TDEActionCollection // to iterate over those deleted actions - KActionPtrList lst = popupMenuCollection.actions(); - KActionPtrList::iterator it = lst.begin(); + TDEActionPtrList lst = popupMenuCollection.actions(); + TDEActionPtrList::iterator it = lst.begin(); for ( ; it != lst.end() ; ++it ) popupMenuCollection.take( *it ); @@ -5029,7 +5029,7 @@ void KonqMainWindow::updateOpenWithActions() m_openWithActions.clear(); - if (!kapp->authorizeKAction("openwith")) + if (!kapp->authorizeTDEAction("openwith")) return; const TDETrader::OfferList & services = m_currentView->appServiceOffers(); @@ -5037,7 +5037,7 @@ void KonqMainWindow::updateOpenWithActions() TDETrader::OfferList::ConstIterator end = services.end(); for (; it != end; ++it ) { - KAction *action = new KAction( i18n( "Open with %1" ).arg( (*it)->name() ), 0, 0, (*it)->desktopEntryName().latin1() ); + TDEAction *action = new TDEAction( i18n( "Open with %1" ).arg( (*it)->name() ), 0, 0, (*it)->desktopEntryName().latin1() ); action->setIcon( (*it)->icon() ); connect( action, TQT_SIGNAL( activated() ), @@ -5047,7 +5047,7 @@ void KonqMainWindow::updateOpenWithActions() } if ( services.count() > 0 ) { - m_openWithActions.append( new KActionSeparator ); + m_openWithActions.append( new TDEActionSeparator ); plugActionList( "openwith", m_openWithActions ); } } @@ -5067,7 +5067,7 @@ void KonqMainWindow::updateViewModeActions() unplugViewModeActions(); if ( m_viewModeMenu ) { - TQPtrListIterator<KRadioAction> it( m_viewModeActions ); + TQPtrListIterator<TDERadioAction> it( m_viewModeActions ); for (; it.current(); ++it ) it.current()->unplugAll(); delete m_viewModeMenu; @@ -5094,7 +5094,7 @@ void KonqMainWindow::updateViewModeActions() if ( services.count() <= 1 ) return; - m_viewModeMenu = new KActionMenu( i18n( "&View Mode" ), TQT_TQOBJECT(this) ); + m_viewModeMenu = new TDEActionMenu( i18n( "&View Mode" ), TQT_TQOBJECT(this) ); // a temporary map, just like the m_viewModeToolBarServices map, but // mapping to a KonqViewModeAction object. It's just temporary as we @@ -5118,7 +5118,7 @@ void KonqMainWindow::updateViewModeActions() if ( prop.isValid() && prop.toBool() ) // No toggable views in view mode continue; - KRadioAction *action; + TDERadioAction *action; TQString itname = (*it)->genericName(); if (itname.isEmpty()) @@ -5127,9 +5127,9 @@ void KonqMainWindow::updateViewModeActions() TQString icon = (*it)->icon(); if ( icon != TQString::fromLatin1( "unknown" ) ) // we *have* to specify a parent qobject, otherwise the exclusive group stuff doesn't work!(Simon) - action = new KRadioAction( itname, icon, 0, TQT_TQOBJECT(this), (*it)->desktopEntryName().ascii() ); + action = new TDERadioAction( itname, icon, 0, TQT_TQOBJECT(this), (*it)->desktopEntryName().ascii() ); else - action = new KRadioAction( itname, 0, TQT_TQOBJECT(this), (*it)->desktopEntryName().ascii() ); + action = new TDERadioAction( itname, 0, TQT_TQOBJECT(this), (*it)->desktopEntryName().ascii() ); action->setExclusiveGroup( "KonqMainWindow_ViewModes" ); @@ -5252,7 +5252,7 @@ void KonqMainWindow::saveToolBarServicesMap() void KonqMainWindow::plugViewModeActions() { - TQPtrList<KAction> lst; + TQPtrList<TDEAction> lst; lst.append( m_viewModeMenu ); plugActionList( "viewmode", lst ); // display the toolbar viewmode icons only for inode/directory, as here we have dedicated icons @@ -5273,7 +5273,7 @@ KonqMainWindowIface* KonqMainWindow::dcopObject() void KonqMainWindow::updateBookmarkBar() { - KToolBar * bar = static_cast<KToolBar *>( TQT_TQWIDGET(child( "bookmarkToolBar", "KToolBar" )) ); + TDEToolBar * bar = static_cast<TDEToolBar *>( TQT_TQWIDGET(child( "bookmarkToolBar", "TDEToolBar" )) ); if (!bar) return; @@ -5436,8 +5436,8 @@ void KonqMainWindow::slotOpenURL( const KURL& url ) bool KonqMainWindow::sidebarVisible() const { -KAction *a = m_toggleViewGUIClient->action("konq_sidebartng"); -return (a && static_cast<KToggleAction*>(a)->isChecked()); +TDEAction *a = m_toggleViewGUIClient->action("konq_sidebartng"); +return (a && static_cast<TDEToggleAction*>(a)->isChecked()); } void KonqMainWindow::slotAddWebSideBar(const KURL& url, const TQString& name) @@ -5447,7 +5447,7 @@ void KonqMainWindow::slotAddWebSideBar(const KURL& url, const TQString& name) kdDebug(1202) << "Requested to add URL " << url << " [" << name << "] to the sidebar!" << endl; - KAction *a = m_toggleViewGUIClient->action("konq_sidebartng"); + TDEAction *a = m_toggleViewGUIClient->action("konq_sidebartng"); if (!a) { KMessageBox::sorry(0L, i18n("Your sidebar is not functional or unavailable. A new entry cannot be added."), i18n("Web Sidebar")); return; @@ -5460,7 +5460,7 @@ void KonqMainWindow::slotAddWebSideBar(const KURL& url, const TQString& name) if (rc == KMessageBox::Yes) { // Show the sidebar - if (!static_cast<KToggleAction*>(a)->isChecked()) { + if (!static_cast<TDEToggleAction*>(a)->isChecked()) { a->activate(); } @@ -5511,7 +5511,7 @@ void KonqMainWindow::bookmarksIntoCompletion( const KBookmarkGroup& group ) } } -void KonqMainWindow::connectActionCollection( KActionCollection *coll ) +void KonqMainWindow::connectActionCollection( TDEActionCollection *coll ) { connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), this, TQT_SLOT( slotActionStatusText( const TQString & ) ) ); @@ -5519,7 +5519,7 @@ void KonqMainWindow::connectActionCollection( KActionCollection *coll ) this, TQT_SLOT( slotClearStatusText() ) ); } -void KonqMainWindow::disconnectActionCollection( KActionCollection *coll ) +void KonqMainWindow::disconnectActionCollection( TDEActionCollection *coll ) { disconnect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), this, TQT_SLOT( slotActionStatusText( const TQString & ) ) ); diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h index 026f150c8..8b19f5fd0 100644 --- a/konqueror/konq_mainwindow.h +++ b/konqueror/konq_mainwindow.h @@ -43,16 +43,16 @@ #include "konq_frame.h" class TQFile; -class KAction; -class KActionCollection; -class KActionMenu; +class TDEAction; +class TDEActionCollection; +class TDEActionMenu; class KBookmarkMenu; class KCMultiDialog; class KHistoryCombo; class KNewMenu; class KProgress; -class KSelectAction; -class KToggleAction; +class TDESelectAction; +class TDEToggleAction; class KonqBidiHistoryAction; class KBookmarkBar; class KonqView; @@ -61,7 +61,7 @@ class KonqFrame; class KonqFrameBase; class KonqFrameContainerBase; class KonqFrameContainer; -class KToolBarPopupAction; +class TDEToolBarPopupAction; class KonqLogoAction; class KonqViewModeAction; class KonqPart; @@ -187,7 +187,7 @@ public: virtual void customEvent( TQCustomEvent *event ); - /// Overloaded of KMainWindow + /// Overloaded of TDEMainWindow virtual void setCaption( const TQString &caption ); /** @@ -234,7 +234,7 @@ public: /** * @return the "link view" action, for checking/unchecking from KonqView */ - KToggleAction * linkViewAction()const { return m_paLinkView; } + TDEToggleAction * linkViewAction()const { return m_paLinkView; } void enableAction( const char * name, bool enabled ); void setActionText( const char * name, const TQString& text ); @@ -381,14 +381,14 @@ public slots: // Go menu void slotUp(); - void slotUp(KAction::ActivationReason, TQt::ButtonState state); + void slotUp(TDEAction::ActivationReason, TQt::ButtonState state); void slotUpDelayed(); void slotBack(); - void slotBack(KAction::ActivationReason, TQt::ButtonState state); + void slotBack(TDEAction::ActivationReason, TQt::ButtonState state); void slotForward(); - void slotForward(KAction::ActivationReason, TQt::ButtonState state); + void slotForward(TDEAction::ActivationReason, TQt::ButtonState state); void slotHome(); - void slotHome(KAction::ActivationReason, TQt::ButtonState state); + void slotHome(TDEAction::ActivationReason, TQt::ButtonState state); void slotGoSystem(); void slotGoApplications(); void slotGoMedia(); @@ -410,7 +410,7 @@ public slots: void slotPartChanged( KonqView *childView, KParts::ReadOnlyPart *oldPart, KParts::ReadOnlyPart *newPart ); void slotRunFinished(); - void slotClearLocationBar( KAction::ActivationReason reason, TQt::ButtonState state ); + void slotClearLocationBar( TDEAction::ActivationReason reason, TQt::ButtonState state ); // reimplement from KParts::MainWindow virtual void slotSetStatusBarText( const TQString &text ); @@ -557,7 +557,7 @@ private slots: void bookmarksIntoCompletion(); void initBookmarkBar(); - void slotTrashActivated( KAction::ActivationReason reason, TQt::ButtonState state ); + void slotTrashActivated( TDEAction::ActivationReason reason, TQt::ButtonState state ); void showPageSecurity(); @@ -603,8 +603,8 @@ private: void unplugViewModeActions(); static TQString viewModeActionKey( KService::Ptr service ); - void connectActionCollection( KActionCollection *coll ); - void disconnectActionCollection( KActionCollection *coll ); + void connectActionCollection( TDEActionCollection *coll ); + void disconnectActionCollection( TDEActionCollection *coll ); bool stayPreloaded(); bool checkPreloadResourceUsage(); @@ -613,72 +613,72 @@ private: KNewMenu * m_pMenuNew; - KAction *m_paPrint; + TDEAction *m_paPrint; - KActionMenu *m_pamBookmarks; + TDEActionMenu *m_pamBookmarks; - KToolBarPopupAction *m_paUp; - KToolBarPopupAction *m_paBack; - KToolBarPopupAction *m_paForward; - KAction *m_paHome; + TDEToolBarPopupAction *m_paUp; + TDEToolBarPopupAction *m_paBack; + TDEToolBarPopupAction *m_paForward; + TDEAction *m_paHome; KonqBidiHistoryAction *m_paHistory; - KAction *m_paSaveViewProfile; - KToggleAction *m_paSaveViewPropertiesLocally; - KAction *m_paRemoveLocalProperties; - - KAction *m_paSplitViewHor; - KAction *m_paSplitViewVer; - KAction *m_paAddTab; - KAction *m_paDuplicateTab; - KAction *m_paBreakOffTab; - KAction *m_paRemoveView; - KAction *m_paRemoveTab; - KAction *m_paRemoveOtherTabs; - KAction *m_paActivateNextTab; - KAction *m_paActivatePrevTab; - - KAction *m_paSaveRemoveViewProfile; - KActionMenu *m_pamLoadViewProfile; - - KToggleAction *m_paLockView; - KToggleAction *m_paLinkView; - KAction *m_paReload; - KAction *m_paReloadAllTabs; - KAction *m_paUndo; - KAction *m_paCut; - KAction *m_paCopy; - KAction *m_paPaste; - KAction *m_paStop; - KAction *m_paRename; - - KAction *m_paReloadStop; - - KAction *m_paTrash; - KAction *m_paDelete; - - KAction *m_paCopyFiles; - KAction *m_paMoveFiles; - KAction *m_paNewDir; - - KAction *m_paMoveTabLeft; - KAction *m_paMoveTabRight; - - KAction *m_paConfigureExtensions; - KAction *m_paConfigureSpellChecking; + TDEAction *m_paSaveViewProfile; + TDEToggleAction *m_paSaveViewPropertiesLocally; + TDEAction *m_paRemoveLocalProperties; + + TDEAction *m_paSplitViewHor; + TDEAction *m_paSplitViewVer; + TDEAction *m_paAddTab; + TDEAction *m_paDuplicateTab; + TDEAction *m_paBreakOffTab; + TDEAction *m_paRemoveView; + TDEAction *m_paRemoveTab; + TDEAction *m_paRemoveOtherTabs; + TDEAction *m_paActivateNextTab; + TDEAction *m_paActivatePrevTab; + + TDEAction *m_paSaveRemoveViewProfile; + TDEActionMenu *m_pamLoadViewProfile; + + TDEToggleAction *m_paLockView; + TDEToggleAction *m_paLinkView; + TDEAction *m_paReload; + TDEAction *m_paReloadAllTabs; + TDEAction *m_paUndo; + TDEAction *m_paCut; + TDEAction *m_paCopy; + TDEAction *m_paPaste; + TDEAction *m_paStop; + TDEAction *m_paRename; + + TDEAction *m_paReloadStop; + + TDEAction *m_paTrash; + TDEAction *m_paDelete; + + TDEAction *m_paCopyFiles; + TDEAction *m_paMoveFiles; + TDEAction *m_paNewDir; + + TDEAction *m_paMoveTabLeft; + TDEAction *m_paMoveTabRight; + + TDEAction *m_paConfigureExtensions; + TDEAction *m_paConfigureSpellChecking; KonqLogoAction *m_paAnimatedLogo; KBookmarkBar *m_paBookmarkBar; - KToggleAction * m_paFindFiles; - KToggleAction *m_ptaUseHTML; + TDEToggleAction * m_paFindFiles; + TDEToggleAction *m_ptaUseHTML; - KToggleAction *m_paShowMenuBar; - KToggleAction *m_paShowStatusBar; + TDEToggleAction *m_paShowMenuBar; + TDEToggleAction *m_paShowStatusBar; - KToggleFullScreenAction *m_ptaFullScreen; + TDEToggleFullScreenAction *m_ptaFullScreen; uint m_bLocationBarConnected:1; uint m_bURLEnterLock:1; @@ -698,8 +698,8 @@ private: KBookmarkMenu* m_pBookmarkMenu; KonqExtendedBookmarkOwner *m_pBookmarksOwner; - KActionCollection* m_bookmarksActionCollection; - KActionCollection* m_bookmarkBarActionCollection; + TDEActionCollection* m_bookmarksActionCollection; + TDEActionCollection* m_bookmarkBarActionCollection; KonqViewManager *m_pViewManager; KonqFrameBase* m_pChildFrame; @@ -741,11 +741,11 @@ private: TQString m_initialFrameName; - TQPtrList<KAction> m_openWithActions; - KActionMenu *m_viewModeMenu; - TQPtrList<KAction> m_toolBarViewModeActions; // basically holds two KonqViewActions, one of + TQPtrList<TDEAction> m_openWithActions; + TDEActionMenu *m_viewModeMenu; + TQPtrList<TDEAction> m_toolBarViewModeActions; // basically holds two KonqViewActions, one of // iconview and one for listview - TQPtrList<KRadioAction> m_viewModeActions; + TQPtrList<TDERadioAction> m_viewModeActions; TQMap<TQString,KService::Ptr> m_viewModeToolBarServices; // similar to m_toolBarViewModeActions // it holds a map library name (libkonqiconview/libkonqlistview) ==> service (service for // iconview, multicolumnview, treeview, etc .) diff --git a/konqueror/konq_profiledlg.cc b/konqueror/konq_profiledlg.cc index 5ca6c426f..453762c38 100644 --- a/konqueror/konq_profiledlg.cc +++ b/konqueror/konq_profiledlg.cc @@ -63,7 +63,7 @@ KonqProfileMap KonqProfileDlg::readAllProfiles() return mapProfiles; } -KonqProfileItem::KonqProfileItem( KListView *parent, const TQString & text ) +KonqProfileItem::KonqProfileItem( TDEListView *parent, const TQString & text ) : TQListViewItem( parent, text ), m_profileName( text ) { } @@ -92,7 +92,7 @@ KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const TQString & prese lblName->setBuddy( m_pProfileNameLineEdit ); - m_pListView = new KListView( box ); + m_pListView = new TDEListView( box ); m_pListView->setAllColumnsShowFocus(true); m_pListView->header()->hide(); m_pListView->addColumn(""); diff --git a/konqueror/konq_profiledlg.h b/konqueror/konq_profiledlg.h index ffdd3d513..e0f98a589 100644 --- a/konqueror/konq_profiledlg.h +++ b/konqueror/konq_profiledlg.h @@ -31,14 +31,14 @@ class TQGridLayout; class TQCheckBox; class TQLineEdit; class KPushButton; -class KListView; +class TDEListView; typedef TQMap<TQString, TQString> KonqProfileMap; class KonqProfileItem : public TQListViewItem { public: - KonqProfileItem( KListView *, const TQString & ); + KonqProfileItem( TDEListView *, const TQString & ); ~KonqProfileItem() {} TQString m_profileName; @@ -77,7 +77,7 @@ private: TQCheckBox *m_cbSaveURLs; TQCheckBox *m_cbSaveSize; - KListView *m_pListView; + TDEListView *m_pListView; }; #endif diff --git a/konqueror/konq_tabs.cc b/konqueror/konq_tabs.cc index eca93d7c6..6e8d08fe7 100644 --- a/konqueror/konq_tabs.cc +++ b/konqueror/konq_tabs.cc @@ -60,7 +60,7 @@ KonqFrameTabs::KonqFrameTabs(TQWidget* parent, KonqFrameContainerBase* parentCon : KTabWidget(parent, name), m_rightWidget(0), m_leftWidget(0), m_alwaysTabBar(false), m_closeOtherTabsId(0) { - KAcceleratorManager::setNoAccel(this); + TDEAcceleratorManager::setNoAccel(this); TQWhatsThis::add( tabBar(), i18n( "This bar contains the list of currently open tabs. Click on a tab to make it " "active. The option to show a close button instead of the website icon in the left " diff --git a/konqueror/konq_tabs.h b/konqueror/konq_tabs.h index d07948149..4c84bd2f9 100644 --- a/konqueror/konq_tabs.h +++ b/konqueror/konq_tabs.h @@ -39,7 +39,7 @@ class KonqFrameContainer; class TDEConfig; class KSeparator; class KProgress; -class KAction; +class TDEAction; class KonqFrameTabs : public KTabWidget, public KonqFrameContainerBase { diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc index 023b1e19f..2c4a1a5b5 100644 --- a/konqueror/konq_view.cc +++ b/konqueror/konq_view.cc @@ -240,7 +240,7 @@ void KonqView::switchView( KonqViewFactory &viewFactory ) KParts::ReadOnlyPart *oldPart = m_pPart; m_pPart = m_pKonqFrame->attach( viewFactory ); // creates the part - // Set the statusbar in the BE asap to avoid a KMainWindow statusbar being created. + // Set the statusbar in the BE asap to avoid a TDEMainWindow statusbar being created. KParts::StatusBarExtension* sbext = statusBarExtension(); if ( sbext ) sbext->setStatusBar( frame()->statusbar() ); diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc index f570322dc..a556ac529 100644 --- a/konqueror/konq_viewmgr.cc +++ b/konqueror/konq_viewmgr.cc @@ -1661,7 +1661,7 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent, //kdDebug(1202) << "KonqViewManager::loadItem: end" << name << endl; } -void KonqViewManager::setProfiles( KActionMenu *profiles ) +void KonqViewManager::setProfiles( TDEActionMenu *profiles ) { m_pamProfiles = profiles; @@ -1735,7 +1735,7 @@ void KonqViewManager::slotProfileListAboutToShow() // Generate accelerators TQStringList accel_strings; - KAccelGen::generateFromKeys(m_mapProfileNames, accel_strings); + TDEAccelGen::generateFromKeys(m_mapProfileNames, accel_strings); // Store menu items TQValueListIterator<TQString> iter = accel_strings.begin(); diff --git a/konqueror/konq_viewmgr.h b/konqueror/konq_viewmgr.h index a7dbf939c..d41628ae2 100644 --- a/konqueror/konq_viewmgr.h +++ b/konqueror/konq_viewmgr.h @@ -43,7 +43,7 @@ class KonqFrameContainerBase; class KonqFrameTabs; class KonqView; class BrowserView; -class KActionMenu; +class TDEActionMenu; namespace KParts { @@ -248,7 +248,7 @@ public: */ void viewCountChanged(); - void setProfiles( KActionMenu *profiles ); + void setProfiles( TDEActionMenu *profiles ); void profileListDirty( bool broadcast = true ); @@ -352,7 +352,7 @@ private: KonqFrameBase *m_pDocContainer; - TQGuardedPtr<KActionMenu> m_pamProfiles; + TQGuardedPtr<TDEActionMenu> m_pamProfiles; bool m_bProfileListDirty; bool m_bLoadingProfile; TQString m_currentProfile; diff --git a/konqueror/kttsplugin/tdehtmlkttsd.cpp b/konqueror/kttsplugin/tdehtmlkttsd.cpp index e642918d4..b17b16b75 100644 --- a/konqueror/kttsplugin/tdehtmlkttsd.cpp +++ b/konqueror/kttsplugin/tdehtmlkttsd.cpp @@ -40,7 +40,7 @@ TDEHTMLPluginKTTSD::TDEHTMLPluginKTTSD( TQObject* parent, const char* name, cons TDETrader::OfferList offers = TDETrader::self()->query("DCOP/Text-to-Speech", "Name == 'KTTSD'"); if (offers.count() > 0) { - (void) new KAction( i18n("&Speak Text"), + (void) new TDEAction( i18n("&Speak Text"), "kttsd", 0, this, TQT_SLOT(slotReadOut()), actionCollection(), "tools_kttsd" ); diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cc index 42b9222ae..79e0ead82 100644 --- a/konqueror/listview/konq_infolistviewitem.cc +++ b/konqueror/listview/konq_infolistviewitem.cc @@ -217,7 +217,7 @@ void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & cg.setColor( TQColorGroup::Text, m_pListViewWidget->itemColor() ); - KListView *lv = static_cast< KListView* >( listView() ); + TDEListView *lv = static_cast< TDEListView* >( listView() ); const TQPixmap *pm = TQT_TQPIXMAP_CONST(lv->viewport()->paletteBackgroundPixmap()); if ( _column == 0 && isSelected() && !lv->allColumnsShowFocus() ) { @@ -242,7 +242,7 @@ void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _width = newWidth; } - KListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); + TDEListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); } void KonqInfoListViewItem::paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & _r ) diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc index 9a87baa17..60a3ec2b0 100644 --- a/konqueror/listview/konq_infolistviewwidget.cc +++ b/konqueror/listview/konq_infolistviewwidget.cc @@ -37,7 +37,7 @@ KonqInfoListViewWidget::KonqInfoListViewWidget( KonqListView* parent, { m_metaInfoJob = 0; - m_mtSelector = new KSelectAction(i18n("View &As"), 0, TQT_TQOBJECT(this), + m_mtSelector = new TDESelectAction(i18n("View &As"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectMimeType()), parent->actionCollection(), "view_as" ); diff --git a/konqueror/listview/konq_infolistviewwidget.h b/konqueror/listview/konq_infolistviewwidget.h index c4dcf5076..258a20090 100644 --- a/konqueror/listview/konq_infolistviewwidget.h +++ b/konqueror/listview/konq_infolistviewwidget.h @@ -27,7 +27,7 @@ namespace TDEIO {class MetaInfoJob;} class KonqListView; -class KSelectAction; +class TDESelectAction; /** * The info list view @@ -81,7 +81,7 @@ class KonqInfoListViewWidget : public KonqBaseListViewWidget KonqILVMimeType m_favorite; - KSelectAction* m_mtSelector; + TDESelectAction* m_mtSelector; TDEIO::MetaInfoJob* m_metaInfoJob; KFileItemList m_metaInfoTodo; }; diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc index a1f522bf6..43a6468fc 100644 --- a/konqueror/listview/konq_listview.cc +++ b/konqueror/listview/konq_listview.cc @@ -643,37 +643,37 @@ void KonqListView::slotKFindClosed() void KonqListView::setupActions() { - m_paShowTime=new KToggleAction(i18n("Show &Modification Time"), 0,this, TQT_SLOT(slotColumnToggled()), actionCollection(), "show_time" ); + m_paShowTime=new TDEToggleAction(i18n("Show &Modification Time"), 0,this, TQT_SLOT(slotColumnToggled()), actionCollection(), "show_time" ); m_paShowTime->setCheckedState(i18n("Hide &Modification Time")); - m_paShowType=new KToggleAction(i18n("Show &File Type"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_type" ); + m_paShowType=new TDEToggleAction(i18n("Show &File Type"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_type" ); m_paShowType->setCheckedState(i18n("Hide &File Type")); - m_paShowMimeType=new KToggleAction(i18n("Show MimeType"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_mimetype" ); + m_paShowMimeType=new TDEToggleAction(i18n("Show MimeType"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_mimetype" ); m_paShowMimeType->setCheckedState(i18n("Hide MimeType")); - m_paShowAccessTime=new KToggleAction(i18n("Show &Access Time"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_access_time" ); + m_paShowAccessTime=new TDEToggleAction(i18n("Show &Access Time"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_access_time" ); m_paShowAccessTime->setCheckedState(i18n("Hide &Access Time")); - m_paShowCreateTime=new KToggleAction(i18n("Show &Creation Time"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_creation_time" ); + m_paShowCreateTime=new TDEToggleAction(i18n("Show &Creation Time"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_creation_time" ); m_paShowCreateTime->setCheckedState(i18n("Hide &Creation Time")); - m_paShowLinkDest=new KToggleAction(i18n("Show &Link Destination"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_link_dest" ); + m_paShowLinkDest=new TDEToggleAction(i18n("Show &Link Destination"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_link_dest" ); m_paShowLinkDest->setCheckedState(i18n("Hide &Link Destination")); - m_paShowSize=new KToggleAction(i18n("Show Filesize"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_size" ); + m_paShowSize=new TDEToggleAction(i18n("Show Filesize"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_size" ); m_paShowSize->setCheckedState(i18n("Hide Filesize")); - m_paShowOwner=new KToggleAction(i18n("Show Owner"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_owner" ); + m_paShowOwner=new TDEToggleAction(i18n("Show Owner"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_owner" ); m_paShowOwner->setCheckedState(i18n("Hide Owner")); - m_paShowGroup=new KToggleAction(i18n("Show Group"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_group" ); + m_paShowGroup=new TDEToggleAction(i18n("Show Group"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_group" ); m_paShowGroup->setCheckedState(i18n("Hide Group")); - m_paShowPermissions=new KToggleAction(i18n("Show Permissions"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_permissions" ); + m_paShowPermissions=new TDEToggleAction(i18n("Show Permissions"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_permissions" ); m_paShowPermissions->setCheckedState(i18n("Hide Permissions")); - m_paShowURL=new KToggleAction(i18n("Show URL"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_url" ); + m_paShowURL=new TDEToggleAction(i18n("Show URL"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_url" ); - m_paSelect = new KAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQT_SLOT( slotSelect() ), actionCollection(), "select" ); - m_paUnselect = new KAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQT_SLOT( slotUnselect() ), actionCollection(), "unselect" ); + m_paSelect = new TDEAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQT_SLOT( slotSelect() ), actionCollection(), "select" ); + m_paUnselect = new TDEAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQT_SLOT( slotUnselect() ), actionCollection(), "unselect" ); m_paSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), actionCollection(), "selectall" ); - m_paUnselectAll = new KAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQT_SLOT( slotUnselectAll() ), actionCollection(), "unselectall" ); - m_paInvertSelection = new KAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, this, TQT_SLOT( slotInvertSelection() ), actionCollection(), "invertselection" ); + m_paUnselectAll = new TDEAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQT_SLOT( slotUnselectAll() ), actionCollection(), "unselectall" ); + m_paInvertSelection = new TDEAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, this, TQT_SLOT( slotInvertSelection() ), actionCollection(), "invertselection" ); - m_paShowDot = new KToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ), actionCollection(), "show_dot" ); + m_paShowDot = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ), actionCollection(), "show_dot" ); // m_paShowDot->setCheckedState(i18n("Hide &Hidden Files")); - m_paCaseInsensitive = new KToggleAction(i18n("Case Insensitive Sort"), 0, this, TQT_SLOT(slotCaseInsensitive()),actionCollection(), "sort_caseinsensitive" ); + m_paCaseInsensitive = new TDEToggleAction(i18n("Case Insensitive Sort"), 0, this, TQT_SLOT(slotCaseInsensitive()),actionCollection(), "sort_caseinsensitive" ); newIconSize( KIcon::SizeSmall /* default size */ ); } diff --git a/konqueror/listview/konq_listview.h b/konqueror/listview/konq_listview.h index 127ecc3b2..5b175e13a 100644 --- a/konqueror/listview/konq_listview.h +++ b/konqueror/listview/konq_listview.h @@ -34,8 +34,8 @@ #include <konq_propsview.h> #include "konq_listviewwidget.h" -class KAction; -class KToggleAction; +class TDEAction; +class TDEToggleAction; class ListViewBrowserExtension; class KonqListViewFactory : public KParts::Factory @@ -147,26 +147,26 @@ private: KMimeTypeResolver<KonqBaseListViewItem,KonqListView> *m_mimeTypeResolver; TQTimer *m_headerTimer; - KAction *m_paSelect; - KAction *m_paUnselect; - KAction *m_paSelectAll; - KAction *m_paUnselectAll; - KAction *m_paInvertSelection; - - KToggleAction *m_paCaseInsensitive; - - KToggleAction *m_paShowDot; - KToggleAction *m_paShowTime; - KToggleAction *m_paShowType; - KToggleAction *m_paShowMimeType; - KToggleAction *m_paShowAccessTime; - KToggleAction *m_paShowCreateTime; - KToggleAction *m_paShowLinkDest; - KToggleAction *m_paShowSize; - KToggleAction *m_paShowOwner; - KToggleAction *m_paShowGroup; - KToggleAction *m_paShowPermissions; - KToggleAction *m_paShowURL; + TDEAction *m_paSelect; + TDEAction *m_paUnselect; + TDEAction *m_paSelectAll; + TDEAction *m_paUnselectAll; + TDEAction *m_paInvertSelection; + + TDEToggleAction *m_paCaseInsensitive; + + TDEToggleAction *m_paShowDot; + TDEToggleAction *m_paShowTime; + TDEToggleAction *m_paShowType; + TDEToggleAction *m_paShowMimeType; + TDEToggleAction *m_paShowAccessTime; + TDEToggleAction *m_paShowCreateTime; + TDEToggleAction *m_paShowLinkDest; + TDEToggleAction *m_paShowSize; + TDEToggleAction *m_paShowOwner; + TDEToggleAction *m_paShowGroup; + TDEToggleAction *m_paShowPermissions; + TDEToggleAction *m_paShowURL; }; class ListViewBrowserExtension : public KonqDirPartBrowserExtension diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cc index 925f33f8f..cebf7d5be 100644 --- a/konqueror/listview/konq_listviewitems.cc +++ b/konqueror/listview/konq_listviewitems.cc @@ -305,7 +305,7 @@ void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, cg.setColor( TQColorGroup::Text, m_pListViewWidget->itemColor() ); - KListView *lv = static_cast< KListView* >( listView() ); + TDEListView *lv = static_cast< TDEListView* >( listView() ); const TQPixmap *pm = TQT_TQPIXMAP_CONST(lv->viewport()->paletteBackgroundPixmap()); if ( _column == 0 && isSelected() && !lv->allColumnsShowFocus() ) { @@ -330,7 +330,7 @@ void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, _width = newWidth; } - KListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); + TDEListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); } void KonqListViewItem::paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & _r ) @@ -391,7 +391,7 @@ const char* KonqBaseListViewItem::makeAccessString( const mode_t mode) } KonqBaseListViewItem::KonqBaseListViewItem(KonqBaseListViewWidget *_listViewWidget, KFileItem* _fileitem) -:KListViewItem(_listViewWidget) +:TDEListViewItem(_listViewWidget) ,sortChar(0) ,m_bDisabled(false) ,m_bActive(false) @@ -400,7 +400,7 @@ KonqBaseListViewItem::KonqBaseListViewItem(KonqBaseListViewWidget *_listViewWidg {} KonqBaseListViewItem::KonqBaseListViewItem(KonqBaseListViewWidget *_listViewWidget, KonqBaseListViewItem *_parent, KFileItem* _fileitem) -:KListViewItem(_parent) +:TDEListViewItem(_parent) ,sortChar(0) ,m_bDisabled(false) ,m_bActive(false) diff --git a/konqueror/listview/konq_listviewitems.h b/konqueror/listview/konq_listviewitems.h index b54f1c2db..c96bff5a0 100644 --- a/konqueror/listview/konq_listviewitems.h +++ b/konqueror/listview/konq_listviewitems.h @@ -36,7 +36,7 @@ class KFileItem; class KonqBaseListViewWidget; -class KonqBaseListViewItem : public KListViewItem +class KonqBaseListViewItem : public TDEListViewItem { public: KonqBaseListViewItem( KonqBaseListViewWidget *_listViewWidget, diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc index bd26db191..af7058748 100644 --- a/konqueror/listview/konq_listviewwidget.cc +++ b/konqueror/listview/konq_listviewwidget.cc @@ -58,7 +58,7 @@ ColumnInfo::ColumnInfo() void ColumnInfo::setData(const TQString& n, const TQString& desktopName, int kioUds, - KToggleAction* someAction, int theWidth) + TDEToggleAction* someAction, int theWidth) { displayInColumn=-1; name=n; @@ -71,7 +71,7 @@ void ColumnInfo::setData(const TQString& n, const TQString& desktopName, int kio } void ColumnInfo::setData(const TQString& n, const TQString& desktopName, int kioUds, - TQVariant::Type t, KToggleAction* someAction, int theWidth) + TQVariant::Type t, TDEToggleAction* someAction, int theWidth) { displayInColumn=-1; name=n; @@ -85,7 +85,7 @@ void ColumnInfo::setData(const TQString& n, const TQString& desktopName, int kio KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *parentWidget) - : KListView(parentWidget) + : TDEListView(parentWidget) ,sortedByColumn(0) ,m_pBrowserView(parent) ,m_dirLister(new KDirLister( true /*m_showIcons==false*/)) @@ -111,7 +111,7 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget * m_bTopLevelComplete = true; - //Adjust KListView behaviour + //Adjust TDEListView behaviour setMultiSelection(true); setSelectionModeExt( FileManager ); setDragEnabled(true); @@ -421,7 +421,7 @@ void KonqBaseListViewWidget::contentsMousePressEvent( TQMouseEvent *e ) static_cast<KonqBaseListViewItem*>( itemAt( vp ) ) : 0L; if ( item ) { - KListView::contentsMousePressEvent( e ); + TDEListView::contentsMousePressEvent( e ); } else { if ( e->button() == Qt::LeftButton ) @@ -461,7 +461,7 @@ void KonqBaseListViewWidget::contentsMouseReleaseEvent( TQMouseEvent *e ) } delete m_selected; m_selected = 0; - KListView::contentsMouseReleaseEvent( e ); + TDEListView::contentsMouseReleaseEvent( e ); } void KonqBaseListViewWidget::contentsMouseMoveEvent( TQMouseEvent *e ) @@ -505,7 +505,7 @@ void KonqBaseListViewWidget::contentsMouseMoveEvent( TQMouseEvent *e ) } } - KListView::contentsMouseMoveEvent( e ); + TDEListView::contentsMouseMoveEvent( e ); } void KonqBaseListViewWidget::contentsWheelEvent( TQWheelEvent *e ) @@ -521,7 +521,7 @@ void KonqBaseListViewWidget::contentsWheelEvent( TQWheelEvent *e ) reportItemCounts(); m_pBrowserView->emitMouseOver( 0 ); - KListView::contentsWheelEvent( e ); + TDEListView::contentsWheelEvent( e ); } void KonqBaseListViewWidget::leaveEvent( TQEvent *e ) @@ -537,7 +537,7 @@ void KonqBaseListViewWidget::leaveEvent( TQEvent *e ) m_fileTip->setItem( 0 ); - KListView::leaveEvent( e ); + TDEListView::leaveEvent( e ); } void KonqBaseListViewWidget::drawRubber( TQPainter *p ) @@ -742,7 +742,7 @@ void KonqBaseListViewWidget::slotAutoScroll() void KonqBaseListViewWidget::viewportPaintEvent( TQPaintEvent *e ) { - KListView::viewportPaintEvent( e ); + TDEListView::viewportPaintEvent( e ); TQPainter p( viewport() ); drawRubber( &p ); @@ -751,7 +751,7 @@ void KonqBaseListViewWidget::viewportPaintEvent( TQPaintEvent *e ) void KonqBaseListViewWidget::viewportResizeEvent(TQResizeEvent * e) { - KListView::viewportResizeEvent(e); + TDEListView::viewportResizeEvent(e); emit viewportAdjusted(); } @@ -861,7 +861,7 @@ void KonqBaseListViewWidget::slotItemRenamed( TQListViewItem *item, const TQStri Q_ASSERT( item != 0 ); // The correct behavior is to show the old name until the rename has successfully - // completed. Unfortunately, KListView forces us to allow the text to be changed + // completed. Unfortunately, TDEListView forces us to allow the text to be changed // before we try the rename, so set it back to the pre-rename state. KonqBaseListViewItem *renamedItem = static_cast<KonqBaseListViewItem*>(item); renamedItem->updateContents(); @@ -873,7 +873,7 @@ void KonqBaseListViewWidget::slotItemRenamed( TQListViewItem *item, const TQStri KonqOperations::rename( this, renamedItem->item()->url(), TDEIO::encodeFileName( name ) ); } - // When the KListViewLineEdit loses focus, focus tends to go to the location bar... + // When the TDEListViewLineEdit loses focus, focus tends to go to the location bar... setFocus(); } diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h index cbfcc446b..1fc8b0eb7 100644 --- a/konqueror/listview/konq_listviewwidget.h +++ b/konqueror/listview/konq_listviewwidget.h @@ -37,7 +37,7 @@ class TQRect; class KDirLister; class KonqFMSettings; class ListViewPropertiesExtension; -class KToggleAction; +class TDEToggleAction; class KonqListView; class KonqFileTip; class ListViewBrowserExtension; @@ -56,24 +56,24 @@ class ColumnInfo public: ColumnInfo(); void setData( const TQString& n, const TQString& desktopName, int kioUds, - KToggleAction *someAction, int theWith = -1 ); + TDEToggleAction *someAction, int theWith = -1 ); void setData( const TQString& n, const TQString& desktopName, int kioUds /* UDS_EXTRA */, - TQVariant::Type type, KToggleAction *someAction, int theWith = -1 ); + TQVariant::Type type, TDEToggleAction *someAction, int theWith = -1 ); int displayInColumn; TQString name; TQString desktopFileName; int udsId; TQVariant::Type type; // only used if udsId == UDS_EXTRA bool displayThisOne; - KToggleAction *toggleThisOne; + TDEToggleAction *toggleThisOne; int width; }; /** - * The tree view widget (based on KListView). + * The tree view widget (based on TDEListView). * Most of the functionality is here. */ -class KonqBaseListViewWidget : public KListView +class KonqBaseListViewWidget : public TDEListView { friend class KonqBaseListViewItem; friend class KonqListView; @@ -154,7 +154,7 @@ signals: public slots: //virtual void slotOnItem( KonqBaseListViewItem* _item ); - // The '2' was added to differentiate it from KListView::slotMouseButtonClicked() + // The '2' was added to differentiate it from TDEListView::slotMouseButtonClicked() void slotMouseButtonClicked2( int _button, TQListViewItem *_item, const TQPoint& pos, int ); virtual void slotExecuted( TQListViewItem *_item ); void slotItemRenamed( TQListViewItem *, const TQString &, int ); @@ -222,7 +222,7 @@ protected: //so the position of the mouse pointer doesn't matter when using keyboard, aleXXX virtual void popupMenu( const TQPoint& _global, bool alwaysForSelectedFiles = false ); - //this one is called only by KListView, and this is friend anyways (Alex) + //this one is called only by TDEListView, and this is friend anyways (Alex) //KDirLister *dirLister() const { return m_dirLister; } protected: diff --git a/konqueror/listview/konq_textviewitem.cc b/konqueror/listview/konq_textviewitem.cc index 4b989a9e7..ac63cd443 100644 --- a/konqueror/listview/konq_textviewitem.cc +++ b/konqueror/listview/konq_textviewitem.cc @@ -208,7 +208,7 @@ void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, // cg.setColor(TQColorGroup::HighlightedText, static_cast<KonqTextViewWidget *>(listView())->highlight[type]); // cg.setColor(TQColorGroup::Highlight, Qt::darkGray); - KListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); + TDEListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); } /*void KonqTextViewItem::paintFocus( TQPainter *_p, const TQColorGroup &_cg, const TQRect &_r ) diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp index b4de7a003..5e669972b 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp @@ -48,7 +48,7 @@ KRemoteEncodingPlugin::KRemoteEncodingPlugin(TQObject * parent, const TQStringList &) : KParts::Plugin(parent, name), m_loaded(false), m_idDefault(0) { - m_menu = new KActionMenu(i18n("Select Remote Charset"), "charset", + m_menu = new TDEActionMenu(i18n("Select Remote Charset"), "charset", actionCollection(), "changeremoteencoding"); connect(m_menu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotAboutToShow())); @@ -111,7 +111,7 @@ KRemoteEncodingPlugin::slotAboutToOpenURL() void KRemoteEncodingPlugin::fillMenu() { - KPopupMenu *menu = m_menu->popupMenu(); + TDEPopupMenu *menu = m_menu->popupMenu(); menu->clear(); TQStringList::ConstIterator it; diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.h b/konqueror/remoteencodingplugin/kremoteencodingplugin.h index 9b80888a5..d5469cd47 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.h +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.h @@ -26,7 +26,7 @@ #include <klibloader.h> #include <tdeparts/plugin.h> -class KActionMenu; +class TDEActionMenu; class TDEConfig; class KonqDirPart; @@ -52,7 +52,7 @@ private: void updateMenu(); KonqDirPart *m_part; - KActionMenu *m_menu; + TDEActionMenu *m_menu; TQStringList m_encodingDescriptions; KURL m_currentURL; diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.cpp b/konqueror/shellcmdplugin/kshellcmdplugin.cpp index efd95a88b..d55243d6d 100644 --- a/konqueror/shellcmdplugin/kshellcmdplugin.cpp +++ b/konqueror/shellcmdplugin/kshellcmdplugin.cpp @@ -33,7 +33,7 @@ KShellCmdPlugin::KShellCmdPlugin( TQObject* parent, const char* name, if (!kapp->authorize("shell_access")) return; - new KAction( i18n( "&Execute Shell Command..." ), "run", CTRL+Key_E, this, + new TDEAction( i18n( "&Execute Shell Command..." ), "run", CTRL+Key_E, this, TQT_SLOT( slotExecuteShellCommand() ), actionCollection(), "executeshellcommand" ); } diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp index db0421c52..8558b71ba 100644 --- a/konqueror/sidebar/konqsidebar.cpp +++ b/konqueror/sidebar/konqsidebar.cpp @@ -37,7 +37,7 @@ KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName, connect(m_widget,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed())); connect(m_extension, TQT_SIGNAL(addWebSideBar(const KURL&, const TQString&)), m_widget, TQT_SLOT(addWebSideBar(const KURL&, const TQString&))); - KAcceleratorManager::setNoAccel(TQT_TQWIDGET(m_widget)); + TDEAcceleratorManager::setNoAccel(TQT_TQWIDGET(m_widget)); setWidget(TQT_TQWIDGET(m_widget)); } diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp index 8dc49bb5c..4638d0bad 100644 --- a/konqueror/sidebar/sidebar_widget.cpp +++ b/konqueror/sidebar/sidebar_widget.cpp @@ -854,7 +854,7 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev) { if (!m_buttonPopup) { - m_buttonPopup=new KPopupMenu(this, "Sidebar_Widget::ButtonPopup"); + m_buttonPopup=new TDEPopupMenu(this, "Sidebar_Widget::ButtonPopup"); m_buttonPopup->insertTitle(SmallIcon("unknown"), "", 50); m_buttonPopup->insertItem(SmallIconSet("text"), i18n("Set Name..."),4); // Item to open a dialog to change the name of the sidebar item (by Pupeno) m_buttonPopup->insertItem(SmallIconSet("www"), i18n("Set URL..."),2); diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h index c5ee75a8a..4457d12e2 100644 --- a/konqueror/sidebar/sidebar_widget.h +++ b/konqueror/sidebar/sidebar_widget.h @@ -186,7 +186,7 @@ private: KMultiTabBar *m_buttonBar; TQPtrVector<ButtonInfo> m_buttons; TQHBoxLayout *m_layout; - KPopupMenu *m_buttonPopup; + TDEPopupMenu *m_buttonPopup; TQPopupMenu *m_menu; TQGuardedPtr<ButtonInfo> m_activeModule; TQGuardedPtr<ButtonInfo> m_currentButton; diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp index 64a8fb9c6..5b170b102 100644 --- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp +++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp @@ -47,30 +47,30 @@ KonqSidebarBookmarkModule::KonqSidebarBookmarkModule( KonqSidebarTree * parentTr connect(tree(), TQT_SIGNAL(moved(TQListViewItem*,TQListViewItem*,TQListViewItem*)), this, TQT_SLOT(slotMoved(TQListViewItem*,TQListViewItem*,TQListViewItem*))); - connect(tree(), TQT_SIGNAL(dropped(KListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)), - this, TQT_SLOT(slotDropped(KListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*))); + connect(tree(), TQT_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)), + this, TQT_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*))); connect(tree(), TQT_SIGNAL(expanded(TQListViewItem*)), this, TQT_SLOT(slotOpenChange(TQListViewItem*))); connect(tree(), TQT_SIGNAL(collapsed(TQListViewItem*)), this, TQT_SLOT(slotOpenChange(TQListViewItem*))); - m_collection = new KActionCollection( this, "bookmark actions" ); - (void) new KAction( i18n("&Create New Folder"), "folder_new", 0, this, + m_collection = new TDEActionCollection( this, "bookmark actions" ); + (void) new TDEAction( i18n("&Create New Folder"), "folder_new", 0, this, TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder"); - (void) new KAction( i18n("Delete Folder"), "editdelete", 0, this, + (void) new TDEAction( i18n("Delete Folder"), "editdelete", 0, this, TQT_SLOT( slotDelete() ), m_collection, "delete_folder"); - (void) new KAction( i18n("Delete Bookmark"), "editdelete", 0, this, + (void) new TDEAction( i18n("Delete Bookmark"), "editdelete", 0, this, TQT_SLOT( slotDelete() ), m_collection, "delete_bookmark"); - (void) new KAction( i18n("Properties"), "edit", 0, this, + (void) new TDEAction( i18n("Properties"), "edit", 0, this, TQT_SLOT( slotProperties() ), m_collection, "item_properties"); - (void) new KAction( i18n("Open in New Window"), "window_new", 0, this, + (void) new TDEAction( i18n("Open in New Window"), "window_new", 0, this, TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); - (void) new KAction( i18n("Open in New Tab"), "tab_new", 0, this, + (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, this, TQT_SLOT( slotOpenTab() ), m_collection, "open_tab"); - (void) new KAction( i18n("Open Folder in Tabs"), "tab_new", 0, this, + (void) new TDEAction( i18n("Open Folder in Tabs"), "tab_new", 0, this, TQT_SLOT( slotOpenTab() ), m_collection, "folder_open_tabs"); - (void) new KAction( i18n("Copy Link Address"), "editcopy", 0, this, + (void) new TDEAction( i18n("Copy Link Address"), "editcopy", 0, this, TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location"); KStdAction::editBookmarks( KonqBookmarkManager::self(), TQT_SLOT( slotEditBookmarks() ), @@ -159,7 +159,7 @@ void KonqSidebarBookmarkModule::slotMoved(TQListViewItem *i, TQListViewItem*, TQ KBookmarkGroup oldParentGroup = bookmark.parentGroup(); KBookmarkGroup parentGroup; - // try to get the parent group (assume that the TQListViewItem has been reparented by KListView)... + // try to get the parent group (assume that the TQListViewItem has been reparented by TDEListView)... // if anything goes wrong, use the root. if (item->parent()) { bool error = false; @@ -178,7 +178,7 @@ void KonqSidebarBookmarkModule::slotMoved(TQListViewItem *i, TQListViewItem*, TQ parentGroup = KonqBookmarkManager::self()->root(); } else { // No parent! This means the user dropped it before the top level item - // And KListView has moved the item there, we need to correct it + // And TDEListView has moved the item there, we need to correct it tree()->moveItem(item, m_topLevelItem, 0L); parentGroup = KonqBookmarkManager::self()->root(); } @@ -223,7 +223,7 @@ void KonqSidebarBookmarkModule::slotMoved(TQListViewItem *i, TQListViewItem*, TQ } } -void KonqSidebarBookmarkModule::slotDropped(KListView *, TQDropEvent *e, TQListViewItem *parent, TQListViewItem *after) +void KonqSidebarBookmarkModule::slotDropped(TDEListView *, TQDropEvent *e, TQListViewItem *parent, TQListViewItem *after) { if (!KBookmarkDrag::canDecode(e)) return; diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.h b/konqueror/sidebar/trees/bookmark_module/bookmark_module.h index 738bd7566..ba78a2b96 100644 --- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.h +++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.h @@ -26,7 +26,7 @@ #include <kdialogbase.h> class KonqSidebarBookmarkItem; -class KActionCollection; +class TDEActionCollection; class KLineEdit; /** @@ -49,7 +49,7 @@ public: protected slots: void slotBookmarksChanged( const TQString & ); void slotMoved(TQListViewItem*,TQListViewItem*,TQListViewItem*); - void slotDropped(KListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*); + void slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*); void slotCreateFolder(); void slotDelete(); void slotProperties(KonqSidebarBookmarkItem *bi = 0); @@ -69,7 +69,7 @@ private: KonqSidebarTreeTopLevelItem * m_topLevelItem; KonqSidebarBookmarkItem * m_rootItem; - KActionCollection *m_collection; + TDEActionCollection *m_collection; bool m_ignoreOpenChange; TQMap<TQString, bool> m_folderOpenState; diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp index fa7f8ba39..5d27e010f 100644 --- a/konqueror/sidebar/trees/history_module/history_module.cpp +++ b/konqueror/sidebar/trees/history_module/history_module.cpp @@ -74,23 +74,23 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree connect( parentTree, TQT_SIGNAL( expanded( TQListViewItem * )), TQT_SLOT( slotItemExpanded( TQListViewItem * ))); - m_collection = new KActionCollection( this, "history actions" ); - (void) new KAction( i18n("New &Window"), "window_new", 0, this, + m_collection = new TDEActionCollection( this, "history actions" ); + (void) new TDEAction( i18n("New &Window"), "window_new", 0, this, TQT_SLOT( slotNewWindow() ), m_collection, "open_new"); - (void) new KAction( i18n("&Remove Entry"), "editdelete", 0, this, + (void) new TDEAction( i18n("&Remove Entry"), "editdelete", 0, this, TQT_SLOT( slotRemoveEntry() ), m_collection, "remove"); - (void) new KAction( i18n("C&lear History"), "history_clear", 0, this, + (void) new TDEAction( i18n("C&lear History"), "history_clear", 0, this, TQT_SLOT( slotClearHistory() ), m_collection, "clear"); - (void) new KAction( i18n("&Preferences..."), "configure", 0, this, + (void) new TDEAction( i18n("&Preferences..."), "configure", 0, this, TQT_SLOT( slotPreferences()), m_collection, "preferences"); - KRadioAction *sort; - sort = new KRadioAction( i18n("By &Name"), 0, this, + TDERadioAction *sort; + sort = new TDERadioAction( i18n("By &Name"), 0, this, TQT_SLOT( slotSortByName() ), m_collection, "byName"); sort->setExclusiveGroup("SortGroup"); sort->setChecked( m_sortsByName ); - sort = new KRadioAction( i18n("By &Date"), 0, this, + sort = new TDERadioAction( i18n("By &Date"), 0, this, TQT_SLOT( slotSortByDate() ), m_collection, "byDate"); sort->setExclusiveGroup("SortGroup"); sort->setChecked( !m_sortsByName ); diff --git a/konqueror/sidebar/trees/history_module/history_module.h b/konqueror/sidebar/trees/history_module/history_module.h index cbba40262..5c114a164 100644 --- a/konqueror/sidebar/trees/history_module/history_module.h +++ b/konqueror/sidebar/trees/history_module/history_module.h @@ -30,7 +30,7 @@ #include "history_item.h" -class KActionCollection; +class TDEActionCollection; class KDialogBase; class KonqSidebarHistorySettings; class KonqSidebarTree; @@ -94,7 +94,7 @@ private: KonqSidebarTreeTopLevelItem * m_topLevelItem; - KActionCollection *m_collection; + TDEActionCollection *m_collection; KDialogBase *m_dlg; TQPixmap m_folderClosed; diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp index b2e92c6fd..813ece3df 100644 --- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp +++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp @@ -243,15 +243,15 @@ void HistorySidebarConfig::slotOlderChanged( int value ) void HistorySidebarConfig::slotGetFontNewer() { - int result = KFontDialog::getFont( m_fontNewer, false, this ); - if ( result == KFontDialog::Accepted ) + int result = TDEFontDialog::getFont( m_fontNewer, false, this ); + if ( result == TDEFontDialog::Accepted ) configChanged(); } void HistorySidebarConfig::slotGetFontOlder() { - int result = KFontDialog::getFont( m_fontOlder, false, this ); - if ( result == KFontDialog::Accepted ) + int result = TDEFontDialog::getFont( m_fontOlder, false, this ); + if ( result == TDEFontDialog::Accepted ) configChanged(); } diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp index 01bdc1d7a..028a531fa 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.cpp +++ b/konqueror/sidebar/trees/konq_sidebartree.cpp @@ -115,7 +115,7 @@ public: KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidget, int virt, const TQString& path ) - : KListView( parentWidget ), + : TDEListView( parentWidget ), m_currentTopLevelItem( 0 ), m_toolTip( this ), m_scrollingLocked( false ), @@ -303,8 +303,8 @@ void KonqSidebarTree::contentsDragMoveEvent( TQDragMoveEvent *e ) m_autoOpenTimer->start( autoOpenTimeout ); } } else { - d->m_dropMode = KListViewMode; - KListView::contentsDragMoveEvent(e); + d->m_dropMode = TDEListViewMode; + TDEListView::contentsDragMoveEvent(e); } } @@ -319,8 +319,8 @@ void KonqSidebarTree::contentsDragLeaveEvent( TQDragLeaveEvent *ev ) m_dropItem = 0; m_lstDropFormats.clear(); - if (d->m_dropMode == KListViewMode) { - KListView::contentsDragLeaveEvent(ev); + if (d->m_dropMode == TDEListViewMode) { + TDEListView::contentsDragLeaveEvent(ev); } } @@ -348,7 +348,7 @@ void KonqSidebarTree::contentsDropEvent( TQDropEvent *ev ) selection->drop( ev ); } } else { - KListView::contentsDropEvent(ev); + TDEListView::contentsDropEvent(ev); } } @@ -415,7 +415,7 @@ void KonqSidebarTree::addURL(KonqSidebarTreeTopLevelItem* item, const KURL & url bool KonqSidebarTree::acceptDrag(TQDropEvent* e) const { - // for KListViewMode... + // for TDEListViewMode... for( int i = 0; e->format( i ); i++ ) if ( d->m_dropFormats.contains(e->format( i ) ) ) return true; @@ -441,7 +441,7 @@ TQDragObject* KonqSidebarTree::dragObject() void KonqSidebarTree::leaveEvent( TQEvent *e ) { - KListView::leaveEvent( e ); + TDEListView::leaveEvent( e ); // emitStatusBarText( TQString::null ); } @@ -855,7 +855,7 @@ KonqSidebarTreeItem * KonqSidebarTree::currentItem() const void KonqSidebarTree::setContentsPos( int x, int y ) { if ( !m_scrollingLocked ) - KListView::setContentsPos( x, y ); + TDEListView::setContentsPos( x, y ); } void KonqSidebarTree::slotItemRenamed(TQListViewItem* item, const TQString &name, int col) @@ -906,22 +906,22 @@ void KonqSidebarTree::showToplevelContextMenu() if (!m_collection) { - m_collection = new KActionCollection( this, "bookmark actions" ); - (void) new KAction( i18n("&Create New Folder..."), "folder_new", 0, TQT_TQOBJECT(this), + m_collection = new TDEActionCollection( this, "bookmark actions" ); + (void) new TDEAction( i18n("&Create New Folder..."), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder"); - (void) new KAction( i18n("Delete Folder"), "editdelete", 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("Delete Folder"), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDelete() ), m_collection, "delete_folder"); - (void) new KAction( i18n("Rename"), 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("Rename"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotRename() ), m_collection, "rename"); - (void) new KAction( i18n("Delete Link"), "editdelete", 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("Delete Link"), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDelete() ), m_collection, "delete_link"); - (void) new KAction( i18n("Properties"), "edit", 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("Properties"), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ), m_collection, "item_properties"); - (void) new KAction( i18n("Open in New Window"), "window_new", 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("Open in New Window"), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); - (void) new KAction( i18n("Open in New Tab"), "tab_new", 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenTab() ), m_collection, "open_tab"); - (void) new KAction( i18n("Copy Link Address"), "editcopy", 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("Copy Link Address"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location"); } diff --git a/konqueror/sidebar/trees/konq_sidebartree.h b/konqueror/sidebar/trees/konq_sidebartree.h index a8e2ad075..f8626298c 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.h +++ b/konqueror/sidebar/trees/konq_sidebartree.h @@ -31,7 +31,7 @@ class KonqSidebarTreeModule; class KonqSidebarTreeItem; -class KActionCollection; +class TDEActionCollection; class TQTimer; @@ -64,7 +64,7 @@ private: typedef enum { SidebarTreeMode, // used if the drop is accepted by a KonqSidebarTreeItem. otherwise - KListViewMode // use KListView's dnd implementation. accepts mime types set with setDropFormats() + TDEListViewMode // use TDEListView's dnd implementation. accepts mime types set with setDropFormats() } DropAcceptType; /** @@ -73,7 +73,7 @@ typedef enum { * a toplevel item, and creates the modules that will handle the contents * of those items. */ -class KonqSidebarTree : public KListView, public KDirNotify +class KonqSidebarTree : public TDEListView, public KDirNotify { Q_OBJECT public: @@ -106,7 +106,7 @@ public: void itemDestructed( KonqSidebarTreeItem *item ); - void setDropFormats( const TQStringList &formats ); // used in KListView mode + void setDropFormats( const TQStringList &formats ); // used in TDEListView mode // Show context menu for toplevel items void showToplevelContextMenu(); @@ -125,7 +125,7 @@ protected: virtual void contentsDragMoveEvent( TQDragMoveEvent *e ); virtual void contentsDragLeaveEvent( TQDragLeaveEvent *e ); virtual void contentsDropEvent( TQDropEvent *ev ); - virtual bool acceptDrag(TQDropEvent* e) const; // used in KListView mode + virtual bool acceptDrag(TQDropEvent* e) const; // used in TDEListView mode virtual void leaveEvent( TQEvent * ); @@ -205,7 +205,7 @@ private: TQMap<TQString, getModule> pluginFactories; bool m_bOpeningFirstChild; - KActionCollection *m_collection; + TDEActionCollection *m_collection; KonqSidebarTree_Internal *d; diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp index 900d25e03..04454ecb1 100644 --- a/konqueror/sidebar/trees/konqsidebar_tree.cpp +++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp @@ -32,7 +32,7 @@ KonqSidebar_Tree::KonqSidebar_Tree(TDEInstance *instance,TQObject *parent,TQWidg clearSearch->setTextLabel(i18n("Clear Search"), true); clearSearch->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase")); TQLabel* slbl = new TQLabel(i18n("Se&arch:"), searchline); - KListViewSearchLine* listViewSearch = new KListViewSearchLine(searchline,tree); + TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(searchline,tree); slbl->setBuddy(listViewSearch); connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear())); } diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h index 3a43a54d0..65566c4c3 100644 --- a/konqueror/sidebar/web_module/web_module.h +++ b/konqueror/sidebar/web_module/web_module.h @@ -47,7 +47,7 @@ class TDEHTMLSideBar : public TDEHTMLPart ); - _linkMenu = new KPopupMenu(widget(), + _linkMenu = new TDEPopupMenu(widget(), "link context menu"); if (!universal) { _linkMenu->insertItem(i18n("&Open Link"), @@ -58,7 +58,7 @@ class TDEHTMLSideBar : public TDEHTMLPart _linkMenu->insertItem(i18n("Open in New &Window"), this, TQT_SLOT(loadPage())); } - _menu = new KPopupMenu(widget(), "context menu"); + _menu = new TDEPopupMenu(widget(), "context menu"); _menu->insertItem(SmallIcon("reload"), i18n("&Reload"), this, TQT_SIGNAL(reload())); _menu->insertItem(SmallIcon("reload"), i18n("Set &Automatic Reload"), this, TQT_SIGNAL(setAutoReload())); @@ -156,7 +156,7 @@ class TDEHTMLSideBar : public TDEHTMLPart } } private: - KPopupMenu *_menu, *_linkMenu; + TDEPopupMenu *_menu, *_linkMenu; TQString _lastUrl; }; diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp index 32d9d9643..72c69e8c0 100644 --- a/konsole/konsole/TEWidget.cpp +++ b/konsole/konsole/TEWidget.cpp @@ -2206,7 +2206,7 @@ void TEWidget::dropEvent(TQDropEvent* event) { if (m_drop==0) { - m_drop = new KPopupMenu(this); + m_drop = new TDEPopupMenu(this); m_drop->insertItem( i18n("Paste"), paste ); m_drop->insertSeparator(); m_drop->insertItem( "cd", cd ); diff --git a/konsole/konsole/TEWidget.h b/konsole/konsole/TEWidget.h index a00903ed2..1ca744644 100644 --- a/konsole/konsole/TEWidget.h +++ b/konsole/konsole/TEWidget.h @@ -288,7 +288,7 @@ private: TQTimer* blinkT; // active when hasBlinker TQTimer* blinkCursorT; // active when hasBlinkingCursor - KPopupMenu* m_drop; + TDEPopupMenu* m_drop; TQString dropText; int m_dnd_file_count; diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index 364aa2f29..189ebb3a9 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -158,17 +158,17 @@ Time to start a requirement list. extern bool argb_visual; // declared in main.cpp and konsole_part.cpp // KonsoleFontSelectAction is now also used for selectSize! -class KonsoleFontSelectAction : public KSelectAction { +class KonsoleFontSelectAction : public TDESelectAction { public: KonsoleFontSelectAction(const TQString &text, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ) - : KSelectAction(text, accel, receiver, slot, parent, name) {} + : TDESelectAction(text, accel, receiver, slot, parent, name) {} KonsoleFontSelectAction( const TQString &text, const TQIconSet& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ) - : KSelectAction(text, pix, accel, receiver, slot, parent, name) {} + : TDESelectAction(text, pix, accel, receiver, slot, parent, name) {} virtual void slotActivated( int index ); }; @@ -176,23 +176,23 @@ public: void KonsoleFontSelectAction::slotActivated(int index) { // emit even if it's already activated if (currentItem() == index) { - KSelectAction::slotActivated(); + TDESelectAction::slotActivated(); return; } else { - KSelectAction::slotActivated(index); + TDESelectAction::slotActivated(index); } } template class TQPtrDict<TESession>; template class TQIntDict<KSimpleConfig>; -template class TQPtrDict<KRadioAction>; +template class TQPtrDict<TDERadioAction>; #define DEFAULT_HISTORY_SIZE 1000 Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bool frameon, bool scrollbaron, TQCString type, bool b_inRestore, const int wanted_tabbar, const TQString &workdir ) :DCOPObject( "konsole" ) -,KMainWindow(0, name) +,TDEMainWindow(0, name) ,m_defaultSession(0) ,m_defaultSessionFilename("") ,tabwidget(0) @@ -281,7 +281,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo no2command.setAutoDelete(true); menubar = menuBar(); - KAcceleratorManager::setNoAccel( menubar ); + TDEAcceleratorManager::setNoAccel( menubar ); sessionNumberMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); connect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ), @@ -493,12 +493,12 @@ void Konsole::makeGUI() const_cast<TQPopupMenu *>(static_cast<const TQPopupMenu *>(sender()))->removeItemAt(0); } - KActionCollection* actions = actionCollection(); + TDEActionCollection* actions = actionCollection(); // Send Signal Menu ------------------------------------------------------------- - if (kapp->authorizeKAction("send_signal")) + if (kapp->authorizeTDEAction("send_signal")) { - m_signals = new KPopupMenu(this); + m_signals = new TDEPopupMenu(this); m_signals->insertItem( i18n( "&Suspend Task" ) + " (STOP)", SIGSTOP); m_signals->insertItem( i18n( "&Continue Task" ) + " (CONT)", SIGCONT); m_signals->insertItem( i18n( "&Hangup" ) + " (HUP)", SIGHUP); @@ -508,7 +508,7 @@ void Konsole::makeGUI() m_signals->insertItem( i18n( "User Signal &1") + " (USR1)", SIGUSR1); m_signals->insertItem( i18n( "User Signal &2") + " (USR2)", SIGUSR2); connect(m_signals, TQT_SIGNAL(activated(int)), TQT_SLOT(sendSignal(int))); - KAcceleratorManager::manage( m_signals ); + TDEAcceleratorManager::manage( m_signals ); } // Edit Menu ---------------------------------------------------------------- @@ -556,7 +556,7 @@ void Konsole::makeGUI() m_moveSessionRight->plug(m_view); m_view->insertSeparator(); - KRadioAction *ra = session2action.find(se); + TDERadioAction *ra = session2action.find(se); if (ra!=0) ra->plug(m_view); //bookmarks menu @@ -572,16 +572,16 @@ void Konsole::makeGUI() connect(m_bookmarksSession, TQT_SIGNAL(aboutToShow()), TQT_SLOT(bookmarks_menu_check())); // Schema Options Menu ----------------------------------------------------- - m_schema = new KPopupMenu(this); + m_schema = new TDEPopupMenu(this); m_schema->setCheckable(true); - KAcceleratorManager::manage( m_schema ); + TDEAcceleratorManager::manage( m_schema ); connect(m_schema, TQT_SIGNAL(activated(int)), TQT_SLOT(schema_menu_activated(int))); connect(m_schema, TQT_SIGNAL(aboutToShow()), TQT_SLOT(schema_menu_check())); // Keyboard Options Menu --------------------------------------------------- - m_keytab = new KPopupMenu(this); + m_keytab = new TDEPopupMenu(this); m_keytab->setCheckable(true); - KAcceleratorManager::manage( m_keytab ); + TDEAcceleratorManager::manage( m_keytab ); connect(m_keytab, TQT_SIGNAL(activated(int)), TQT_SLOT(keytab_menu_activated(int))); //options menu @@ -591,7 +591,7 @@ void Konsole::makeGUI() showMenubar->plug ( m_options ); // Tabbar - selectTabbar = new KSelectAction(i18n("&Tab Bar"), 0, TQT_TQOBJECT(this), + selectTabbar = new TDESelectAction(i18n("&Tab Bar"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectTabbar()), actions, "tabbar" ); TQStringList tabbaritems; tabbaritems << i18n("&Hide") << i18n("&Top") << i18n("&Bottom"); @@ -599,7 +599,7 @@ void Konsole::makeGUI() selectTabbar->plug(m_options); // Scrollbar - selectScrollbar = new KSelectAction(i18n("Sc&rollbar"), 0, TQT_TQOBJECT(this), + selectScrollbar = new TDESelectAction(i18n("Sc&rollbar"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectScrollbar()), actions, "scrollbar" ); TQStringList scrollitems; scrollitems << i18n("&Hide") << i18n("&Left") << i18n("&Right"); @@ -615,7 +615,7 @@ void Konsole::makeGUI() } // Select Bell - selectBell = new KSelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , TQT_TQOBJECT(this), + selectBell = new TDESelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , TQT_TQOBJECT(this), TQT_SLOT(slotSelectBell()), actions, "bell"); TQStringList bellitems; bellitems << i18n("System &Bell") @@ -626,24 +626,24 @@ void Konsole::makeGUI() selectBell->plug(m_options); checkBitmapFonts(); - KActionMenu* m_fontsizes = new KActionMenu( i18n( "Font" ), + TDEActionMenu* m_fontsizes = new TDEActionMenu( i18n( "Font" ), SmallIconSet( "text" ), actions, 0L ); - m_fontsizes->insert( new KAction( i18n( "&Enlarge Font" ), + m_fontsizes->insert( new TDEAction( i18n( "&Enlarge Font" ), SmallIconSet( "fontsizeup" ), 0, TQT_TQOBJECT(this), TQT_SLOT( biggerFont() ), actions, "enlarge_font" ) ); - m_fontsizes->insert( new KAction( i18n( "&Shrink Font" ), + m_fontsizes->insert( new TDEAction( i18n( "&Shrink Font" ), SmallIconSet( "fontsizedown" ), 0, TQT_TQOBJECT(this), TQT_SLOT( smallerFont() ), actions, "shrink_font" ) ); - m_fontsizes->insert( new KAction( i18n( "Se&lect..." ), + m_fontsizes->insert( new TDEAction( i18n( "Se&lect..." ), SmallIconSet( "font" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSelectFont() ), actions, "select_font" ) ); if ( b_installBitmapFonts ) { - m_fontsizes->insert( new KAction( i18n( "&Install Bitmap..." ), + m_fontsizes->insert( new TDEAction( i18n( "&Install Bitmap..." ), SmallIconSet( "font" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotInstallBitmapFonts() ), actions, "install_fonts" ) ); @@ -651,18 +651,18 @@ void Konsole::makeGUI() m_fontsizes->plug(m_options); // encoding menu, start with default checked ! - selectSetEncoding = new KSelectAction( i18n( "&Encoding" ), SmallIconSet( "charset" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetEncoding()), actions, "set_encoding" ); + selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet( "charset" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetEncoding()), actions, "set_encoding" ); TQStringList list = TDEGlobal::charsets()->descriptiveEncodingNames(); list.prepend( i18n( "Default" ) ); selectSetEncoding->setItems(list); selectSetEncoding->setCurrentItem (0); selectSetEncoding->plug(m_options); - if (kapp->authorizeKAction("keyboard")) + if (kapp->authorizeTDEAction("keyboard")) m_options->insertItem( SmallIconSet( "key_bindings" ), i18n( "&Keyboard" ), m_keytab ); // Schema - if (kapp->authorizeKAction("schema")) + if (kapp->authorizeTDEAction("schema")) m_options->insertItem( SmallIconSet( "colorize" ), i18n( "Sch&ema" ), m_schema); // Select size @@ -682,13 +682,13 @@ void Konsole::makeGUI() selectSize->plug(m_options); } - KAction *historyType = new KAction(i18n("Hist&ory..."), "history", 0, TQT_TQOBJECT(this), + TDEAction *historyType = new TDEAction(i18n("Hist&ory..."), "history", 0, TQT_TQOBJECT(this), TQT_SLOT(slotHistoryType()), actions, "history"); historyType->plug(m_options); m_options->insertSeparator(); - KAction *save_settings = new KAction(i18n("&Save as Default"), "filesave", 0, TQT_TQOBJECT(this), + TDEAction *save_settings = new TDEAction(i18n("&Save as Default"), "filesave", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveSettings()), actions, "save_default"); save_settings->plug(m_options); @@ -700,7 +700,7 @@ void Konsole::makeGUI() KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureNotifications()), actionCollection())->plug(m_options); KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), actionCollection())->plug(m_options); - KAction *configure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actions); + TDEAction *configure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actions); configure->plug(m_options); if (TDEGlobalSettings::insertTearOffHandle()) @@ -725,14 +725,14 @@ void Konsole::makeGUI() { updateRMBMenu(); // show menubar / exit fullscreen - KAction* selectionEnd = new KAction(i18n("Set Selection End"), 0, TQT_TQOBJECT(this), + TDEAction* selectionEnd = new TDEAction(i18n("Set Selection End"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetSelectionEnd()), actions, "selection_end"); selectionEnd->plug(m_rightButton); m_copyClipboard->plug(m_rightButton); m_pasteClipboard->plug(m_rightButton); - m_openSelection = new KPopupMenu(this); + m_openSelection = new TDEPopupMenu(this); m_rightButton->insertItem( i18n("&Open.."), m_openSelection ); connect(m_openSelection, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotOpenSelection())); @@ -806,27 +806,27 @@ void Konsole::makeGUI() // Fill tab context menu - m_tabPopupMenu = new KPopupMenu( this ); - KAcceleratorManager::manage( m_tabPopupMenu ); + m_tabPopupMenu = new TDEPopupMenu( this ); + TDEAcceleratorManager::manage( m_tabPopupMenu ); - m_tabDetachSession= new KAction( i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTabDetachSession()), TQT_TQOBJECT(this) ); + m_tabDetachSession= new TDEAction( i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTabDetachSession()), TQT_TQOBJECT(this) ); m_tabDetachSession->plug(m_tabPopupMenu); m_tabPopupMenu->insertItem( i18n("&Rename Session..."), TQT_TQOBJECT(this), TQT_SLOT(slotTabRenameSession()) ); m_tabPopupMenu->insertSeparator(); - m_tabMonitorActivity = new KToggleAction ( i18n( "Monitor for &Activity" ), + m_tabMonitorActivity = new TDEToggleAction ( i18n( "Monitor for &Activity" ), SmallIconSet("activity"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotTabToggleMonitor() ), TQT_TQOBJECT(this) ); m_tabMonitorActivity->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Activity" ) ) ); m_tabMonitorActivity->plug(m_tabPopupMenu); - m_tabMonitorSilence = new KToggleAction ( i18n( "Monitor for &Silence" ), + m_tabMonitorSilence = new TDEToggleAction ( i18n( "Monitor for &Silence" ), SmallIconSet("silence"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotTabToggleMonitor() ), TQT_TQOBJECT(this) ); m_tabMonitorSilence->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Silence" ) ) ); m_tabMonitorSilence->plug(m_tabPopupMenu); - m_tabMasterMode = new KToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, TQT_TQOBJECT(this), + m_tabMasterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, TQT_TQOBJECT(this), TQT_SLOT( slotTabToggleMasterMode() ), TQT_TQOBJECT(this)); m_tabMasterMode->plug(m_tabPopupMenu); @@ -834,7 +834,7 @@ void Konsole::makeGUI() m_tabPopupMenu->insertItem( SmallIconSet("colors"), i18n("Select &Tab Color..."), TQT_TQOBJECT(this), TQT_SLOT(slotTabSelectColor()) ); m_tabPopupMenu->insertSeparator(); - m_tabPopupTabsMenu = new KPopupMenu( m_tabPopupMenu ); + m_tabPopupTabsMenu = new TDEPopupMenu( m_tabPopupMenu ); m_tabPopupMenu->insertItem( i18n("Switch to Tab" ), m_tabPopupTabsMenu ); connect( m_tabPopupTabsMenu, TQT_SIGNAL( activated ( int ) ), TQT_SLOT( activateSession( int ) ) ); @@ -845,11 +845,11 @@ void Konsole::makeGUI() if (m_options) { // Fill tab bar context menu - m_tabbarPopupMenu = new KPopupMenu( this ); - KAcceleratorManager::manage( m_tabbarPopupMenu ); + m_tabbarPopupMenu = new TDEPopupMenu( this ); + TDEAcceleratorManager::manage( m_tabbarPopupMenu ); selectTabbar->plug(m_tabbarPopupMenu); - KSelectAction *viewOptions = new KSelectAction(TQT_TQOBJECT(this)); + TDESelectAction *viewOptions = new TDESelectAction(TQT_TQOBJECT(this)); viewOptions->setText(i18n("Tab &Options")); TQStringList options; options << i18n("&Text && Icons") << i18n("Text &Only") << i18n("&Icons Only"); @@ -859,12 +859,12 @@ void Konsole::makeGUI() connect(viewOptions, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotTabSetViewOptions(int))); slotTabSetViewOptions(m_tabViewMode); - KToggleAction *dynamicTabHideOption = new KToggleAction ( i18n( "&Dynamic Hide" ), 0, TQT_TQOBJECT(this), + TDEToggleAction *dynamicTabHideOption = new TDEToggleAction ( i18n( "&Dynamic Hide" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotTabbarToggleDynamicHide() ), TQT_TQOBJECT(this)); dynamicTabHideOption->setChecked(b_dynamicTabHide); dynamicTabHideOption->plug(m_tabbarPopupMenu); - KToggleAction *m_autoResizeTabs = new KToggleAction( i18n("&Auto Resize Tabs"), + TDEToggleAction *m_autoResizeTabs = new TDEToggleAction( i18n("&Auto Resize Tabs"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleAutoResizeTabs() ), TQT_TQOBJECT(this)); m_autoResizeTabs->setChecked(b_autoResizeTabs); m_autoResizeTabs->plug(m_tabbarPopupMenu); @@ -918,7 +918,7 @@ void Konsole::makeTabWidget() else tabwidget->setTabPosition(TQTabWidget::Bottom); - KAcceleratorManager::setNoAccel( tabwidget ); + TDEAcceleratorManager::setNoAccel( tabwidget ); connect(tabwidget, TQT_SIGNAL(movedTab(int,int)), TQT_SLOT(slotMovedTab(int,int))); connect(tabwidget, TQT_SIGNAL(mouseDoubleClick(TQWidget*)), TQT_SLOT(slotRenameSession())); @@ -979,24 +979,24 @@ bool Konsole::eventFilter( TQObject *o, TQEvent *ev ) return true; } } - return KMainWindow::eventFilter(o, ev); + return TDEMainWindow::eventFilter(o, ev); } void Konsole::makeBasicGUI() { if (kapp->authorize("shell_access")) { - m_tabbarSessionsCommands = new KPopupMenu( this ); - KAcceleratorManager::manage( m_tabbarSessionsCommands ); + m_tabbarSessionsCommands = new TDEPopupMenu( this ); + TDEAcceleratorManager::manage( m_tabbarSessionsCommands ); connect(m_tabbarSessionsCommands, TQT_SIGNAL(activated(int)), TQT_SLOT(newSessionTabbar(int))); } - m_session = new KPopupMenu(this); - KAcceleratorManager::manage( m_session ); - m_edit = new KPopupMenu(this); - KAcceleratorManager::manage( m_edit ); - m_view = new KPopupMenu(this); - KAcceleratorManager::manage( m_view ); - if (kapp->authorizeKAction("bookmarks")) + m_session = new TDEPopupMenu(this); + TDEAcceleratorManager::manage( m_session ); + m_edit = new TDEPopupMenu(this); + TDEAcceleratorManager::manage( m_edit ); + m_view = new TDEPopupMenu(this); + TDEAcceleratorManager::manage( m_view ); + if (kapp->authorizeTDEAction("bookmarks")) { bookmarkHandler = new KonsoleBookmarkHandler( this, true ); m_bookmarks = bookmarkHandler->menu(); @@ -1004,20 +1004,20 @@ void Konsole::makeBasicGUI() bookmarks_menu_check(); } - if (kapp->authorizeKAction("settings")) { - m_options = new KPopupMenu(this); - KAcceleratorManager::manage( m_options ); + if (kapp->authorizeTDEAction("settings")) { + m_options = new TDEPopupMenu(this); + TDEAcceleratorManager::manage( m_options ); } - if (kapp->authorizeKAction("help")) + if (kapp->authorizeTDEAction("help")) m_help = helpMenu(0, false); - if (kapp->authorizeKAction("konsole_rmb")) { - m_rightButton = new KPopupMenu(this); - KAcceleratorManager::manage( m_rightButton ); + if (kapp->authorizeTDEAction("konsole_rmb")) { + m_rightButton = new TDEPopupMenu(this); + TDEAcceleratorManager::manage( m_rightButton ); } - if (kapp->authorizeKAction("bookmarks")) + if (kapp->authorizeTDEAction("bookmarks")) { // Bookmarks that open new sessions. bookmarkHandlerSession = new KonsoleBookmarkHandler( this, false ); @@ -1055,69 +1055,69 @@ void Konsole::makeBasicGUI() if (m_help) menubar->insertItem(i18n("Help"), m_help); - m_shortcuts = new KActionCollection(this); + m_shortcuts = new TDEActionCollection(this); - m_copyClipboard = new KAction(i18n("&Copy"), "editcopy", 0, TQT_TQOBJECT(this), + m_copyClipboard = new TDEAction(i18n("&Copy"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCopyClipboard()), m_shortcuts, "edit_copy"); - m_pasteClipboard = new KAction(i18n("&Paste"), "editpaste", Qt::SHIFT+Qt::Key_Insert, TQT_TQOBJECT(this), + m_pasteClipboard = new TDEAction(i18n("&Paste"), "editpaste", Qt::SHIFT+Qt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotPasteClipboard()), m_shortcuts, "edit_paste"); - m_pasteSelection = new KAction(i18n("Paste Selection"), Qt::CTRL+Qt::SHIFT+Qt::Key_Insert, TQT_TQOBJECT(this), + m_pasteSelection = new TDEAction(i18n("Paste Selection"), Qt::CTRL+Qt::SHIFT+Qt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotPasteSelection()), m_shortcuts, "pasteselection"); - m_clearTerminal = new KAction(i18n("C&lear Terminal"), 0, TQT_TQOBJECT(this), + m_clearTerminal = new TDEAction(i18n("C&lear Terminal"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotClearTerminal()), m_shortcuts, "clear_terminal"); - m_resetClearTerminal = new KAction(i18n("&Reset && Clear Terminal"), 0, TQT_TQOBJECT(this), + m_resetClearTerminal = new TDEAction(i18n("&Reset && Clear Terminal"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotResetClearTerminal()), m_shortcuts, "reset_clear_terminal"); - m_findHistory = new KAction(i18n("&Find in History..."), "find", 0, TQT_TQOBJECT(this), + m_findHistory = new TDEAction(i18n("&Find in History..."), "find", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFindHistory()), m_shortcuts, "find_history"); m_findHistory->setEnabled(b_histEnabled); - m_findNext = new KAction(i18n("Find &Next"), "next", 0, TQT_TQOBJECT(this), + m_findNext = new TDEAction(i18n("Find &Next"), "next", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFindNext()), m_shortcuts, "find_next"); m_findNext->setEnabled(b_histEnabled); - m_findPrevious = new KAction(i18n("Find Pre&vious"), "previous", 0, TQT_TQOBJECT(this), + m_findPrevious = new TDEAction(i18n("Find Pre&vious"), "previous", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFindPrevious()), m_shortcuts, "find_previous"); m_findPrevious->setEnabled( b_histEnabled ); - m_saveHistory = new KAction(i18n("S&ave History As..."), "filesaveas", 0, TQT_TQOBJECT(this), + m_saveHistory = new TDEAction(i18n("S&ave History As..."), "filesaveas", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveHistory()), m_shortcuts, "save_history"); m_saveHistory->setEnabled(b_histEnabled ); - m_clearHistory = new KAction(i18n("Clear &History"), "history_clear", 0, TQT_TQOBJECT(this), + m_clearHistory = new TDEAction(i18n("Clear &History"), "history_clear", 0, TQT_TQOBJECT(this), TQT_SLOT(slotClearHistory()), m_shortcuts, "clear_history"); m_clearHistory->setEnabled(b_histEnabled); - m_clearAllSessionHistories = new KAction(i18n("Clear All H&istories"), "history_clear", 0, + m_clearAllSessionHistories = new TDEAction(i18n("Clear All H&istories"), "history_clear", 0, TQT_TQOBJECT(this), TQT_SLOT(slotClearAllSessionHistories()), m_shortcuts, "clear_all_histories"); - m_detachSession = new KAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, TQT_TQOBJECT(this), + m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDetachSession()), m_shortcuts, "detach_session"); m_detachSession->setEnabled(false); - m_renameSession = new KAction(i18n("&Rename Session..."), Qt::CTRL+Qt::ALT+Qt::Key_S, TQT_TQOBJECT(this), + m_renameSession = new TDEAction(i18n("&Rename Session..."), Qt::CTRL+Qt::ALT+Qt::Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotRenameSession()), m_shortcuts, "rename_session"); - if (kapp->authorizeKAction("zmodem_upload")) - m_zmodemUpload = new KAction( i18n( "&ZModem Upload..." ), + if (kapp->authorizeTDEAction("zmodem_upload")) + m_zmodemUpload = new TDEAction( i18n( "&ZModem Upload..." ), Qt::CTRL+Qt::ALT+Qt::Key_U, TQT_TQOBJECT(this), TQT_SLOT( slotZModemUpload() ), m_shortcuts, "zmodem_upload" ); - monitorActivity = new KToggleAction ( i18n( "Monitor for &Activity" ), + monitorActivity = new TDEToggleAction ( i18n( "Monitor for &Activity" ), SmallIconSet("activity"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_activity" ); monitorActivity->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Activity" ) ) ); - monitorSilence = new KToggleAction ( i18n( "Monitor for &Silence" ), + monitorSilence = new TDEToggleAction ( i18n( "Monitor for &Silence" ), SmallIconSet("silence"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_silence" ); monitorSilence->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Silence" ) ) ); - masterMode = new KToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, TQT_TQOBJECT(this), + masterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleMasterMode() ), m_shortcuts, "send_input_to_all_sessions" ); - showMenubar = new KToggleAction ( i18n( "Show &Menubar" ), "showmenu", 0, TQT_TQOBJECT(this), + showMenubar = new TDEToggleAction ( i18n( "Show &Menubar" ), "showmenu", 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleMenubar() ), m_shortcuts, "show_menubar" ); showMenubar->setCheckedState( KGuiItem( i18n("Hide &Menubar"), "showmenu", TQString::null, TQString::null ) ); @@ -1125,7 +1125,7 @@ void Konsole::makeBasicGUI() connect( m_fullscreen,TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this),TQT_SLOT(updateFullScreen(bool))); m_fullscreen->setChecked(b_fullscreen); - m_saveProfile = new KAction( i18n( "Save Sessions &Profile..." ), SmallIconSet("filesaveas"), 0, TQT_TQOBJECT(this), + m_saveProfile = new TDEAction( i18n( "Save Sessions &Profile..." ), SmallIconSet("filesaveas"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveSessionsProfile() ), m_shortcuts, "save_sessions_profile" ); //help menu @@ -1134,37 +1134,37 @@ void Konsole::makeBasicGUI() // Don't steal F1 (handbook) accel (esp. since it not visible in // "Configure Shortcuts"). - m_closeSession = new KAction(i18n("C&lose Session"), "fileclose", 0, TQT_TQOBJECT(this), + m_closeSession = new TDEAction(i18n("C&lose Session"), "fileclose", 0, TQT_TQOBJECT(this), TQT_SLOT(confirmCloseCurrentSession()), m_shortcuts, "close_session"); - m_print = new KAction(i18n("&Print Screen..."), "fileprint", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPrint() ), m_shortcuts, "file_print"); - m_quit = new KAction(i18n("&Quit"), "exit", 0, TQT_TQOBJECT(this), TQT_SLOT( close() ), m_shortcuts, "file_quit"); + m_print = new TDEAction(i18n("&Print Screen..."), "fileprint", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPrint() ), m_shortcuts, "file_print"); + m_quit = new TDEAction(i18n("&Quit"), "exit", 0, TQT_TQOBJECT(this), TQT_SLOT( close() ), m_shortcuts, "file_quit"); - KShortcut shortcut(Qt::CTRL+Qt::ALT+Qt::Key_N); - shortcut.append(KShortcut(Qt::CTRL+Qt::SHIFT+Qt::Key_N)); - new KAction(i18n("New Session"), shortcut, TQT_TQOBJECT(this), TQT_SLOT(newSession()), m_shortcuts, "new_session"); - new KAction(i18n("Activate Menu"), Qt::CTRL+Qt::ALT+Qt::Key_M, TQT_TQOBJECT(this), TQT_SLOT(activateMenu()), m_shortcuts, "activate_menu"); - new KAction(i18n("List Sessions"), 0, TQT_TQOBJECT(this), TQT_SLOT(listSessions()), m_shortcuts, "list_sessions"); + TDEShortcut shortcut(Qt::CTRL+Qt::ALT+Qt::Key_N); + shortcut.append(TDEShortcut(Qt::CTRL+Qt::SHIFT+Qt::Key_N)); + new TDEAction(i18n("New Session"), shortcut, TQT_TQOBJECT(this), TQT_SLOT(newSession()), m_shortcuts, "new_session"); + new TDEAction(i18n("Activate Menu"), Qt::CTRL+Qt::ALT+Qt::Key_M, TQT_TQOBJECT(this), TQT_SLOT(activateMenu()), m_shortcuts, "activate_menu"); + new TDEAction(i18n("List Sessions"), 0, TQT_TQOBJECT(this), TQT_SLOT(listSessions()), m_shortcuts, "list_sessions"); - m_moveSessionLeft = new KAction(i18n("&Move Session Left"), TQApplication::reverseLayout() ? "forward" : "back", + m_moveSessionLeft = new TDEAction(i18n("&Move Session Left"), TQApplication::reverseLayout() ? "forward" : "back", TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Right : Qt::CTRL+Qt::SHIFT+Qt::Key_Left, TQT_TQOBJECT(this), TQT_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left"); - m_moveSessionRight = new KAction(i18n("M&ove Session Right"), TQApplication::reverseLayout() ? "back" : "forward", + m_moveSessionRight = new TDEAction(i18n("M&ove Session Right"), TQApplication::reverseLayout() ? "back" : "forward", TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Left : Qt::CTRL+Qt::SHIFT+Qt::Key_Right, TQT_TQOBJECT(this), TQT_SLOT(moveSessionRight()), m_shortcuts, "move_session_right"); - new KAction(i18n("Go to Previous Session"), TQApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Right : Qt::SHIFT+Qt::Key_Left, + new TDEAction(i18n("Go to Previous Session"), TQApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Right : Qt::SHIFT+Qt::Key_Left, TQT_TQOBJECT(this), TQT_SLOT(prevSession()), m_shortcuts, "previous_session"); - new KAction(i18n("Go to Next Session"), TQApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Left : Qt::SHIFT+Qt::Key_Right, + new TDEAction(i18n("Go to Next Session"), TQApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Left : Qt::SHIFT+Qt::Key_Right, TQT_TQOBJECT(this), TQT_SLOT(nextSession()), m_shortcuts, "next_session"); for (int i=1;i<13;i++) { // Due to 12 function keys? - new KAction(i18n("Switch to Session %1").arg(i), 0, TQT_TQOBJECT(this), TQT_SLOT(switchToSession()), m_shortcuts, TQString(TQString().sprintf("switch_to_session_%02d", i)).latin1()); + new TDEAction(i18n("Switch to Session %1").arg(i), 0, TQT_TQOBJECT(this), TQT_SLOT(switchToSession()), m_shortcuts, TQString(TQString().sprintf("switch_to_session_%02d", i)).latin1()); } - new KAction(i18n("Enlarge Font"), 0, TQT_TQOBJECT(this), TQT_SLOT(biggerFont()), m_shortcuts, "bigger_font"); - new KAction(i18n("Shrink Font"), 0, TQT_TQOBJECT(this), TQT_SLOT(smallerFont()), m_shortcuts, "smaller_font"); + new TDEAction(i18n("Enlarge Font"), 0, TQT_TQOBJECT(this), TQT_SLOT(biggerFont()), m_shortcuts, "bigger_font"); + new TDEAction(i18n("Shrink Font"), 0, TQT_TQOBJECT(this), TQT_SLOT(smallerFont()), m_shortcuts, "smaller_font"); - new KAction(i18n("Toggle Bidi"), Qt::CTRL+Qt::ALT+Qt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi"); + new TDEAction(i18n("Toggle Bidi"), Qt::CTRL+Qt::ALT+Qt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi"); // Should we load all *.desktop files now? Required for Session shortcuts. if ( TDEConfigGroup(TDEGlobal::config(), "General").readBoolEntry("SessionShortcutsEnabled", false) ) { @@ -1174,8 +1174,8 @@ void Konsole::makeBasicGUI() } m_shortcuts->readShortcutSettings(); - m_sessionList = new KPopupMenu(this); - KAcceleratorManager::manage( m_sessionList ); + m_sessionList = new TDEPopupMenu(this); + TDEAcceleratorManager::manage( m_sessionList ); connect(m_sessionList, TQT_SIGNAL(activated(int)), TQT_SLOT(activateSession(int))); } @@ -1303,7 +1303,7 @@ void Konsole::configureRequest(TEWidget* _te, int state, int x, int y) { if (!m_menuCreated) makeGUI(); - KPopupMenu *menu = (state & ControlButton) ? m_session : m_rightButton; + TDEPopupMenu *menu = (state & ControlButton) ? m_session : m_rightButton; if (menu) menu->popup(_te->mapToGlobal(TQPoint(x,y))); } @@ -1716,7 +1716,7 @@ void Konsole::bookmarks_menu_check() if ( se ) state = !(se->getCwd().isEmpty()); - KAction *addBookmark = actionCollection()->action( "add_bookmark" ); + TDEAction *addBookmark = actionCollection()->action( "add_bookmark" ); if ( !addBookmark ) { return; @@ -1804,7 +1804,7 @@ void Konsole::checkBitmapFonts() } // In KDE 3.5, Konsole only allows the user to pick a font via -// KFontDialog. This causes problems with the bdf/pcf files +// TDEFontDialog. This causes problems with the bdf/pcf files // distributed with Konsole (console8x16 and 9x15). void Konsole::slotInstallBitmapFonts() { @@ -1858,7 +1858,7 @@ void Konsole::slotSelectFont() { if ( !se ) return; TQFont font = se->widget()->getVTFont(); - if ( KFontDialog::getFont( font, true ) != TQDialog::Accepted ) + if ( TDEFontDialog::getFont( font, true ) != TQDialog::Accepted ) return; se->widget()->setVTFont( font ); @@ -2034,7 +2034,7 @@ void Konsole::slotConfigureKeys() for ( uint i = 0; i < m_shortcuts->count(); i++ ) { - KShortcut shortcut = (m_shortcuts->action( i ))->shortcut(); + TDEShortcut shortcut = (m_shortcuts->action( i ))->shortcut(); for( uint j = 0; j < shortcut.count(); j++) { const KKey &key = shortcut.seq(j).key(0); // First Key of KeySequence @@ -2095,11 +2095,11 @@ void Konsole::reparseConfiguration() sl_sessionShortCuts.clear(); buildSessionMenus(); - // FIXME: Should be a better way to traverse KActionCollection + // FIXME: Should be a better way to traverse TDEActionCollection uint count = m_shortcuts->count(); for ( uint i = 0; i < count; i++ ) { - KAction* action = m_shortcuts->action( i ); + TDEAction* action = m_shortcuts->action( i ); bool b_foundSession = false; if ( TQString(action->name()).startsWith("SSC_") ) { TQString name = TQString(action->name()); @@ -2112,7 +2112,7 @@ void Konsole::reparseConfiguration() } } if ( ! b_foundSession ) { - action->setShortcut( KShortcut() ); // Clear shortcut + action->setShortcut( TDEShortcut() ); // Clear shortcut m_shortcuts->writeShortcutSettings(); delete action; // Remove Action and Accel if ( i == 0 ) i = 0; // Reset index @@ -2233,7 +2233,7 @@ void Konsole::updateTitle(TESession* _se) } tabwidget->setTabIconSet(_se->widget(), iconSetForSession(_se)); TQString icon = _se->IconName(); - KRadioAction *ra = session2action.find(_se); + TDERadioAction *ra = session2action.find(_se); if (ra && (ra->icon() != icon)) ra->setIcon(icon); if (m_tabViewMode == ShowIconOnly) @@ -2424,7 +2424,7 @@ void Konsole::sendSignal(int sn) void Konsole::runSession(TESession* s) { - KRadioAction *ra = session2action.find(s); + TDERadioAction *ra = session2action.find(s); ra->setChecked(true); activateSession(s); @@ -2460,7 +2460,7 @@ void Konsole::addSession(TESession* s) s->setTitle(newTitle); // create an action for the session - KRadioAction *ra = new KRadioAction(newTitle.replace('&',"&&"), + TDERadioAction *ra = new TDERadioAction(newTitle.replace('&',"&&"), s->IconName(), 0, TQT_TQOBJECT(this), @@ -2561,7 +2561,7 @@ void Konsole::activateSession() TQPtrDictIterator<TESession> it( action2session ); // iterator for dict while ( it.current() ) { - KRadioAction *ra = (KRadioAction*)it.currentKey(); + TDERadioAction *ra = (TDERadioAction*)it.currentKey(); if (ra->isChecked()) { s = it.current(); break; } ++it; } @@ -2596,7 +2596,7 @@ void Konsole::activateSession(TESession *s) // only 2 sessions opened, 2nd session viewable, right-click on 1st tab and // select 'Detach', close original Konsole window... crash // s is not set properly on original Konsole window - KRadioAction *ra = session2action.find(se); + TDERadioAction *ra = session2action.find(se); if (!ra) { se=sessions.first(); // Get new/correct TESession ra = session2action.find(se); @@ -3036,7 +3036,7 @@ void Konsole::doneSession(TESession* s) if (se_previous) activateSession(se_previous); - KRadioAction *ra = session2action.find(s); + TDERadioAction *ra = session2action.find(s); ra->unplug(m_view); tabwidget->removePage( s->widget() ); if (rootxpms[s->widget()]) { @@ -3119,7 +3119,7 @@ void Konsole::slotMovedTab(int from, int to) sessions.remove(_se); sessions.insert(to,_se); - KRadioAction *ra = session2action.find(_se); + TDERadioAction *ra = session2action.find(_se); ra->unplug(m_view); ra->plug(m_view,(m_view->count()-sessions.count()+1)+to); @@ -3142,7 +3142,7 @@ void Konsole::moveSessionLeft() sessions.remove(position); sessions.insert(position-1,se); - KRadioAction *ra = session2action.find(se); + TDERadioAction *ra = session2action.find(se); ra->unplug(m_view); ra->plug(m_view,(m_view->count()-sessions.count()+1)+position-1); @@ -3175,7 +3175,7 @@ void Konsole::moveSessionRight() sessions.remove(position); sessions.insert(position+1,se); - KRadioAction *ra = session2action.find(se); + TDERadioAction *ra = session2action.find(se); ra->unplug(m_view); ra->plug(m_view,(m_view->count()-sessions.count()+1)+position+1); @@ -3319,7 +3319,7 @@ void Konsole::buildSessionMenus() createSessionMenus(); - if (kapp->authorizeKAction("file_print")) + if (kapp->authorizeTDEAction("file_print")) { m_session->insertSeparator(); m_print->plug(m_session); @@ -3332,7 +3332,7 @@ void Konsole::buildSessionMenus() m_quit->plug(m_session); } -static void insertItemSorted(KPopupMenu *menu, const TQIconSet &iconSet, const TQString &txt, int id) +static void insertItemSorted(TDEPopupMenu *menu, const TQIconSet &iconSet, const TQString &txt, int id) { const int defaultId = SESSION_NEW_SHELL_ID; // The id of the 'new' item. int index = menu->indexOf(defaultId); @@ -3402,11 +3402,11 @@ void Konsole::addSessionCommand(const TQString &path) sl_sessionShortCuts << name; // Is there already this shortcut? - KAction* sessionAction; + TDEAction* sessionAction; if ( m_shortcuts->action( name.latin1() ) ) { sessionAction = m_shortcuts->action( name.latin1() ); } else { - sessionAction = new KAction( comment, 0, TQT_TQOBJECT(this), 0, m_shortcuts, name.latin1() ); + sessionAction = new TDEAction( comment, 0, TQT_TQOBJECT(this), 0, m_shortcuts, name.latin1() ); } connect( sessionAction, TQT_SIGNAL( activated() ), sessionNumberMapper, TQT_SLOT( map() ) ); sessionNumberMapper->setMapping( sessionAction, cmd_serial ); @@ -3660,7 +3660,7 @@ void Konsole::slotDetachSession() void Konsole::detachSession(TESession* _se) { if (!_se) _se=se; - KRadioAction *ra = session2action.find(_se); + TDERadioAction *ra = session2action.find(_se); ra->unplug(m_view); TEWidget* se_widget = _se->widget(); session2action.remove(_se); @@ -3764,7 +3764,7 @@ void Konsole::attachSession(TESession* session) } TQString title=session->Title(); - KRadioAction *ra = new KRadioAction(title.replace('&',"&&"), session->IconName(), + TDERadioAction *ra = new TDERadioAction(title.replace('&',"&&"), session->IconName(), 0, TQT_TQOBJECT(this), TQT_SLOT(activateSession()), m_shortcuts); ra->setExclusiveGroup("sessions"); @@ -3824,7 +3824,7 @@ void Konsole::slotRenameSession() { void Konsole::slotRenameSession(TESession* ses, const TQString &name) { - KRadioAction *ra = session2action.find(ses); + TDERadioAction *ra = session2action.find(ses); TQString title=name; title=title.replace('&',"&&"); ra->setText(title); diff --git a/konsole/konsole/konsole.h b/konsole/konsole/konsole.h index d64c30968..c5c77d0c8 100644 --- a/konsole/konsole/konsole.h +++ b/konsole/konsole/konsole.h @@ -54,11 +54,11 @@ class KRootPixmap; class TQLabel; class TQCheckBox; class KonsoleFind; -class KPopupMenu; -class KAction; -class KToggleAction; -class KSelectAction; -class KRadioAction; +class TDEPopupMenu; +class TDEAction; +class TDEToggleAction; +class TDESelectAction; +class TDERadioAction; class KTabWidget; class TQToolButton; class KURIFilterData; @@ -66,7 +66,7 @@ class KURIFilterData; // Defined in main.C const char *konsole_shell(TQStrList &args); -class Konsole : public KMainWindow, virtual public KonsoleIface +class Konsole : public TDEMainWindow, virtual public KonsoleIface { Q_OBJECT @@ -292,7 +292,7 @@ private: TQPtrList<TEWidget> activeTEs(); TQPtrDict<TESession> action2session; - TQPtrDict<KRadioAction> session2action; + TQPtrDict<TDERadioAction> session2action; TQPtrList<TESession> sessions; TQIntDict<KSimpleConfig> no2command; //QT4 - convert to QList @@ -314,61 +314,61 @@ private: KMenuBar* menubar; KStatusBar* statusbar; - KPopupMenu* m_session; - KPopupMenu* m_edit; - KPopupMenu* m_view; - KPopupMenu* m_bookmarks; - KPopupMenu* m_bookmarksSession; - KPopupMenu* m_options; - KPopupMenu* m_schema; - KPopupMenu* m_keytab; - KPopupMenu* m_tabbarSessionsCommands; - KPopupMenu* m_signals; - KPopupMenu* m_help; - KPopupMenu* m_rightButton; - KPopupMenu* m_sessionList; - KPopupMenu* m_tabPopupMenu; - KPopupMenu* m_tabPopupTabsMenu; - KPopupMenu* m_tabbarPopupMenu; - - KAction *m_zmodemUpload; - KToggleAction *monitorActivity, *m_tabMonitorActivity; - KToggleAction *monitorSilence, *m_tabMonitorSilence; - KToggleAction *masterMode, *m_tabMasterMode; - KToggleAction *showMenubar; - KToggleAction *m_fullscreen; - - KSelectAction *selectSize; - KSelectAction *selectFont; - KSelectAction *selectScrollbar; - KSelectAction *selectTabbar; - KSelectAction *selectBell; - KSelectAction *selectSetEncoding; - - KAction *m_clearHistory; - KAction *m_findHistory; - KAction *m_findNext; - KAction *m_findPrevious; - KAction *m_saveHistory; - KAction *m_detachSession; - KAction *m_moveSessionLeft; - KAction *m_moveSessionRight; - - KAction *m_copyClipboard; - KAction *m_pasteClipboard; - KAction *m_pasteSelection; - KAction *m_clearTerminal; - KAction *m_resetClearTerminal; - KAction *m_clearAllSessionHistories; - KAction *m_renameSession; - KAction *m_saveProfile; - KAction *m_closeSession; - KAction *m_print; - KAction *m_quit; - KAction *m_tabDetachSession; - KPopupMenu *m_openSelection; - - KActionCollection *m_shortcuts; + TDEPopupMenu* m_session; + TDEPopupMenu* m_edit; + TDEPopupMenu* m_view; + TDEPopupMenu* m_bookmarks; + TDEPopupMenu* m_bookmarksSession; + TDEPopupMenu* m_options; + TDEPopupMenu* m_schema; + TDEPopupMenu* m_keytab; + TDEPopupMenu* m_tabbarSessionsCommands; + TDEPopupMenu* m_signals; + TDEPopupMenu* m_help; + TDEPopupMenu* m_rightButton; + TDEPopupMenu* m_sessionList; + TDEPopupMenu* m_tabPopupMenu; + TDEPopupMenu* m_tabPopupTabsMenu; + TDEPopupMenu* m_tabbarPopupMenu; + + TDEAction *m_zmodemUpload; + TDEToggleAction *monitorActivity, *m_tabMonitorActivity; + TDEToggleAction *monitorSilence, *m_tabMonitorSilence; + TDEToggleAction *masterMode, *m_tabMasterMode; + TDEToggleAction *showMenubar; + TDEToggleAction *m_fullscreen; + + TDESelectAction *selectSize; + TDESelectAction *selectFont; + TDESelectAction *selectScrollbar; + TDESelectAction *selectTabbar; + TDESelectAction *selectBell; + TDESelectAction *selectSetEncoding; + + TDEAction *m_clearHistory; + TDEAction *m_findHistory; + TDEAction *m_findNext; + TDEAction *m_findPrevious; + TDEAction *m_saveHistory; + TDEAction *m_detachSession; + TDEAction *m_moveSessionLeft; + TDEAction *m_moveSessionRight; + + TDEAction *m_copyClipboard; + TDEAction *m_pasteClipboard; + TDEAction *m_pasteSelection; + TDEAction *m_clearTerminal; + TDEAction *m_resetClearTerminal; + TDEAction *m_clearAllSessionHistories; + TDEAction *m_renameSession; + TDEAction *m_saveProfile; + TDEAction *m_closeSession; + TDEAction *m_print; + TDEAction *m_quit; + TDEAction *m_tabDetachSession; + TDEPopupMenu *m_openSelection; + + TDEActionCollection *m_shortcuts; KonsoleBookmarkHandler *bookmarkHandler; KonsoleBookmarkHandler *bookmarkHandlerSession; diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp index c20982ba2..ac0b65bf9 100644 --- a/konsole/konsole/konsole_part.cpp +++ b/konsole/konsole/konsole_part.cpp @@ -314,16 +314,16 @@ void konsolePart::emitOpenURLRequest(const TQString &cwd) void konsolePart::makeGUI() { - if (!kapp->authorizeKAction("konsole_rmb")) + if (!kapp->authorizeTDEAction("konsole_rmb")) return; - actions = new KActionCollection( (KMainWindow*)parentWidget ); - settingsActions = new KActionCollection( (KMainWindow*)parentWidget ); + actions = new TDEActionCollection( (TDEMainWindow*)parentWidget ); + settingsActions = new TDEActionCollection( (TDEMainWindow*)parentWidget ); // Send Signal Menu ------------------------------------------------------------- - if (kapp->authorizeKAction("send_signal")) + if (kapp->authorizeTDEAction("send_signal")) { - m_signals = new KPopupMenu((KMainWindow*)parentWidget); + m_signals = new TDEPopupMenu((TDEMainWindow*)parentWidget); m_signals->insertItem( i18n( "&Suspend Task" ) + " (STOP)", SIGSTOP); m_signals->insertItem( i18n( "&Continue Task" ) + " (CONT)", SIGCONT); m_signals->insertItem( i18n( "&Hangup" ) + " (HUP)", SIGHUP); @@ -336,12 +336,12 @@ void konsolePart::makeGUI() } // Settings Menu ---------------------------------------------------------------- - if (kapp->authorizeKAction("settings")) + if (kapp->authorizeTDEAction("settings")) { - m_options = new KPopupMenu((KMainWindow*)parentWidget); + m_options = new TDEPopupMenu((TDEMainWindow*)parentWidget); // Scrollbar - selectScrollbar = new KSelectAction(i18n("Sc&rollbar"), 0, this, + selectScrollbar = new TDESelectAction(i18n("Sc&rollbar"), 0, this, TQT_SLOT(slotSelectScrollbar()), settingsActions); TQStringList scrollitems; @@ -351,7 +351,7 @@ void konsolePart::makeGUI() // Select Bell m_options->insertSeparator(); - selectBell = new KSelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , this, + selectBell = new TDESelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , this, TQT_SLOT(slotSelectBell()), settingsActions, "bell"); TQStringList bellitems; @@ -362,14 +362,14 @@ void konsolePart::makeGUI() selectBell->setItems(bellitems); selectBell->plug(m_options); - m_fontsizes = new KActionMenu( i18n( "Font" ), SmallIconSet( "text" ), settingsActions, 0L ); - m_fontsizes->insert( new KAction( i18n( "&Enlarge Font" ), SmallIconSet( "viewmag+" ), 0, this, TQT_SLOT( biggerFont() ), settingsActions, "enlarge_font" ) ); - m_fontsizes->insert( new KAction( i18n( "&Shrink Font" ), SmallIconSet( "viewmag-" ), 0, this, TQT_SLOT( smallerFont() ), settingsActions, "shrink_font" ) ); - m_fontsizes->insert( new KAction( i18n( "Se&lect..." ), SmallIconSet( "font" ), 0, this, TQT_SLOT( slotSelectFont() ), settingsActions, "select_font" ) ); + m_fontsizes = new TDEActionMenu( i18n( "Font" ), SmallIconSet( "text" ), settingsActions, 0L ); + m_fontsizes->insert( new TDEAction( i18n( "&Enlarge Font" ), SmallIconSet( "viewmag+" ), 0, this, TQT_SLOT( biggerFont() ), settingsActions, "enlarge_font" ) ); + m_fontsizes->insert( new TDEAction( i18n( "&Shrink Font" ), SmallIconSet( "viewmag-" ), 0, this, TQT_SLOT( smallerFont() ), settingsActions, "shrink_font" ) ); + m_fontsizes->insert( new TDEAction( i18n( "Se&lect..." ), SmallIconSet( "font" ), 0, this, TQT_SLOT( slotSelectFont() ), settingsActions, "select_font" ) ); m_fontsizes->plug(m_options); // encoding menu, start with default checked ! - selectSetEncoding = new KSelectAction( i18n( "&Encoding" ), SmallIconSet("charset" ), 0, this, TQT_SLOT(slotSetEncoding()), settingsActions, "set_encoding" ); + selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet("charset" ), 0, this, TQT_SLOT(slotSetEncoding()), settingsActions, "set_encoding" ); TQStringList list = TDEGlobal::charsets()->descriptiveEncodingNames(); list.prepend( i18n( "Default" ) ); selectSetEncoding->setItems(list); @@ -377,18 +377,18 @@ void konsolePart::makeGUI() selectSetEncoding->plug(m_options); // Keyboard Options Menu --------------------------------------------------- - if (kapp->authorizeKAction("keyboard")) + if (kapp->authorizeTDEAction("keyboard")) { - m_keytab = new KPopupMenu((KMainWindow*)parentWidget); + m_keytab = new TDEPopupMenu((TDEMainWindow*)parentWidget); m_keytab->setCheckable(true); connect(m_keytab, TQT_SIGNAL(activated(int)), TQT_SLOT(keytab_menu_activated(int))); m_options->insertItem( SmallIconSet( "key_bindings" ), i18n( "&Keyboard" ), m_keytab ); } // Schema Options Menu ----------------------------------------------------- - if (kapp->authorizeKAction("schema")) + if (kapp->authorizeTDEAction("schema")) { - m_schema = new KPopupMenu((KMainWindow*)parentWidget); + m_schema = new TDEPopupMenu((TDEMainWindow*)parentWidget); m_schema->setCheckable(true); connect(m_schema, TQT_SIGNAL(activated(int)), TQT_SLOT(schema_menu_activated(int))); connect(m_schema, TQT_SIGNAL(aboutToShow()), TQT_SLOT(schema_menu_check())); @@ -396,13 +396,13 @@ void konsolePart::makeGUI() } - KAction *historyType = new KAction(i18n("&History..."), "history", 0, this, + TDEAction *historyType = new TDEAction(i18n("&History..."), "history", 0, this, TQT_SLOT(slotHistoryType()), settingsActions, "history"); historyType->plug(m_options); m_options->insertSeparator(); // Select line spacing - selectLineSpacing = new KSelectAction(i18n("Li&ne Spacing"), + selectLineSpacing = new TDESelectAction(i18n("Li&ne Spacing"), SmallIconSet("leftjust"), 0, this, TQT_SLOT(slotSelectLineSpacing()), settingsActions ); @@ -421,30 +421,30 @@ void konsolePart::makeGUI() selectLineSpacing->plug(m_options); // Blinking Cursor - blinkingCursor = new KToggleAction (i18n("Blinking &Cursor"), + blinkingCursor = new TDEToggleAction (i18n("Blinking &Cursor"), 0, this,TQT_SLOT(slotBlinkingCursor()), settingsActions); blinkingCursor->plug(m_options); // Frame on/off - showFrame = new KToggleAction(i18n("Show Fr&ame"), 0, + showFrame = new TDEToggleAction(i18n("Show Fr&ame"), 0, this, TQT_SLOT(slotToggleFrame()), settingsActions); showFrame->setCheckedState(i18n("Hide Fr&ame")); showFrame->plug(m_options); // Word Connectors - KAction *WordSeps = new KAction(i18n("Wor&d Connectors..."), 0, this, + TDEAction *WordSeps = new TDEAction(i18n("Wor&d Connectors..."), 0, this, TQT_SLOT(slotWordSeps()), settingsActions); WordSeps->plug(m_options); // Use Konsole's Settings m_options->insertSeparator(); - m_useKonsoleSettings = new KToggleAction( i18n("&Use Konsole's Settings"), + m_useKonsoleSettings = new TDEToggleAction( i18n("&Use Konsole's Settings"), 0, this, TQT_SLOT(slotUseKonsoleSettings()), 0, "use_konsole_settings" ); m_useKonsoleSettings->plug(m_options); // Save Settings m_options->insertSeparator(); - KAction *saveSettings = new KAction(i18n("&Save as Default"), "filesave", 0, this, + TDEAction *saveSettings = new TDEAction(i18n("&Save as Default"), "filesave", 0, this, TQT_SLOT(saveProperties()), actions, "save_default"); saveSettings->plug(m_options); if (TDEGlobalSettings::insertTearOffHandle()) @@ -452,16 +452,16 @@ void konsolePart::makeGUI() } // Popup Menu ------------------------------------------------------------------- - m_popupMenu = new KPopupMenu((KMainWindow*)parentWidget); - KAction* selectionEnd = new KAction(i18n("Set Selection End"), 0, TQT_TQOBJECT(te), + m_popupMenu = new TDEPopupMenu((TDEMainWindow*)parentWidget); + TDEAction* selectionEnd = new TDEAction(i18n("Set Selection End"), 0, TQT_TQOBJECT(te), TQT_SLOT(setSelectionEnd()), actions, "selection_end"); selectionEnd->plug(m_popupMenu); - KAction *copyClipboard = new KAction(i18n("&Copy"), "editcopy", 0, + TDEAction *copyClipboard = new TDEAction(i18n("&Copy"), "editcopy", 0, TQT_TQOBJECT(te), TQT_SLOT(copyClipboard()), actions, "edit_copy"); copyClipboard->plug(m_popupMenu); - KAction *pasteClipboard = new KAction(i18n("&Paste"), "editpaste", 0, + TDEAction *pasteClipboard = new TDEAction(i18n("&Paste"), "editpaste", 0, TQT_TQOBJECT(te), TQT_SLOT(pasteClipboard()), actions, "edit_paste"); pasteClipboard->plug(m_popupMenu); @@ -477,7 +477,7 @@ void konsolePart::makeGUI() m_popupMenu->insertSeparator(); } - KAction *closeSession = new KAction(i18n("&Close Terminal Emulator"), "fileclose", 0, this, + TDEAction *closeSession = new TDEAction(i18n("&Close Terminal Emulator"), "fileclose", 0, this, TQT_SLOT(closeCurrentSession()), actions, "close_session"); closeSession->plug(m_popupMenu); if (TDEGlobalSettings::insertTearOffHandle()) @@ -676,7 +676,7 @@ void konsolePart::slotSelectFont() { if ( !se ) return; TQFont font = se->widget()->getVTFont(); - if ( KFontDialog::getFont( font, true ) != TQDialog::Accepted ) + if ( TDEFontDialog::getFont( font, true ) != TQDialog::Accepted ) return; se->widget()->setVTFont( font ); @@ -859,7 +859,7 @@ void konsolePart::pixmap_menu_activated(int item) void konsolePart::slotHistoryType() { if ( ! se ) return; - HistoryTypeDialog dlg(se->history(), m_histSize, (KMainWindow*)parentWidget); + HistoryTypeDialog dlg(se->history(), m_histSize, (TDEMainWindow*)parentWidget); if (dlg.exec()) { if (dlg.isOn()) { if (dlg.nbLines() > 0) { diff --git a/konsole/konsole/konsole_part.h b/konsole/konsole/konsole_part.h index a8dfde83a..1fd2ac95f 100644 --- a/konsole/konsole/konsole_part.h +++ b/konsole/konsole/konsole_part.h @@ -36,12 +36,12 @@ class TDEInstance; class konsoleBrowserExtension; class TQPushButton; class TQSpinBox; -class KPopupMenu; -class KActionMenu; +class TDEPopupMenu; +class TDEActionMenu; class TQCheckBox; class KRootPixmap; -class KToggleAction; -class KSelectAction; +class TDEToggleAction; +class TDESelectAction; namespace KParts { class GUIActivateEvent; } @@ -146,25 +146,25 @@ signals: ColorSchemaList* colors; KRootPixmap* rootxpm; - KActionCollection* actions; - KActionCollection* settingsActions; + TDEActionCollection* actions; + TDEActionCollection* settingsActions; - KToggleAction* blinkingCursor; - KToggleAction* showFrame; - KToggleAction* m_useKonsoleSettings; + TDEToggleAction* blinkingCursor; + TDEToggleAction* showFrame; + TDEToggleAction* m_useKonsoleSettings; - KSelectAction* selectBell; - KSelectAction* selectLineSpacing; - KSelectAction* selectScrollbar; - KSelectAction* selectSetEncoding; + TDESelectAction* selectBell; + TDESelectAction* selectLineSpacing; + TDESelectAction* selectScrollbar; + TDESelectAction* selectSetEncoding; - KActionMenu* m_fontsizes; + TDEActionMenu* m_fontsizes; - KPopupMenu* m_keytab; - KPopupMenu* m_schema; - KPopupMenu* m_signals; - KPopupMenu* m_options; - KPopupMenu* m_popupMenu; + TDEPopupMenu* m_keytab; + TDEPopupMenu* m_schema; + TDEPopupMenu* m_signals; + TDEPopupMenu* m_options; + TDEPopupMenu* m_popupMenu; TQFont defaultFont; diff --git a/konsole/konsole/konsolebookmarkhandler.cpp b/konsole/konsole/konsolebookmarkhandler.cpp index e348e440e..4f2dca845 100644 --- a/konsole/konsole/konsolebookmarkhandler.cpp +++ b/konsole/konsole/konsolebookmarkhandler.cpp @@ -35,7 +35,7 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( Konsole *konsole, bool toplevel KBookmarkOwner(), m_konsole( konsole ) { - m_menu = new KPopupMenu( konsole, "bookmark menu" ); + m_menu = new TDEPopupMenu( konsole, "bookmark menu" ); // KDE3.5 - Konsole's bookmarks are now in konsole/bookmarks.xml // TODO: Consider removing for KDE4 diff --git a/konsole/konsole/konsolebookmarkhandler.h b/konsole/konsole/konsolebookmarkhandler.h index 5f99dfb31..66680e095 100644 --- a/konsole/konsole/konsolebookmarkhandler.h +++ b/konsole/konsole/konsolebookmarkhandler.h @@ -24,7 +24,7 @@ #include <kbookmarkmanager.h> #include "konsolebookmarkmenu.h" -class KPopupMenu; +class TDEPopupMenu; class KonsoleBookmarkMenu; class KBookmarkManager; @@ -44,7 +44,7 @@ public: virtual TQString currentURL() const; virtual TQString currentTitle() const; - KPopupMenu *menu() const { return m_menu; } + TDEPopupMenu *menu() const { return m_menu; } private slots: void slotBookmarksChanged( const TQString &, const TQString & caller ); @@ -54,7 +54,7 @@ signals: private: Konsole *m_konsole; - KPopupMenu *m_menu; + TDEPopupMenu *m_menu; KonsoleBookmarkMenu *m_bookmarkMenu; TQString m_file; }; diff --git a/konsole/konsole/konsolebookmarkmenu.cpp b/konsole/konsole/konsolebookmarkmenu.cpp index fd2cc9f1b..0aae87d7a 100644 --- a/konsole/konsole/konsolebookmarkmenu.cpp +++ b/konsole/konsole/konsolebookmarkmenu.cpp @@ -25,8 +25,8 @@ #include "konsolebookmarkhandler.h" KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr, - KonsoleBookmarkHandler * _owner, KPopupMenu * _parentMenu, - KActionCollection *collec, bool _isRoot, bool _add, + KonsoleBookmarkHandler * _owner, TDEPopupMenu * _parentMenu, + TDEActionCollection *collec, bool _isRoot, bool _add, const TQString & parentAddress ) : KBookmarkMenu( mgr, _owner, _parentMenu, collec, _isRoot, _add, parentAddress), @@ -52,7 +52,7 @@ KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr, * * Why did I do this? * - when KBookmarkMenu::fillbBookmarkMenu() creates sub-KBookmarkMenus. - * - when ... adds KActions, it uses KBookmarkMenu::slotBookmarkSelected() + * - when ... adds TDEActions, it uses KBookmarkMenu::slotBookmarkSelected() * instead of KonsoleBookmarkMenu::slotBookmarkSelected(). */ void KonsoleBookmarkMenu::slotAboutToShow2() @@ -68,7 +68,7 @@ void KonsoleBookmarkMenu::slotAboutToShow2() void KonsoleBookmarkMenu::refill() { m_lstSubMenus.clear(); - TQPtrListIterator<KAction> it( m_actions ); + TQPtrListIterator<TDEAction> it( m_actions ); for (; it.current(); ++it ) it.current()->unplug( m_parentMenu ); m_parentMenu->clear(); @@ -112,7 +112,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() { // kdDebug(1203) << "Creating URL bookmark menu item for " << bm.text() << endl; // create a normal URL item, with ID as a name - KAction * action = new KAction( text, bm.icon(), 0, + TDEAction * action = new TDEAction( text, bm.icon(), 0, this, TQT_SLOT( slotBookmarkSelected() ), m_actionCollection, bm.url().url().utf8() ); @@ -125,7 +125,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() else { // kdDebug(1203) << "Creating bookmark submenu named " << bm.text() << endl; - KActionMenu * actionMenu = new KActionMenu( text, bm.icon(), + TDEActionMenu * actionMenu = new TDEActionMenu( text, bm.icon(), m_actionCollection, 0L ); actionMenu->plug( m_parentMenu ); m_actions.append( actionMenu ); @@ -150,7 +150,7 @@ void KonsoleBookmarkMenu::slotBookmarkSelected() { if ( !m_pOwner ) return; // this view doesn't handle bookmarks... m_kOwner->openBookmarkURL( TQString::fromUtf8(TQT_TQOBJECT_CONST(sender())->name()), /* URL */ - ( (KAction *)sender() )->text() /* Title */ ); + ( (TDEAction *)sender() )->text() /* Title */ ); } #include "konsolebookmarkmenu.moc" diff --git a/konsole/konsole/konsolebookmarkmenu.h b/konsole/konsole/konsolebookmarkmenu.h index 9d1454c2d..e1dfdacba 100644 --- a/konsole/konsole/konsolebookmarkmenu.h +++ b/konsole/konsole/konsolebookmarkmenu.h @@ -28,12 +28,12 @@ class TQString; class KBookmark; -class KAction; -class KActionMenu; -class KActionCollection; +class TDEAction; +class TDEActionMenu; +class TDEActionCollection; class KBookmarkOwner; class KBookmarkMenu; -class KPopupMenu; +class TDEPopupMenu; class KonsoleBookmarkMenu; class KonsoleBookmarkMenu : public KBookmarkMenu @@ -42,8 +42,8 @@ class KonsoleBookmarkMenu : public KBookmarkMenu public: KonsoleBookmarkMenu( KBookmarkManager* mgr, - KonsoleBookmarkHandler * _owner, KPopupMenu * _parentMenu, - KActionCollection *collec, bool _isRoot, + KonsoleBookmarkHandler * _owner, TDEPopupMenu * _parentMenu, + TDEActionCollection *collec, bool _isRoot, bool _add = true, const TQString & parentAddress = ""); void fillBookmarkMenu(); diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp index dc5431f4e..90144532a 100644 --- a/konsole/konsole/main.cpp +++ b/konsole/konsole/main.cpp @@ -412,7 +412,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) } } - if (!kapp->authorizeKAction("size")) + if (!kapp->authorizeTDEAction("size")) fixed_size = true; // /////////////////////////////////////////////// @@ -444,7 +444,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) // TODO: Session management stores everything in same group, // should use one group / mainwindow - while (KMainWindow::canBeRestored(n) || !profile.isEmpty()) + while (TDEMainWindow::canBeRestored(n) || !profile.isEmpty()) { sessionconfig->setGroup(TQString("%1").arg(n)); if (!sessionconfig->hasKey("Pgm0")) diff --git a/kpager/desktop.h b/kpager/desktop.h index 5a861c738..cff05594a 100644 --- a/kpager/desktop.h +++ b/kpager/desktop.h @@ -30,7 +30,7 @@ #include <twin.h> class TDESharedPixmap; -class KPopupMenu; +class TDEPopupMenu; class TQPainter; class TQPoint; diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp index e75f1a0f1..d689b7140 100644 --- a/kpager/kpager.cpp +++ b/kpager/kpager.cpp @@ -60,7 +60,7 @@ #include <assert.h> KPagerMainWindow::KPagerMainWindow(TQWidget *parent, const char *name) - : DCOPObject("KPagerIface"), KMainWindow(parent, name) + : DCOPObject("KPagerIface"), TDEMainWindow(parent, name) { m_reallyClose=false; @@ -144,7 +144,7 @@ bool KPagerMainWindow::queryClose() void KPagerMainWindow::showEvent( TQShowEvent *ev ) { timeout->stop(); - KMainWindow::showEvent(ev); + TDEMainWindow::showEvent(ev); } void KPagerMainWindow::reallyClose() @@ -319,7 +319,7 @@ void KPager::showPopupMenu( WId wid, TQPoint pos) m_winfo = KWin::windowInfo(wid); if (!m_mnu) { - m_mnu = new KPopupMenu(this); + m_mnu = new TDEPopupMenu(this); m_mnu->insertTitle( TQString::fromUtf8("KPager"), 1); m_mnu->setCheckable(true); diff --git a/kpager/kpager.h b/kpager/kpager.h index aa194b4df..b1d0dacf5 100644 --- a/kpager/kpager.h +++ b/kpager/kpager.h @@ -34,7 +34,7 @@ class KPager; class TQPopupMenu; -class KPagerMainWindow : public KMainWindow, public virtual KPagerIface +class KPagerMainWindow : public TDEMainWindow, public virtual KPagerIface { Q_OBJECT @@ -122,10 +122,10 @@ protected: LayoutTypes m_layoutType; class TQGridLayout *m_layout; - KPopupMenu *m_mnu; + TDEPopupMenu *m_mnu; TQPopupMenu *m_smnu, *m_dmnu; - KAction *m_quit_action; - KAction *m_prefs_action; + TDEAction *m_quit_action; + TDEAction *m_prefs_action; KWin::WindowInfo m_winfo; bool m_showStickyOption; // To be removed after the message freeze diff --git a/kpersonalizer/keyecandypagedlg.ui b/kpersonalizer/keyecandypagedlg.ui index 5301c118a..c6da0a6ac 100644 --- a/kpersonalizer/keyecandypagedlg.ui +++ b/kpersonalizer/keyecandypagedlg.ui @@ -210,7 +210,7 @@ If you have a fast, new processor, you might want to turn them all on, but for t <enum>Minimum</enum> </property> </spacer> - <widget class="KListView" row="5" column="1"> + <widget class="TDEListView" row="5" column="1"> <property name="name"> <cstring>klv_features</cstring> </property> diff --git a/kpersonalizer/kstylepagedlg.ui b/kpersonalizer/kstylepagedlg.ui index d7db08975..9a11887d3 100644 --- a/kpersonalizer/kstylepagedlg.ui +++ b/kpersonalizer/kstylepagedlg.ui @@ -89,7 +89,7 @@ <string>Preview</string> </property> </widget> - <widget class="KListView" row="1" column="1"> + <widget class="TDEListView" row="1" column="1"> <property name="name"> <cstring>klv_styles</cstring> </property> diff --git a/ksmserver/shutdowndlg.h b/ksmserver/shutdowndlg.h index 2f9dc85aa..c9f2f3fbd 100644 --- a/ksmserver/shutdowndlg.h +++ b/ksmserver/shutdowndlg.h @@ -25,7 +25,7 @@ class TQPopupMenu; class TQTimer; class TQPainter; class TQString; -class KAction; +class TDEAction; #include "timed.h" #include <kapplication.h> diff --git a/ksmserver/startupdlg.h b/ksmserver/startupdlg.h index b0e7840fa..3c895a5c2 100644 --- a/ksmserver/startupdlg.h +++ b/ksmserver/startupdlg.h @@ -24,7 +24,7 @@ class TQPopupMenu; class TQTimer; class TQPainter; class TQString; -class KAction; +class TDEAction; #include "timed.h" #include <kapplication.h> diff --git a/ksplashml/kcmksplash/installer.cpp b/ksplashml/kcmksplash/installer.cpp index 7a23b35a8..0cb2b3334 100644 --- a/ksplashml/kcmksplash/installer.cpp +++ b/ksplashml/kcmksplash/installer.cpp @@ -33,7 +33,7 @@ #include <tdeio/netaccess.h> ThemeListBox::ThemeListBox(TQWidget *parent) - : KListBox(parent) + : TDEListBox(parent) { setAcceptDrops(true); connect(this, TQT_SIGNAL(mouseButtonPressed(int, TQListBoxItem *, const TQPoint &)), @@ -81,7 +81,7 @@ void ThemeListBox::mouseMoveEvent(TQMouseEvent *e) d->dragCopy(); } } - KListBox::mouseMoveEvent(e); + TDEListBox::mouseMoveEvent(e); } //----------------------------------------------------------------------------- diff --git a/ksplashml/kcmksplash/installer.h b/ksplashml/kcmksplash/installer.h index ee3af491b..93d4bb76d 100644 --- a/ksplashml/kcmksplash/installer.h +++ b/ksplashml/kcmksplash/installer.h @@ -60,7 +60,7 @@ private: TQLabel *mPreview; }; -class ThemeListBox: public KListBox +class ThemeListBox: public TDEListBox { Q_OBJECT public: diff --git a/ksplashml/themeengine/redmond/themeredmond.h b/ksplashml/themeengine/redmond/themeredmond.h index c2ce0a6f3..d68e004da 100644 --- a/ksplashml/themeengine/redmond/themeredmond.h +++ b/ksplashml/themeengine/redmond/themeredmond.h @@ -18,7 +18,7 @@ #include <themeengine.h> -class KFontCombo; +class TDEFontCombo; class TQCheckBox; class CfgRedmond: public ThemeEngineConfig @@ -31,9 +31,9 @@ protected: TQCheckBox *mShowUsername; TQCheckBox *mShowIcon; TQCheckBox *mShowWelcome; - KFontCombo *mWelcomeFont; - KFontCombo *mUsernameFont; - KFontCombo *mActionFont; + TDEFontCombo *mWelcomeFont; + TDEFontCombo *mUsernameFont; + TDEFontCombo *mActionFont; }; class ObjKsTheme; diff --git a/ksysguard/gui/KSGAppletSettings.cc b/ksysguard/gui/KSGAppletSettings.cc index 5160dbddb..b11416866 100644 --- a/ksysguard/gui/KSGAppletSettings.cc +++ b/ksysguard/gui/KSGAppletSettings.cc @@ -67,7 +67,7 @@ KSGAppletSettings::KSGAppletSettings( TQWidget *parent, const char *name ) resize( TQSize( 250, 130 ).expandedTo( minimumSizeHint() ) ); - KAcceleratorManager::manage( page ); + TDEAcceleratorManager::manage( page ); } KSGAppletSettings::~KSGAppletSettings() diff --git a/ksysguard/gui/KSysGuardApplet.cc b/ksysguard/gui/KSysGuardApplet.cc index 6295ef652..eba27669d 100644 --- a/ksysguard/gui/KSysGuardApplet.cc +++ b/ksysguard/gui/KSysGuardApplet.cc @@ -203,7 +203,7 @@ void KSysGuardApplet::dropEvent( TQDropEvent *e ) int dock = findDock( e->pos() ); if ( mDockList[ dock ]->isA( TQFRAME_OBJECT_NAME_STRING ) ) { if ( sensorType == "integer" || sensorType == "float" ) { - KPopupMenu popup; + TDEPopupMenu popup; TQWidget *wdg = 0; popup.insertTitle( i18n( "Select Display Type" ) ); diff --git a/ksysguard/gui/SensorBrowser.cc b/ksysguard/gui/SensorBrowser.cc index 06cbc7507..c3c8bcb10 100644 --- a/ksysguard/gui/SensorBrowser.cc +++ b/ksysguard/gui/SensorBrowser.cc @@ -64,7 +64,7 @@ class HostItem : public TQListViewItem SensorBrowser::SensorBrowser( TQWidget* parent, KSGRD::SensorManager* sm, const char* name) - : KListView( parent, name ), mSensorManager( sm ) + : TDEListView( parent, name ), mSensorManager( sm ) { mHostInfoList.setAutoDelete(true); diff --git a/ksysguard/gui/SensorBrowser.h b/ksysguard/gui/SensorBrowser.h index 8794c4635..7545391ac 100644 --- a/ksysguard/gui/SensorBrowser.h +++ b/ksysguard/gui/SensorBrowser.h @@ -43,7 +43,7 @@ class HostInfo; * The SensorBrowser is the graphical front-end of the SensorManager. It * displays the currently available hosts and their sensors. */ -class SensorBrowser : public KListView, public KSGRD::SensorClient +class SensorBrowser : public TDEListView, public KSGRD::SensorClient { Q_OBJECT diff --git a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc index 1b97cc25f..c6ad058b3 100644 --- a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc +++ b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc @@ -162,7 +162,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name ) pageLayout = new TQGridLayout( page, 3, 2, 0, spacingHint() ); pageLayout->setRowStretch( 2, 1 ); - mSensorView = new KListView( page ); + mSensorView = new TDEListView( page ); mSensorView->addColumn( i18n( "Host" ) ); mSensorView->addColumn( i18n( "Sensor" ) ); mSensorView->addColumn( i18n( "Label" ) ); @@ -191,7 +191,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name ) connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editSensor() ) ); connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeSensor() ) ); - KAcceleratorManager::manage( this ); + TDEAcceleratorManager::manage( this ); mTitle->setFocus(); } diff --git a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.h b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.h index 5b268ad7f..aa9d580bd 100644 --- a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.h +++ b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.h @@ -30,7 +30,7 @@ class KColorButton; class KDoubleSpinBox; class KIntNumInput; class KLineEdit; -class KListView; +class TDEListView; class TQCheckBox; class TQListViewItem; @@ -94,7 +94,7 @@ class DancingBarsSettings : public KDialogBase KDoubleSpinBox *mLowerLimit; KDoubleSpinBox *mUpperLimit; KLineEdit *mTitle; - KListView *mSensorView; + TDEListView *mSensorView; KIntNumInput *mFontSize; TQCheckBox *mUseLowerLimit; diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc index 559d309c7..0c0ee3b7d 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc @@ -226,7 +226,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) pageLayout->setRowStretch( 2, 1 ); pageLayout->setRowStretch( 5, 1 ); - mSensorView = new KListView( page ); + mSensorView = new TDEListView( page ); mSensorView->addColumn("" , 0); mSensorView->addColumn( i18n( "Host" ) ); mSensorView->addColumn( i18n( "Sensor" ) ); @@ -282,7 +282,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) connect( mMoveDownButton, TQT_SIGNAL( clicked() ), TQT_SLOT( moveDownSensor() ) ); connect ( mSensorView, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int )), TQT_SLOT(editSensor())); - KAcceleratorManager::manage( this ); + TDEAcceleratorManager::manage( this ); } FancyPlotterSettings::~FancyPlotterSettings() diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h index 8b10abd8d..010b4938b 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h @@ -29,7 +29,7 @@ class KColorButton; class KIntNumInput; class KLineEdit; -class KListView; +class TDEListView; class TQCheckBox; class TQListViewItem; @@ -121,7 +121,7 @@ class FancyPlotterSettings : public KDialogBase KIntNumInput *mVerticalLinesDistance; KIntNumInput *mHorizontalLinesCount; KIntNumInput *mFontSize; - KListView *mSensorView; + TDEListView *mSensorView; TQCheckBox *mShowVerticalLines; TQCheckBox *mShowHorizontalLines; diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.cc b/ksysguard/gui/SensorDisplayLib/LogFile.cc index bb29af7a9..bae2d0e7c 100644 --- a/ksysguard/gui/SensorDisplayLib/LogFile.cc +++ b/ksysguard/gui/SensorDisplayLib/LogFile.cc @@ -115,7 +115,7 @@ void LogFile::settingsFontSelection() { TQFont tmpFont = lfs->fontButton->font(); - if (KFontDialog::getFont(tmpFont) == KFontDialog::Accepted) { + if (TDEFontDialog::getFont(tmpFont) == TDEFontDialog::Accepted) { lfs->fontButton->setFont(tmpFont); } } diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.cc b/ksysguard/gui/SensorDisplayLib/ProcessController.cc index 664870374..c7cfa0ca7 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessController.cc +++ b/ksysguard/gui/SensorDisplayLib/ProcessController.cc @@ -78,7 +78,7 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T pList = new ProcessList(this, "pList"); TQ_CHECK_PTR(pList); pList->setShowSortIndicator(true); - pListSearchLine = new KListViewSearchLineWidget(pList, this, "process_list_search_line"); + pListSearchLine = new TDEListViewSearchLineWidget(pList, this, "process_list_search_line"); gmSearch->addWidget(pListSearchLine, 1); connect(pList, TQT_SIGNAL(killProcess(int, int)), diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.h b/ksysguard/gui/SensorDisplayLib/ProcessController.h index 69445b91e..9df70cc3b 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessController.h +++ b/ksysguard/gui/SensorDisplayLib/ProcessController.h @@ -38,7 +38,7 @@ class TQHBoxLayout; class TQCheckBox; class TQComboBox; class KPushButton; -class KListViewSearchLineWidget; +class TDEListViewSearchLineWidget; extern TDEApplication* Kapp; @@ -133,7 +133,7 @@ private: ProcessList* pList; ///Layout for the search line and process filter combo box TQHBoxLayout* gmSearch; - KListViewSearchLineWidget *pListSearchLine; + TDEListViewSearchLineWidget *pListSearchLine; TQHBoxLayout* gm1; diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cc b/ksysguard/gui/SensorDisplayLib/ProcessList.cc index 4fd3e766e..507e57927 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc +++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cc @@ -101,7 +101,7 @@ int ProcessLVI::compare( TQListViewItem *item, int col, bool ascending ) const } ProcessList::ProcessList(TQWidget *parent, const char* name) - : KListView(parent, name) + : TDEListView(parent, name) { iconCache.setAutoDelete(true); @@ -952,7 +952,7 @@ ProcessList::keyPressEvent(TQKeyEvent *e) if (e->key() == Key_Control) { ctrlKeyDown = true; } - KListView::keyPressEvent(e); + TDEListView::keyPressEvent(e); } void @@ -964,7 +964,7 @@ ProcessList::keyReleaseEvent(TQKeyEvent *e) if (e->key() == Key_Control) { ctrlKeyDown = false; } - KListView::keyReleaseEvent(e); + TDEListView::keyReleaseEvent(e); } #include "ProcessList.moc" diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.h b/ksysguard/gui/SensorDisplayLib/ProcessList.h index fc668cf15..db3f7637b 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessList.h +++ b/ksysguard/gui/SensorDisplayLib/ProcessList.h @@ -42,11 +42,11 @@ typedef const char* (*KeyFunc)(const char*); * To support bi-directional sorting, and sorting of text, integers etc. we * need a specialized version of TQListViewItem. */ -class ProcessLVI : public KListViewItem +class ProcessLVI : public TDEListViewItem { public: - ProcessLVI(TQListView* lv) : KListViewItem(lv) { } - ProcessLVI(TQListViewItem* lvi) : KListViewItem(lvi) { } + ProcessLVI(TQListView* lv) : TDEListViewItem(lv) { } + ProcessLVI(TQListViewItem* lvi) : TDEListViewItem(lvi) { } virtual int compare( TQListViewItem *item, int column, bool ) const; }; @@ -57,7 +57,7 @@ class TQPopupMenu; * This class implementes a table filled with information about the running * processes. The table is derived from TQListView. */ -class ProcessList : public KListView +class ProcessList : public TDEListView { Q_OBJECT diff --git a/ksysguard/gui/WorkSheet.cc b/ksysguard/gui/WorkSheet.cc index 92ed96657..4ec416620 100644 --- a/ksysguard/gui/WorkSheet.cc +++ b/ksysguard/gui/WorkSheet.cc @@ -327,7 +327,7 @@ KSGRD::SensorDisplay *WorkSheet::addDisplay( const TQString &hostName, * type we popup a menu so the user can select what display is * wanted. */ if ( sensorType == "integer" || sensorType == "float" ) { - KPopupMenu pm; + TDEPopupMenu pm; pm.insertTitle( i18n( "Select Display Type" ) ); pm.insertItem( i18n( "&Signal Plotter" ), 1 ); pm.insertItem( i18n( "&Multimeter" ), 2 ); diff --git a/ksysguard/gui/WorkSheetSettings.cc b/ksysguard/gui/WorkSheetSettings.cc index 3e4c28e50..e2ba052ed 100644 --- a/ksysguard/gui/WorkSheetSettings.cc +++ b/ksysguard/gui/WorkSheetSettings.cc @@ -99,7 +99,7 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name ) TQWhatsThis::add( mInterval, i18n( "All displays of the sheet are updated at the rate specified here." ) ); TQToolTip::add( mSheetTitle, i18n( "Enter the title of the worksheet here." ) ); - KAcceleratorManager::manage( page ); + TDEAcceleratorManager::manage( page ); mSheetTitle->setFocus(); diff --git a/ksysguard/gui/Workspace.cc b/ksysguard/gui/Workspace.cc index e13f2620a..22b46269d 100644 --- a/ksysguard/gui/Workspace.cc +++ b/ksysguard/gui/Workspace.cc @@ -42,7 +42,7 @@ Workspace::Workspace( TQWidget* parent, const char* name ) : TQTabWidget( parent, name ) { - KAcceleratorManager::setNoAccel(this); + TDEAcceleratorManager::setNoAccel(this); mSheetList.setAutoDelete( true ); mAutoSave = true; diff --git a/ksysguard/gui/ksgrd/HostConnector.cc b/ksysguard/gui/ksgrd/HostConnector.cc index 3885a9518..a4aba76c7 100644 --- a/ksysguard/gui/ksgrd/HostConnector.cc +++ b/ksysguard/gui/ksgrd/HostConnector.cc @@ -118,7 +118,7 @@ HostConnector::HostConnector( TQWidget *parent, const char *name ) connect( mHostNames->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotHostNameChanged( const TQString & ) ) ); enableButtonOK( !mHostNames->lineEdit()->text().isEmpty() ); - KAcceleratorManager::manage( this ); + TDEAcceleratorManager::manage( this ); } HostConnector::~HostConnector() diff --git a/ksysguard/gui/ksgrd/StyleSettings.cc b/ksysguard/gui/ksgrd/StyleSettings.cc index 6c7faf771..a13e385b4 100644 --- a/ksysguard/gui/ksgrd/StyleSettings.cc +++ b/ksysguard/gui/ksgrd/StyleSettings.cc @@ -99,7 +99,7 @@ StyleSettings::StyleSettings( TQWidget *parent, const char *name ) connect( mEditColorButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editSensorColor() ) ); - KAcceleratorManager::manage( this ); + TDEAcceleratorManager::manage( this ); } StyleSettings::~StyleSettings() diff --git a/ksysguard/gui/ksgrd/TimerSettings.cc b/ksysguard/gui/ksgrd/TimerSettings.cc index 5e1d8d8b2..2a5e0d471 100644 --- a/ksysguard/gui/ksgrd/TimerSettings.cc +++ b/ksysguard/gui/ksgrd/TimerSettings.cc @@ -58,7 +58,7 @@ TimerSettings::TimerSettings( TQWidget *parent, const char *name ) mUseGlobalUpdate->setChecked( true ); - KAcceleratorManager::manage( this ); + TDEAcceleratorManager::manage( this ); } TimerSettings::~TimerSettings() diff --git a/ksysguard/gui/ksysguard.cc b/ksysguard/gui/ksysguard.cc index bd0f6290a..0d138917a 100644 --- a/ksysguard/gui/ksysguard.cc +++ b/ksysguard/gui/ksysguard.cc @@ -69,7 +69,7 @@ TopLevel* topLevel; TaskMan widget. */ TopLevel::TopLevel( const char *name ) - : KMainWindow( 0, name ), DCOPObject( "KSysGuardIface" ) + : TDEMainWindow( 0, name ), DCOPObject( "KSysGuardIface" ) { setPlainCaption( i18n( "TDE System Guard" ) ); mDontSaveSession = false; @@ -105,39 +105,39 @@ TopLevel::TopLevel( const char *name ) statusBar()->hide(); // create actions for menue entries - new KAction( i18n( "&New Worksheet..." ), "tab_new", 0, TQT_TQOBJECT(mWorkSpace), + new TDEAction( i18n( "&New Worksheet..." ), "tab_new", 0, TQT_TQOBJECT(mWorkSpace), TQT_SLOT( newWorkSheet() ), actionCollection(), "new_worksheet" ); - new KAction( i18n( "Import Worksheet..." ), "fileopen", 0, TQT_TQOBJECT(mWorkSpace), + new TDEAction( i18n( "Import Worksheet..." ), "fileopen", 0, TQT_TQOBJECT(mWorkSpace), TQT_SLOT( loadWorkSheet() ), actionCollection(), "import_worksheet" ); - mActionOpenRecent = new KRecentFilesAction( i18n( "&Import Recent Worksheet" ),"fileopen", 0, + mActionOpenRecent = new TDERecentFilesAction( i18n( "&Import Recent Worksheet" ),"fileopen", 0, TQT_TQOBJECT(mWorkSpace), TQT_SLOT( loadWorkSheet( const KURL& ) ), actionCollection(), "recent_import_worksheet" ); - new KAction( i18n( "&Remove Worksheet" ), "tab_remove", 0, TQT_TQOBJECT(mWorkSpace), + new TDEAction( i18n( "&Remove Worksheet" ), "tab_remove", 0, TQT_TQOBJECT(mWorkSpace), TQT_SLOT( deleteWorkSheet() ), actionCollection(), "remove_worksheet" ); - new KAction( i18n( "&Export Worksheet..." ), "filesaveas", 0, TQT_TQOBJECT(mWorkSpace), + new TDEAction( i18n( "&Export Worksheet..." ), "filesaveas", 0, TQT_TQOBJECT(mWorkSpace), TQT_SLOT( saveWorkSheetAs() ), actionCollection(), "export_worksheet" ); KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); - new KAction( i18n( "C&onnect Host..." ), "connect_established", 0, TQT_TQOBJECT(this), + new TDEAction( i18n( "C&onnect Host..." ), "connect_established", 0, TQT_TQOBJECT(this), TQT_SLOT( connectHost() ), actionCollection(), "connect_host" ); - new KAction( i18n( "D&isconnect Host" ), "connect_no", 0, TQT_TQOBJECT(this), + new TDEAction( i18n( "D&isconnect Host" ), "connect_no", 0, TQT_TQOBJECT(this), TQT_SLOT( disconnectHost() ), actionCollection(), "disconnect_host" ); // KStdAction::cut( mWorkSpace, TQT_SLOT( cut() ), actionCollection() ); // KStdAction::copy( mWorkSpace, TQT_SLOT( copy() ), actionCollection() ); // KStdAction::paste( mWorkSpace, TQT_SLOT( paste() ), actionCollection() ); - new KAction( i18n( "&Worksheet Properties" ), "configure", 0, TQT_TQOBJECT(mWorkSpace), + new TDEAction( i18n( "&Worksheet Properties" ), "configure", 0, TQT_TQOBJECT(mWorkSpace), TQT_SLOT( configure() ), actionCollection(), "configure_sheet" ); - new KAction( i18n( "Load Standard Sheets" ), "revert", + new TDEAction( i18n( "Load Standard Sheets" ), "revert", 0, TQT_TQOBJECT(this), TQT_SLOT( resetWorkSheets() ), actionCollection(), "revert_all_worksheets" ); - new KAction( i18n( "Configure &Style..." ), "colorize", 0, TQT_TQOBJECT(this), + new TDEAction( i18n( "Configure &Style..." ), "colorize", 0, TQT_TQOBJECT(this), TQT_SLOT( editStyle() ), actionCollection(), "configure_style" ); // TODO remove resize and fix so sizeHints() determines default size. @@ -291,7 +291,7 @@ void TopLevel::initStatusBar() updateStatusBar(); mServiceBrowser->startBrowse(); - KToggleAction *sb = dynamic_cast<KToggleAction*>(action("options_show_statusbar")); + TDEToggleAction *sb = dynamic_cast<TDEToggleAction*>(action("options_show_statusbar")); if (sb) connect(sb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateStatusBar())); } diff --git a/ksysguard/gui/ksysguard.h b/ksysguard/gui/ksysguard.h index 674ff0851..50a4212e5 100644 --- a/ksysguard/gui/ksysguard.h +++ b/ksysguard/gui/ksysguard.h @@ -34,14 +34,14 @@ #include <ksgrd/SensorClient.h> -class KRecentFilesAction; -class KToggleAction; +class TDERecentFilesAction; +class TDEToggleAction; class TQSplitter; class SensorBrowser; class Workspace; -class TopLevel : public KMainWindow, public KSGRD::SensorClient, public DCOPObject +class TopLevel : public TDEMainWindow, public KSGRD::SensorClient, public DCOPObject { Q_OBJECT K_DCOP @@ -93,7 +93,7 @@ class TopLevel : public KMainWindow, public KSGRD::SensorClient, public DCOPObje TQPtrList<DCOPClientTransaction> mDCopFIFO; TQSplitter* mSplitter; - KRecentFilesAction* mActionOpenRecent; + TDERecentFilesAction* mActionOpenRecent; SensorBrowser* mSensorBrowser; Workspace* mWorkSpace; diff --git a/ksystraycmd/ksystraycmd.cpp b/ksystraycmd/ksystraycmd.cpp index e5270196d..673b71f3d 100644 --- a/ksystraycmd/ksystraycmd.cpp +++ b/ksystraycmd/ksystraycmd.cpp @@ -230,7 +230,7 @@ void KSysTrayCmd::quit() void KSysTrayCmd::execContextMenu( const TQPoint &pos ) { - KPopupMenu *menu = new KPopupMenu(); + TDEPopupMenu *menu = new TDEPopupMenu(); menu->insertTitle( *pixmap(), i18n( "KSysTrayCmd" ) ); int hideShowId = menu->insertItem( isVisible ? i18n( "&Hide" ) : i18n( "&Restore" ) ); int undockId = menu->insertItem( SmallIcon("close"), i18n( "&Undock" ) ); diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp index 4e5ad5192..47fabcdfa 100644 --- a/kxkb/kxkb.cpp +++ b/kxkb/kxkb.cpp @@ -192,7 +192,7 @@ void KXKBApp::initTray() if( !m_tray ) { KSystemTray* sysTray = new KxkbSystemTray(); - KPopupMenu* popupMenu = sysTray->contextMenu(); + TDEPopupMenu* popupMenu = sysTray->contextMenu(); // popupMenu->insertTitle( kapp->miniIcon(), kapp->caption() ); m_tray = new KxkbLabelController(sysTray, popupMenu); diff --git a/kxkb/kxkbtraywindow.cpp b/kxkb/kxkbtraywindow.cpp index 749ef4353..6f899eadd 100644 --- a/kxkb/kxkbtraywindow.cpp +++ b/kxkb/kxkbtraywindow.cpp @@ -66,7 +66,7 @@ void KxkbLabelController::setError(const TQString& layoutInfo) void KxkbLabelController::initLayoutList(const TQValueList<LayoutUnit>& layouts, const XkbRules& rules) { -// KPopupMenu* menu = contextMenu(); +// TDEPopupMenu* menu = contextMenu(); TQPopupMenu* menu = contextMenu; // int index = menu->indexOf(0); @@ -114,7 +114,7 @@ void KxkbLabelController::initLayoutList(const TQValueList<LayoutUnit>& layouts, /* if( index != -1 ) { //not first start menu->insertSeparator(); - KAction* quitAction = KStdAction::quit(this, TQT_SIGNAL(quitSelected()), actionCollection()); + TDEAction* quitAction = KStdAction::quit(this, TQT_SIGNAL(quitSelected()), actionCollection()); if (quitAction) quitAction->plug(menu); }*/ diff --git a/libkonq/knewmenu.cc b/libkonq/knewmenu.cc index 2e6247c21..52bb605a1 100644 --- a/libkonq/knewmenu.cc +++ b/libkonq/knewmenu.cc @@ -57,14 +57,14 @@ class KNewMenu::KNewMenuPrivate { public: KNewMenuPrivate() : m_parentWidget(0) {} - KActionCollection * m_actionCollection; + TDEActionCollection * m_actionCollection; TQString m_destPath; TQWidget *m_parentWidget; - KActionMenu *m_menuDev; + TDEActionMenu *m_menuDev; }; -KNewMenu::KNewMenu( KActionCollection * _collec, const char *name ) : - KActionMenu( i18n( "Create New" ), "filenew", _collec, name ), +KNewMenu::KNewMenu( TDEActionCollection * _collec, const char *name ) : + TDEActionMenu( i18n( "Create New" ), "filenew", _collec, name ), menuItemsVersion( 0 ) { //kdDebug(1203) << "KNewMenu::KNewMenu " << this << endl; @@ -75,8 +75,8 @@ KNewMenu::KNewMenu( KActionCollection * _collec, const char *name ) : makeMenus(); } -KNewMenu::KNewMenu( KActionCollection * _collec, TQWidget *parentWidget, const char *name ) : - KActionMenu( i18n( "Create New" ), "filenew", _collec, name ), +KNewMenu::KNewMenu( TDEActionCollection * _collec, TQWidget *parentWidget, const char *name ) : + TDEActionMenu( i18n( "Create New" ), "filenew", _collec, name ), menuItemsVersion( 0 ) { d = new KNewMenuPrivate; @@ -93,7 +93,7 @@ KNewMenu::~KNewMenu() void KNewMenu::makeMenus() { - d->m_menuDev = new KActionMenu( i18n( "Link to Device" ), "kcmdevices", d->m_actionCollection, "devnew" ); + d->m_menuDev = new TDEActionMenu( i18n( "Link to Device" ), "kcmdevices", d->m_actionCollection, "devnew" ); } void KNewMenu::slotCheckUpToDate( ) @@ -106,8 +106,8 @@ void KNewMenu::slotCheckUpToDate( ) //kdDebug(1203) << "KNewMenu::slotCheckUpToDate() : recreating actions" << endl; // We need to clean up the action collection // We look for our actions using the group - TQValueList<KAction*> actions = d->m_actionCollection->actions( "KNewMenu" ); - for( TQValueListIterator<KAction*> it = actions.begin(); it != actions.end(); ++it ) + TQValueList<TDEAction*> actions = d->m_actionCollection->actions( "KNewMenu" ); + for( TQValueListIterator<TDEAction*> it = actions.begin(); it != actions.end(); ++it ) { remove( *it ); d->m_actionCollection->remove( *it ); @@ -204,7 +204,7 @@ void KNewMenu::fillMenu() popupMenu()->clear(); d->m_menuDev->popupMenu()->clear(); - KAction *linkURL = 0, *linkApp = 0; // these shall be put at special positions + TDEAction *linkURL = 0, *linkApp = 0; // these shall be put at special positions int i = 1; // was 2 when there was Folder TQValueList<Entry>::Iterator templ = s_templatesList->begin(); @@ -220,8 +220,8 @@ void KNewMenu::fillMenu() bool bSkip = false; - TQValueList<KAction*> actions = d->m_actionCollection->actions(); - TQValueListIterator<KAction*> it = actions.begin(); + TQValueList<TDEAction*> actions = d->m_actionCollection->actions(); + TQValueListIterator<TDEAction*> it = actions.begin(); for( ; it != actions.end() && !bSkip; ++it ) { if ( (*it)->text() == (*templ).text ) @@ -238,17 +238,17 @@ void KNewMenu::fillMenu() // The best way to identify the "Create Directory", "Link to Location", "Link to Application" was the template if ( (*templ).templatePath.endsWith( "emptydir" ) ) { - KAction * act = new KAction( (*templ).text, (*templ).icon, 0, this, TQT_SLOT( slotNewDir() ), + TDEAction * act = new TDEAction( (*templ).text, (*templ).icon, 0, this, TQT_SLOT( slotNewDir() ), d->m_actionCollection, TQCString().sprintf("newmenu%d", i ) ); act->setGroup( "KNewMenu" ); act->plug( popupMenu() ); - KActionSeparator *sep = new KActionSeparator(); + TDEActionSeparator *sep = new TDEActionSeparator(); sep->plug( popupMenu() ); } else { - KAction * act = new KAction( (*templ).text, (*templ).icon, 0, this, TQT_SLOT( slotNewFile() ), + TDEAction * act = new TDEAction( (*templ).text, (*templ).icon, 0, this, TQT_SLOT( slotNewFile() ), d->m_actionCollection, TQCString().sprintf("newmenu%d", i ) ); act->setGroup( "KNewMenu" ); @@ -277,12 +277,12 @@ void KNewMenu::fillMenu() } else { // Separate system from personal templates Q_ASSERT( (*templ).entryType != 0 ); - KActionSeparator * act = new KActionSeparator(); + TDEActionSeparator * act = new TDEActionSeparator(); act->plug( popupMenu() ); } } - KActionSeparator * act = new KActionSeparator(); + TDEActionSeparator * act = new TDEActionSeparator(); act->plug( popupMenu() ); if ( linkURL ) linkURL->plug( popupMenu() ); if ( linkApp ) linkApp->plug( popupMenu() ); diff --git a/libkonq/knewmenu.h b/libkonq/knewmenu.h index 9e2181329..17239f119 100644 --- a/libkonq/knewmenu.h +++ b/libkonq/knewmenu.h @@ -49,7 +49,7 @@ class TQPopupMenu; * Ideas and code for the new template handling mechanism ('link' desktop files) * from Christoph Pickart <[email protected]> */ -class LIBKONQ_EXPORT KNewMenu : public KActionMenu +class LIBKONQ_EXPORT KNewMenu : public TDEActionMenu { Q_OBJECT public: @@ -57,8 +57,8 @@ public: /** * Constructor */ - KNewMenu( KActionCollection * _collec, const char *name=0L ); - KNewMenu( KActionCollection * _collec, TQWidget *parentWidget, const char *name=0L ); + KNewMenu( TDEActionCollection * _collec, const char *name=0L ); + KNewMenu( TDEActionCollection * _collec, TQWidget *parentWidget, const char *name=0L ); virtual ~KNewMenu(); /** diff --git a/libkonq/konq_dirpart.cc b/libkonq/konq_dirpart.cc index 2257d3f56..46226a6d0 100644 --- a/libkonq/konq_dirpart.cc +++ b/libkonq/konq_dirpart.cc @@ -50,8 +50,8 @@ class KonqDirPart::KonqDirPartPrivate public: KonqDirPartPrivate() : dirLister( 0 ) {} TQStringList mimeFilters; - KToggleAction *aEnormousIcons; - KToggleAction *aSmallMediumIcons; + TDEToggleAction *aEnormousIcons; + TDEToggleAction *aSmallMediumIcons; TQValueVector<int> iconSize; KDirLister* dirLister; @@ -137,18 +137,18 @@ KonqDirPart::KonqDirPart( TQObject *parent, const char *name ) actionCollection()->setHighlightingEnabled( true ); - m_paIncIconSize = new KAction( i18n( "Enlarge Icons" ), "viewmag+", 0, this, TQT_SLOT( slotIncIconSize() ), actionCollection(), "incIconSize" ); - m_paDecIconSize = new KAction( i18n( "Shrink Icons" ), "viewmag-", 0, this, TQT_SLOT( slotDecIconSize() ), actionCollection(), "decIconSize" ); + m_paIncIconSize = new TDEAction( i18n( "Enlarge Icons" ), "viewmag+", 0, this, TQT_SLOT( slotIncIconSize() ), actionCollection(), "incIconSize" ); + m_paDecIconSize = new TDEAction( i18n( "Shrink Icons" ), "viewmag-", 0, this, TQT_SLOT( slotDecIconSize() ), actionCollection(), "decIconSize" ); - m_paDefaultIcons = new KRadioAction( i18n( "&Default Size" ), 0, actionCollection(), "modedefault" ); - d->aEnormousIcons = new KRadioAction( i18n( "&Huge" ), 0, + m_paDefaultIcons = new TDERadioAction( i18n( "&Default Size" ), 0, actionCollection(), "modedefault" ); + d->aEnormousIcons = new TDERadioAction( i18n( "&Huge" ), 0, actionCollection(), "modeenormous" ); - m_paHugeIcons = new KRadioAction( i18n( "&Very Large" ), 0, actionCollection(), "modehuge" ); - m_paLargeIcons = new KRadioAction( i18n( "&Large" ), 0, actionCollection(), "modelarge" ); - m_paMediumIcons = new KRadioAction( i18n( "&Medium" ), 0, actionCollection(), "modemedium" ); - d->aSmallMediumIcons = new KRadioAction( i18n( "&Small" ), 0, + m_paHugeIcons = new TDERadioAction( i18n( "&Very Large" ), 0, actionCollection(), "modehuge" ); + m_paLargeIcons = new TDERadioAction( i18n( "&Large" ), 0, actionCollection(), "modelarge" ); + m_paMediumIcons = new TDERadioAction( i18n( "&Medium" ), 0, actionCollection(), "modemedium" ); + d->aSmallMediumIcons = new TDERadioAction( i18n( "&Small" ), 0, actionCollection(), "modesmallmedium" ); - m_paSmallIcons = new KRadioAction( i18n( "&Tiny" ), 0, actionCollection(), "modesmall" ); + m_paSmallIcons = new TDERadioAction( i18n( "&Tiny" ), 0, actionCollection(), "modesmall" ); m_paDefaultIcons->setExclusiveGroup( "ViewMode" ); d->aEnormousIcons->setExclusiveGroup( "ViewMode" ); @@ -219,7 +219,7 @@ KonqDirPart::KonqDirPart( TQObject *parent, const char *name ) m_iIconSize[4] = KIcon::SizeHuge; // ... up to here - KAction *a = new KAction( i18n( "Configure Background..." ), "background", 0, this, TQT_SLOT( slotBackgroundSettings() ), + TDEAction *a = new TDEAction( i18n( "Configure Background..." ), "background", 0, this, TQT_SLOT( slotBackgroundSettings() ), actionCollection(), "bgsettings" ); a->setToolTip( i18n( "Allows choosing of background settings for this view" ) ); diff --git a/libkonq/konq_dirpart.h b/libkonq/konq_dirpart.h index 12e9de49d..6b24bf9c5 100644 --- a/libkonq/konq_dirpart.h +++ b/libkonq/konq_dirpart.h @@ -32,8 +32,8 @@ class KDirLister; namespace KParts { class BrowserExtension; } class KonqPropsView; class TQScrollView; -class KAction; -class KToggleAction; +class TDEAction; +class TDEToggleAction; class KonqDirPartBrowserExtension; class LIBKONQ_EXPORT KonqDirPart: public KParts::ReadOnlyPart @@ -299,13 +299,13 @@ protected: KonqPropsView * m_pProps; - KAction *m_paIncIconSize; - KAction *m_paDecIconSize; - KToggleAction *m_paDefaultIcons; - KToggleAction *m_paHugeIcons; - KToggleAction *m_paLargeIcons; - KToggleAction *m_paMediumIcons; - KToggleAction *m_paSmallIcons; + TDEAction *m_paIncIconSize; + TDEAction *m_paDecIconSize; + TDEToggleAction *m_paDefaultIcons; + TDEToggleAction *m_paHugeIcons; + TDEToggleAction *m_paLargeIcons; + TDEToggleAction *m_paMediumIcons; + TDEToggleAction *m_paSmallIcons; KParts::ReadOnlyPart * m_findPart; KonqDirPartBrowserExtension * m_extension; diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc index 9d25cf794..8dea08489 100644 --- a/libkonq/konq_popupmenu.cc +++ b/libkonq/konq_popupmenu.cc @@ -190,7 +190,7 @@ ServiceList* PopupServices::selectList( const TQString& priority, const TQString KonqPopupMenu::KonqPopupMenu( KBookmarkManager *mgr, const KFileItemList &items, KURL viewURL, - KActionCollection & actions, + TDEActionCollection & actions, KNewMenu * newMenu, bool showProperties ) : TQPopupMenu( 0L, "konq_popupmenu" ), @@ -203,7 +203,7 @@ KonqPopupMenu::KonqPopupMenu( KBookmarkManager *mgr, const KFileItemList &items, KonqPopupMenu::KonqPopupMenu( KBookmarkManager *mgr, const KFileItemList &items, KURL viewURL, - KActionCollection & actions, + TDEActionCollection & actions, KNewMenu * newMenu, TQWidget * parentWidget, bool showProperties ) @@ -215,7 +215,7 @@ KonqPopupMenu::KonqPopupMenu( KBookmarkManager *mgr, const KFileItemList &items, KonqPopupMenu::KonqPopupMenu( KBookmarkManager *mgr, const KFileItemList &items, const KURL& viewURL, - KActionCollection & actions, + TDEActionCollection & actions, KNewMenu * newMenu, TQWidget * parentWidget, KonqPopupFlags kpf, @@ -286,7 +286,7 @@ int KonqPopupMenu::insertServices(const ServiceList& list, TQCString name; name.setNum( id ); name.prepend( isBuiltin ? "builtinservice_" : "userservice_" ); - KAction * act = new KAction( TQString((*it).m_strName).replace('&',"&&"), 0, + TDEAction * act = new TDEAction( TQString((*it).m_strName).replace('&',"&&"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotRunService() ), &m_ownActions, name ); @@ -481,13 +481,13 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) ////////////////////////////////////////////////////////////////////////// - KAction * act; + TDEAction * act; if (!isCurrentTrash) addMerge( "konqueror" ); bool isKDesktop = TQCString( kapp->name() ) == "kdesktop"; - KAction *actNewWindow = 0; + TDEAction *actNewWindow = 0; if (( kpf & ShowProperties ) && isKDesktop && !kapp->authorize("editable_desktop_icons")) @@ -500,7 +500,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) if ( ((kpf & ShowNewWindow) != 0) && sReading ) { TQString openStr = isKDesktop ? i18n( "&Open" ) : i18n( "Open in New &Window" ); - actNewWindow = new KAction( openStr, "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewView() ), &m_ownActions, "newview" ); + actNewWindow = new TDEAction( openStr, "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewView() ), &m_ownActions, "newview" ); } if ( actNewWindow && !isKDesktop ) @@ -529,14 +529,14 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) { if (d->m_itemFlags & KParts::BrowserExtension::ShowCreateDirectory) { - KAction *actNewDir = new KAction( i18n( "Create &Folder..." ), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewDir() ), &m_ownActions, "newdir" ); + TDEAction *actNewDir = new TDEAction( i18n( "Create &Folder..." ), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewDir() ), &m_ownActions, "newdir" ); addAction( actNewDir ); addSeparator(); } } } else if ( isIntoTrash ) { // Trashed item, offer restoring - act = new KAction( i18n( "&Restore" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupRestoreTrashedItems() ), &m_ownActions, "restore" ); + act = new TDEAction( i18n( "&Restore" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupRestoreTrashedItems() ), &m_ownActions, "restore" ); addAction( act ); } @@ -607,7 +607,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) } if ( isCurrentTrash ) { - act = new KAction( i18n( "&Empty Trash Bin" ), "emptytrash", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupEmptyTrashBin() ), &m_ownActions, "empytrash" ); + act = new TDEAction( i18n( "&Empty Trash Bin" ), "emptytrash", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupEmptyTrashBin() ), &m_ownActions, "empytrash" ); KSimpleConfig trashConfig( "trashrc", true ); trashConfig.setGroup( "Status" ); act->setEnabled( !trashConfig.readBoolEntry( "Empty", true ) ); @@ -640,10 +640,10 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) else caption = i18n("&Bookmark This File"); - act = new KAction( caption, "bookmark_add", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupAddToBookmark() ), &m_ownActions, "bookmark_add" ); + act = new TDEAction( caption, "bookmark_add", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupAddToBookmark() ), &m_ownActions, "bookmark_add" ); if (m_lstItems.count() > 1) act->setEnabled(false); - if (kapp->authorizeKAction("bookmarks")) + if (kapp->authorizeTDEAction("bookmarks")) addAction( act ); if (bIsLink) addGroup( "linkactions" ); @@ -849,7 +849,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) TDETrader::OfferList offers; - if (kapp->authorizeKAction("openwith")) + if (kapp->authorizeTDEAction("openwith")) { TQString constraint = "Type == 'Application' and DesktopEntryName != 'kfmclient' and DesktopEntryName != 'kfmclient_dir' and DesktopEntryName != 'kfmclient_html'"; TQString subConstraint = " and '%1' in ServiceTypes"; @@ -924,7 +924,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) if ( menu == m_menuElement ) // no submenu -> prefix single offer actionName = i18n( "Open with %1" ).arg( actionName ); - act = new KAction( actionName, (*it)->pixmap( KIcon::Small ), 0, + act = new TDEAction( actionName, (*it)->pixmap( KIcon::Small ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotRunService() ), &m_ownActions, nam.prepend( "appservice_" ) ); addAction( act, menu ); @@ -942,12 +942,12 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) { openWithActionName = i18n( "&Open With..." ); } - KAction *openWithAct = new KAction( openWithActionName, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" ); + TDEAction *openWithAct = new TDEAction( openWithActionName, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" ); addAction( openWithAct, menu ); } else // no app offers -> Open With... { - act = new KAction( i18n( "&Open With..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" ); + act = new TDEAction( i18n( "&Open With..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" ); addAction( act ); } @@ -1001,7 +1001,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) if ( KPropertiesDialog::canDisplay( m_lstItems ) && (kpf & ShowProperties) ) { - act = new KAction( i18n( "&Properties" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupProperties() ), + act = new TDEAction( i18n( "&Properties" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupProperties() ), &m_ownActions, "properties" ); addAction( act ); } @@ -1015,7 +1015,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) if ( KFileShare::authorization() == KFileShare::Authorized ) { addSeparator(); - act = new KAction( i18n("Share"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenShareFileDialog() ), + act = new TDEAction( i18n("Share"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenShareFileDialog() ), &m_ownActions, "sharefile" ); addAction( act ); } @@ -1146,10 +1146,10 @@ KPropertiesDialog* KonqPopupMenu::showPropertiesDialog() return new KPropertiesDialog( m_lstItems, d->m_parentWidget ); } -KAction *KonqPopupMenu::action( const TQDomElement &element ) const +TDEAction *KonqPopupMenu::action( const TQDomElement &element ) const { TQCString name = element.attribute( attrName ).ascii(); - KAction *res = m_ownActions.action( static_cast<const char *>(name) ); + TDEAction *res = m_ownActions.action( static_cast<const char *>(name) ); if ( !res ) res = m_actions.action( static_cast<const char *>(name) ); @@ -1160,9 +1160,9 @@ KAction *KonqPopupMenu::action( const TQDomElement &element ) const return res; } -KActionCollection *KonqPopupMenu::actionCollection() const +TDEActionCollection *KonqPopupMenu::actionCollection() const { - return const_cast<KActionCollection *>( &m_ownActions ); + return const_cast<TDEActionCollection *>( &m_ownActions ); } TQString KonqPopupMenu::mimeType() const diff --git a/libkonq/konq_popupmenu.h b/libkonq/konq_popupmenu.h index 130e9ae6f..01b1247ce 100644 --- a/libkonq/konq_popupmenu.h +++ b/libkonq/konq_popupmenu.h @@ -45,7 +45,7 @@ class KService; class KonqPopupMenuPlugin; class KBookmarkManager; -// TODO KDE4: change base class to KPopupMenu, see KAction::slotPopupActivated() +// TODO KDE4: change base class to TDEPopupMenu, see TDEAction::slotPopupActivated() /** * This class implements the popup menu for URLs in konqueror and kdesktop * It's usage is very simple : on right click, create the KonqPopupMenu instance @@ -76,7 +76,7 @@ public: KonqPopupMenu( KBookmarkManager* manager, const KFileItemList &items, KURL viewURL, - KActionCollection & actions, + TDEActionCollection & actions, KNewMenu * newMenu, bool showPropertiesAndFileType = true ) KDE_DEPRECATED; @@ -87,7 +87,7 @@ public: KonqPopupMenu( KBookmarkManager* manager, const KFileItemList &items, KURL viewURL, - KActionCollection & actions, + TDEActionCollection & actions, KNewMenu * newMenu, TQWidget * parentWidget, bool showPropertiesAndFileType = true ) KDE_DEPRECATED; @@ -115,7 +115,7 @@ public: KonqPopupMenu( KBookmarkManager* manager, const KFileItemList &items, const KURL& viewURL, - KActionCollection & actions, + TDEActionCollection & actions, KNewMenu * newMenu, TQWidget * parentWidget, KonqPopupFlags kpf, @@ -151,10 +151,10 @@ public: /** * Reimplemented for internal purpose */ - virtual KAction *action( const TQDomElement &element ) const; + virtual TDEAction *action( const TQDomElement &element ) const; - virtual KActionCollection *actionCollection() const; + virtual TDEActionCollection *actionCollection() const; TQString mimeType( ) const; KURL url( ) const; KFileItemList fileItemList() const; @@ -174,8 +174,8 @@ public slots: // KDE4: why public? void slotOpenShareFileDialog(); protected: - KActionCollection &m_actions; - KActionCollection m_ownActions; + TDEActionCollection &m_actions; + TDEActionCollection m_ownActions; private slots: void slotLocalURL( TDEIO::Job *, const KURL&, bool ); @@ -215,7 +215,7 @@ public: * Constructor * If you want to insert a dynamic item or menu to konqpopupmenu * this class is the right choice. - * Create a KAction and use _popup->addAction(new KAction ); + * Create a TDEAction and use _popup->addAction(new TDEAction ); * If you want to create a submenu use _popup->addGroup( ); */ KonqPopupMenuPlugin( KonqPopupMenu *_popup, const char *name ); // this should also be the parent diff --git a/libkonq/konq_xmlguiclient.cc b/libkonq/konq_xmlguiclient.cc index 69afd7b0a..ec3fed584 100644 --- a/libkonq/konq_xmlguiclient.cc +++ b/libkonq/konq_xmlguiclient.cc @@ -70,7 +70,7 @@ TQDomDocument KonqXMLGUIClient::domDocument() const return m_doc; } -void KonqXMLGUIClient::addAction( KAction *act, const TQDomElement &menu ) +void KonqXMLGUIClient::addAction( TDEAction *act, const TQDomElement &menu ) { addAction( act->name(), menu ); } @@ -79,7 +79,7 @@ void KonqXMLGUIClient::addAction( const char *name, const TQDomElement &menu ) { static const TQString& tagAction = TDEGlobal::staticQString( "action" ); - if (!kapp->authorizeKAction(name)) + if (!kapp->authorizeTDEAction(name)) return; handlePendingSeparator(); diff --git a/libkonq/konq_xmlguiclient.h b/libkonq/konq_xmlguiclient.h index 772554dd2..c219c6488 100644 --- a/libkonq/konq_xmlguiclient.h +++ b/libkonq/konq_xmlguiclient.h @@ -45,7 +45,7 @@ public: TQDomElement DomElement( ) const; // KDE4: s/D/d/ protected: - void addAction( KAction *action, const TQDomElement &menu = TQDomElement() ); + void addAction( TDEAction *action, const TQDomElement &menu = TQDomElement() ); void addAction( const char *name, const TQDomElement &menu = TQDomElement() ); void addSeparator( const TQDomElement &menu = TQDomElement() ); /// only add a separator if an action is added afterwards diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp index 04294025a..ef189d9ea 100644 --- a/nsplugins/plugin_part.cpp +++ b/nsplugins/plugin_part.cpp @@ -217,7 +217,7 @@ PluginPart::PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject // Only create this if we have no parent since the parent part is // responsible for "Save As" then if (!parent || !parent->inherits("Part")) { - new KAction(i18n("&Save As..."), CTRL+Key_S, this, TQT_SLOT(saveAs()), actionCollection(), "saveDocument"); + new TDEAction(i18n("&Save As..."), CTRL+Key_S, this, TQT_SLOT(saveAs()), actionCollection(), "saveDocument"); setXMLFile("nspluginpart.rc"); } diff --git a/nsplugins/test/testnsplugin.h b/nsplugins/test/testnsplugin.h index 949de2986..0b007aba2 100644 --- a/nsplugins/test/testnsplugin.h +++ b/nsplugins/test/testnsplugin.h @@ -32,7 +32,7 @@ class NSPluginLoader; class NSPluginInstance; -class TestNSPlugin : public KMainWindow +class TestNSPlugin : public TDEMainWindow { Q_OBJECT diff --git a/tdeioslave/DEBUG.howto b/tdeioslave/DEBUG.howto index 813df102d..537d6f7ec 100644 --- a/tdeioslave/DEBUG.howto +++ b/tdeioslave/DEBUG.howto @@ -48,7 +48,7 @@ time. Debugging io-slaves with valgrind ================================= -KLauncher can be told to run certain io-slaves through valgrind. The following +TDELauncher can be told to run certain io-slaves through valgrind. The following command can be used to let tdelauncher run all https io-slaves via valgrind: TDE_SLAVE_VALGRIND=https tdeinit diff --git a/tdeioslave/media/medianotifier/notificationdialogview.ui b/tdeioslave/media/medianotifier/notificationdialogview.ui index f7bd744be..351799dd9 100644 --- a/tdeioslave/media/medianotifier/notificationdialogview.ui +++ b/tdeioslave/media/medianotifier/notificationdialogview.ui @@ -90,7 +90,7 @@ <string>...</string> </property> </widget> - <widget class="KListBox"> + <widget class="TDEListBox"> <property name="name"> <cstring>actionsList</cstring> </property> diff --git a/tdeioslave/media/tdecmodule/notifiermoduleview.ui b/tdeioslave/media/tdecmodule/notifiermoduleview.ui index ad508c03d..a5cd11622 100644 --- a/tdeioslave/media/tdecmodule/notifiermoduleview.ui +++ b/tdeioslave/media/tdecmodule/notifiermoduleview.ui @@ -145,7 +145,7 @@ </size> </property> </spacer> - <widget class="KListBox" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TDEListBox" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>actionsList</cstring> </property> diff --git a/tdeioslave/media/tdecmodule/serviceview.ui b/tdeioslave/media/tdecmodule/serviceview.ui index a6c3063f6..98a9f8666 100644 --- a/tdeioslave/media/tdecmodule/serviceview.ui +++ b/tdeioslave/media/tdecmodule/serviceview.ui @@ -172,7 +172,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="KActionSelector"> + <widget class="TDEActionSelector"> <property name="name"> <cstring>mimetypesSelector</cstring> </property> diff --git a/tdeprint/kjobviewer/kjobviewer.cpp b/tdeprint/kjobviewer/kjobviewer.cpp index d2b23bfc4..9795ef014 100644 --- a/tdeprint/kjobviewer/kjobviewer.cpp +++ b/tdeprint/kjobviewer/kjobviewer.cpp @@ -52,7 +52,7 @@ void JobTray::mousePressEvent(TQMouseEvent *e) KSystemTray::mousePressEvent(e); else if (m_app->m_views.count() > 0) { - KPopupMenu menu; + TDEPopupMenu menu; TQDictIterator<KMJobViewer> it(m_app->m_views); TQPtrList<KMJobViewer> list; list.setAutoDelete(false); diff --git a/tdeprint/tdeprintfax/conffilters.cpp b/tdeprint/tdeprintfax/conffilters.cpp index d32f33ea8..212d96988 100644 --- a/tdeprint/tdeprintfax/conffilters.cpp +++ b/tdeprint/tdeprintfax/conffilters.cpp @@ -38,7 +38,7 @@ ConfFilters::ConfFilters(TQWidget *parent, const char *name) : TQWidget(parent, name) { - m_filters = new KListView(this); + m_filters = new TDEListView(this); m_filters->addColumn(i18n("Mime Type")); m_filters->addColumn(i18n("Command")); m_filters->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); diff --git a/tdeprint/tdeprintfax/conffilters.h b/tdeprint/tdeprintfax/conffilters.h index 871b44bec..ca796b934 100644 --- a/tdeprint/tdeprintfax/conffilters.h +++ b/tdeprint/tdeprintfax/conffilters.h @@ -23,7 +23,7 @@ #include <tqwidget.h> #include <tqpushbutton.h> -class KListView; +class TDEListView; class ConfFilters : public TQWidget { @@ -41,7 +41,7 @@ protected slots: void slotDown(); void updateButton(); private: - KListView *m_filters; + TDEListView *m_filters; TQPushButton *m_add,*m_remove,*m_up,*m_down,*m_change; }; diff --git a/tdeprint/tdeprintfax/faxab.cpp b/tdeprint/tdeprintfax/faxab.cpp index 6cc0e115f..97b2986cc 100644 --- a/tdeprint/tdeprintfax/faxab.cpp +++ b/tdeprint/tdeprintfax/faxab.cpp @@ -37,7 +37,7 @@ FaxAB::FaxAB(TQWidget *parent, const char *name) : KDialog(parent, name, true) { - m_list = new KListView( this ); + m_list = new TDEListView( this ); m_list->addColumn( i18n( "Name" ) ); m_list->addColumn( i18n( "Fax Number" ) ); m_list->header()->setStretchEnabled( true, 0 ); diff --git a/tdeprint/tdeprintfax/faxab.h b/tdeprint/tdeprintfax/faxab.h index 8b50c204a..abf40de2f 100644 --- a/tdeprint/tdeprintfax/faxab.h +++ b/tdeprint/tdeprintfax/faxab.h @@ -26,7 +26,7 @@ #include <tqstringlist.h> #include <kabc/phonenumber.h> -class KListView; +class TDEListView; class AddressBook; class TQPushButton; @@ -56,7 +56,7 @@ private: TQString m_enterprise; }; - KListView* m_list; + TDEListView* m_list; TQMap<TQString,FaxABEntry> m_entries; TQPushButton* m_ok; }; diff --git a/tdeprint/tdeprintfax/tdeprintfax.cpp b/tdeprint/tdeprintfax/tdeprintfax.cpp index 015bf7172..38e15425b 100644 --- a/tdeprint/tdeprintfax/tdeprintfax.cpp +++ b/tdeprint/tdeprintfax/tdeprintfax.cpp @@ -58,7 +58,7 @@ #include <kdebug.h> KdeprintFax::KdeprintFax(TQWidget *parent, const char *name) -: KMainWindow(parent, name) +: TDEMainWindow(parent, name) { m_faxctrl = new FaxCtrl(this); m_quitAfterSend = false; @@ -67,7 +67,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name) TQWidget *mainw = new TQWidget(this); setCentralWidget(mainw); - m_files = new KListBox(mainw); + m_files = new TDEListBox(mainw); connect( m_files, TQT_SIGNAL( currentChanged( TQListBoxItem* ) ), TQT_SLOT( slotCurrentChanged() ) ); m_upbtn = new KPushButton( mainw ); m_upbtn->setIconSet( SmallIconSet( "up" ) ); @@ -83,7 +83,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name) m_filelabel->setBuddy(m_files); KSeparator*m_line = new KSeparator( KSeparator::HLine, mainw); KSeparator *m_line2 = new KSeparator( KSeparator::HLine, mainw ); - m_numbers = new KListView( mainw ); + m_numbers = new TDEListView( mainw ); m_numbers->addColumn( i18n("Fax Number") ); m_numbers->addColumn( i18n("Name") ); m_numbers->addColumn( i18n("Enterprise") ); @@ -188,14 +188,14 @@ KdeprintFax::~KdeprintFax() void KdeprintFax::initActions() { - new KAction(i18n("&Add File..."), "filenew", Qt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotAdd()), actionCollection(), "file_add"); - new KAction(i18n("&Remove File"), "remove", Qt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), actionCollection(), "file_remove"); - new KAction(i18n("&Send Fax"), "connect_established", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotFax()), actionCollection(), "fax_send"); - new KAction(i18n("A&bort"), "stop", Qt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotAbort()), actionCollection(), "fax_stop"); - new KAction(i18n("A&ddress Book"), "kaddressbook", Qt::CTRL+Qt::Key_A, TQT_TQOBJECT(this), TQT_SLOT(slotKab()), actionCollection(), "fax_ab"); - new KAction(i18n("V&iew Log"), "contents", Qt::CTRL+Qt::Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotViewLog()), actionCollection(), "fax_log"); - new KAction(i18n("Vi&ew File"), "filefind", Qt::CTRL+Qt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "file_view"); - new KAction( i18n( "&New Fax Recipient..." ), "edit", Qt::CTRL+Qt::Key_N, TQT_TQOBJECT(this), TQT_SLOT( slotFaxAdd() ), actionCollection(), "fax_add" ); + new TDEAction(i18n("&Add File..."), "filenew", Qt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotAdd()), actionCollection(), "file_add"); + new TDEAction(i18n("&Remove File"), "remove", Qt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), actionCollection(), "file_remove"); + new TDEAction(i18n("&Send Fax"), "connect_established", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotFax()), actionCollection(), "fax_send"); + new TDEAction(i18n("A&bort"), "stop", Qt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotAbort()), actionCollection(), "fax_stop"); + new TDEAction(i18n("A&ddress Book"), "kaddressbook", Qt::CTRL+Qt::Key_A, TQT_TQOBJECT(this), TQT_SLOT(slotKab()), actionCollection(), "fax_ab"); + new TDEAction(i18n("V&iew Log"), "contents", Qt::CTRL+Qt::Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotViewLog()), actionCollection(), "fax_log"); + new TDEAction(i18n("Vi&ew File"), "filefind", Qt::CTRL+Qt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "file_view"); + new TDEAction( i18n( "&New Fax Recipient..." ), "edit", Qt::CTRL+Qt::Key_N, TQT_TQOBJECT(this), TQT_SLOT( slotFaxAdd() ), actionCollection(), "fax_add" ); KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection()); setStandardToolBarMenuEnabled(true); diff --git a/tdeprint/tdeprintfax/tdeprintfax.h b/tdeprint/tdeprintfax/tdeprintfax.h index 4645434ad..192ba7b14 100644 --- a/tdeprint/tdeprintfax/tdeprintfax.h +++ b/tdeprint/tdeprintfax/tdeprintfax.h @@ -24,8 +24,8 @@ #include <kmainwindow.h> #include <kurl.h> -class KListBox; -class KListView; +class TDEListBox; +class TDEListView; class TQLineEdit; class TQTextEdit; class FaxCtrl; @@ -36,7 +36,7 @@ class TQComboBox; class TQPushButton; class TQListViewItem; -class KdeprintFax : public KMainWindow +class KdeprintFax : public TDEMainWindow { Q_OBJECT public: @@ -98,8 +98,8 @@ protected: //TQListViewItem* faxItem( int i = 0 ) const; private: - KListBox *m_files; - KListView *m_numbers; + TDEListBox *m_files; + TDEListView *m_numbers; TQLineEdit *m_subject; TQTextEdit *m_comment; FaxCtrl *m_faxctrl; diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp index c2fb0c6f5..809f309ad 100644 --- a/tdm/kfrontend/kgreeter.cpp +++ b/tdm/kfrontend/kgreeter.cpp @@ -92,10 +92,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #define FIFO_FILE "/tmp/tdesocket-global/tdm/tdmctl-%1" #define FIFO_SAK_FILE "/tmp/tdesocket-global/tdm/tdmctl-sak-%1" -class UserListView : public KListView { +class UserListView : public TDEListView { public: UserListView( bool _them, TQWidget *parent = 0, const char *name = 0 ) - : KListView( parent, name ) + : TDEListView( parent, name ) , themed(_them), cachedSizeHint( -1, 0 ) { setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ); @@ -127,7 +127,7 @@ public: virtual TQSize sizeHint() const { if (themed) - return KListView::sizeHint(); + return TDEListView::sizeHint(); if (!cachedSizeHint.isValid()) { constPolish(); @@ -146,11 +146,11 @@ public: virtual void paintEmptyArea ( TQPainter * p, const TQRect & rect ) { if (!themed) - return KListView::paintEmptyArea(p, rect ); + return TDEListView::paintEmptyArea(p, rect ); // FIXME: This must be configurable, so disable // painting of list background for now. - return KListView::paintEmptyArea(p, rect ); + return TDEListView::paintEmptyArea(p, rect ); const TQPixmap *pm = TQT_TQPIXMAP_CONST(paletteBackgroundPixmap()); if (!pm || pm->isNull()) @@ -337,11 +337,11 @@ void KGreeter::readFacesList() } } -class UserListViewItem : public KListViewItem { +class UserListViewItem : public TDEListViewItem { public: UserListViewItem( UserListView *parent, const TQString &text, const TQPixmap &pixmap, const TQString &username ) - : KListViewItem( parent ) + : TDEListViewItem( parent ) , login( username ) { setPixmap( 0, pixmap ); @@ -355,7 +355,7 @@ class UserListViewItem : public KListViewItem { if (((UserListView*)listView())->themed) TQListViewItem::paintCell(p, cg, column, width, alignment); else - KListViewItem::paintCell(p, cg, column, width, alignment); + TDEListViewItem::paintCell(p, cg, column, width, alignment); } TQString login; diff --git a/tdm/kfrontend/kgreeter.h b/tdm/kfrontend/kgreeter.h index 78a6ded8c..951ea7d3a 100644 --- a/tdm/kfrontend/kgreeter.h +++ b/tdm/kfrontend/kgreeter.h @@ -34,7 +34,7 @@ class UserListView; class KdmThemer; class KdmItem; -class KListView; +class TDEListView; class KSimpleConfig; class TQLabel; diff --git a/tdm/kfrontend/themer/tdmitem.cpp b/tdm/kfrontend/themer/tdmitem.cpp index fb695462c..13969c4bf 100644 --- a/tdm/kfrontend/themer/tdmitem.cpp +++ b/tdm/kfrontend/themer/tdmitem.cpp @@ -290,12 +290,12 @@ KdmItem::paint( TQPainter *p, const TQRect &rect ) return; if (myWidget || (myLayoutItem && myLayoutItem->widget())) { - // KListView because it's missing a Q_OBJECT' + // TDEListView because it's missing a Q_OBJECT' // FIXME: This is a nice idea in theory, but in practice it is // very confusing for the user not to see the empty list box // delineated from the rest of the greeter. // Maybe set a darker version of the background instead of an exact copy? - if ( myWidget && myWidget->isA( "KListView" ) ) { + if ( myWidget && myWidget->isA( "TDEListView" ) ) { if ((_compositor.isEmpty()) || (!argb_visual_available)) { // Software blend only (no compositing support) TQPixmap copy( myWidget->size() ); diff --git a/tqt3integration/module/module.cpp b/tqt3integration/module/module.cpp index 3f3c4d418..67eb62870 100644 --- a/tqt3integration/module/module.cpp +++ b/tqt3integration/module/module.cpp @@ -152,7 +152,7 @@ void* Module::getColor( const TQColor& color, long parent, const TQCString& name void* Module::getFont( bool /*ok*/, const TQFont& def, long parent, const TQCString& name, const TQCString& wmclass1, const TQCString& wmclass2 ) { - KFontDialog* dlg = new KFontDialog( NULL, name.isEmpty() ? name : "Font Selector", false, false ); + TDEFontDialog* dlg = new TDEFontDialog( NULL, name.isEmpty() ? name : "Font Selector", false, false ); dlg->setFont( def, false ); prepareDialog( dlg, parent, wmclass1, wmclass2 ); dlg->setPlainCaption( i18n( "Select Font" )); @@ -301,7 +301,7 @@ void Module::dialogDone( int result ) KFileDialog* dlg = static_cast< KFileDialog* >( handle ); TQString filename = result == TQDialog::Accepted ? dlg->selectedFile() : TQString(); if (!filename.isEmpty()) - KRecentDocument::add(filename); + TDERecentDocument::add(filename); post_getSaveFileName( dlg, filename, dlg->baseURL().path(), dlg->currentFilter()); dlg->deleteLater(); break; @@ -322,7 +322,7 @@ void Module::dialogDone( int result ) } case JobData::GetFont: { - KFontDialog* dlg = static_cast< KFontDialog* >( handle ); + TDEFontDialog* dlg = static_cast< TDEFontDialog* >( handle ); post_getFont( dlg, result == TQDialog::Accepted ? dlg->font() : TQFont(), result == TQDialog::Accepted ); dlg->deleteLater(); break; diff --git a/tqt3integration/module/module.h b/tqt3integration/module/module.h index 4a4f215d4..1430e0530 100644 --- a/tqt3integration/module/module.h +++ b/tqt3integration/module/module.h @@ -115,21 +115,21 @@ class KColorDialog virtual void done( int r ) { ::KColorDialog::done( r ); emit dialogDone( r ); } // hmm? }; -class KFontDialog - : public ::KFontDialog +class TDEFontDialog + : public ::TDEFontDialog { Q_OBJECT public: - KFontDialog( TQWidget *parent, const char *name, bool onlyFixed, bool modal, + TDEFontDialog( TQWidget *parent, const char *name, bool onlyFixed, bool modal, const TQStringList &fontlist = TQStringList(), bool makeFrame = true, bool diff = false, TQButton::ToggleState *sizeIsRelativeState = 0L ) - : ::KFontDialog( parent, name, onlyFixed, modal, fontlist, makeFrame, diff, sizeIsRelativeState ) + : ::TDEFontDialog( parent, name, onlyFixed, modal, fontlist, makeFrame, diff, sizeIsRelativeState ) {} signals: void dialogDone( int result ); protected: - virtual void done( int r ) { ::KFontDialog::done( r ); emit dialogDone( r ); } + virtual void done( int r ) { ::TDEFontDialog::done( r ); emit dialogDone( r ); } }; class KDialogBase diff --git a/twin/activation.cpp b/twin/activation.cpp index eab4a2c87..ba95cde04 100644 --- a/twin/activation.cpp +++ b/twin/activation.cpp @@ -713,7 +713,7 @@ void Client::demandAttention( bool set ) // e.g. the passive popup next to it. So wait up to 1 second for the icon geometry // to be set. // Delayed call to KNotify also solves the problem of having X server grab in manage(), - // which may deadlock when KNotify (or KLauncher when launching KNotify) need to access X. + // which may deadlock when KNotify (or TDELauncher when launching KNotify) need to access X. Notify::Event e = isOnCurrentDesktop() ? Notify::DemandAttentionCurrent : Notify::DemandAttentionOther; // Setting the demands attention state needs to be done directly in KWin, because // KNotify would try to set it, resulting in a call to KNotify again, etc. diff --git a/twin/client.h b/twin/client.h index fa63e2b3a..ffa328592 100644 --- a/twin/client.h +++ b/twin/client.h @@ -239,7 +239,7 @@ class Client : public TQObject, public KDecorationDefines void shrinkVertical(); bool providesContextHelp() const; - KShortcut shortcut() const; + TDEShortcut shortcut() const; void setShortcut( const TQString& cut ); bool performMouseCommand( Options::MouseCommand, TQPoint globalPos, bool handled = false ); @@ -419,7 +419,7 @@ class Client : public TQObject, public KDecorationDefines void setCaption( const TQString& s, bool force = false ); bool hasTransientInternal( const Client* c, bool indirect, ConstClientList& set ) const; void finishWindowRules(); - void setShortcutInternal( const KShortcut& cut ); + void setShortcutInternal( const TDEShortcut& cut ); void updateWorkareaDiffs(); void checkDirection( int new_diff, int old_diff, TQRect& rect, const TQRect& area ); @@ -584,7 +584,7 @@ class Client : public TQObject, public KDecorationDefines TQRegion _mask; static bool check_active_modal; // see Client::checkActiveModal() - KShortcut _shortcut; + TDEShortcut _shortcut; friend struct FetchNameInternalPredicate; friend struct CheckIgnoreFocusStealingProcedure; friend struct ResetupRulesProcedure; @@ -964,7 +964,7 @@ inline Window Client::moveResizeGrabWindow() const return move_resize_grab_window; } -inline KShortcut Client::shortcut() const +inline TDEShortcut Client::shortcut() const { return _shortcut; } diff --git a/twin/group.cpp b/twin/group.cpp index 50fce46f0..fb625b3e4 100644 --- a/twin/group.cpp +++ b/twin/group.cpp @@ -479,8 +479,8 @@ bool Client::belongToSameApplication( const Client* c1, const Client* c2, bool a // Non-transient windows with window role containing '#' are always // considered belonging to different applications (unless -// the window role is exactly the same). KMainWindow sets -// window role this way by default, and different KMainWindow +// the window role is exactly the same). TDEMainWindow sets +// window role this way by default, and different TDEMainWindow // usually "are" different application from user's point of view. // This help with no-focus-stealing for e.g. konqy reusing. // On the other hand, if one of the windows is active, they are diff --git a/twin/kcmtwin/twindecoration/buttons.cpp b/twin/kcmtwin/twindecoration/buttons.cpp index fc00dea9d..55b5beb56 100644 --- a/twin/kcmtwin/twindecoration/buttons.cpp +++ b/twin/kcmtwin/twindecoration/buttons.cpp @@ -121,7 +121,7 @@ TQPixmap bitmapPixmap(const TQBitmap& bm, const TQColor& color) ButtonSource::ButtonSource(TQWidget *parent, const char* name) - : KListView(parent, name) + : TDEListView(parent, name) { setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); diff --git a/twin/kcmtwin/twindecoration/buttons.h b/twin/kcmtwin/twindecoration/buttons.h index e1dbbc812..d3a794569 100644 --- a/twin/kcmtwin/twindecoration/buttons.h +++ b/twin/kcmtwin/twindecoration/buttons.h @@ -109,7 +109,7 @@ class ButtonSourceItem : public TQListViewItem /** * Implements the button drag source list view */ -class ButtonSource : public KListView +class ButtonSource : public TDEListView { Q_OBJECT diff --git a/twin/kcmtwin/twinoptions/main.cpp b/twin/kcmtwin/twinoptions/main.cpp index aac2436d1..5e79c6365 100644 --- a/twin/kcmtwin/twinoptions/main.cpp +++ b/twin/kcmtwin/twinoptions/main.cpp @@ -48,7 +48,7 @@ extern "C" { //CT there's need for decision: kwm or twin? TDEGlobal::locale()->insertCatalogue("kcmkwm"); - return new KActionsOptions( parent, name); + return new TDEActionsOptions( parent, name); } KDE_EXPORT TDECModule *create_twinmoving(TQWidget *parent, const char *name) @@ -201,7 +201,7 @@ void KWinOptions::moduleChanged(bool state) } -KActionsOptions::KActionsOptions(TQWidget *parent, const char *name) +TDEActionsOptions::TDEActionsOptions(TQWidget *parent, const char *name) : TDECModule(parent, name) { mConfig = new TDEConfig("twinrc", false, true); @@ -221,12 +221,12 @@ KActionsOptions::KActionsOptions(TQWidget *parent, const char *name) connect(mWindowActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); } -KActionsOptions::~KActionsOptions() +TDEActionsOptions::~TDEActionsOptions() { delete mConfig; } -void KActionsOptions::load() +void TDEActionsOptions::load() { mTitleBarActions->load(); mWindowActions->load(); @@ -234,7 +234,7 @@ void KActionsOptions::load() } -void KActionsOptions::save() +void TDEActionsOptions::save() { mTitleBarActions->save(); mWindowActions->save(); @@ -248,13 +248,13 @@ void KActionsOptions::save() } -void KActionsOptions::defaults() +void TDEActionsOptions::defaults() { mTitleBarActions->defaults(); mWindowActions->defaults(); } -void KActionsOptions::moduleChanged(bool state) +void TDEActionsOptions::moduleChanged(bool state) { emit TDECModule::changed(state); } diff --git a/twin/kcmtwin/twinoptions/main.h b/twin/kcmtwin/twinoptions/main.h index c1146fa92..cb80f7e8d 100644 --- a/twin/kcmtwin/twinoptions/main.h +++ b/twin/kcmtwin/twinoptions/main.h @@ -69,14 +69,14 @@ private: TDEConfig *mConfig; }; -class KActionsOptions : public TDECModule +class TDEActionsOptions : public TDECModule { Q_OBJECT public: - KActionsOptions(TQWidget *parent, const char *name); - virtual ~KActionsOptions(); + TDEActionsOptions(TQWidget *parent, const char *name); + virtual ~TDEActionsOptions(); void load(); void save(); diff --git a/twin/kcmtwin/twinrules/ruleslistbase.ui b/twin/kcmtwin/twinrules/ruleslistbase.ui index 8ab21412b..078d1ef2c 100644 --- a/twin/kcmtwin/twinrules/ruleslistbase.ui +++ b/twin/kcmtwin/twinrules/ruleslistbase.ui @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="KListBox" row="0" column="0" rowspan="6" colspan="1"> + <widget class="TDEListBox" row="0" column="0" rowspan="6" colspan="1"> <property name="name"> <cstring>rules_listbox</cstring> </property> diff --git a/twin/kcmtwin/twinrules/ruleswidget.cpp b/twin/kcmtwin/twinrules/ruleswidget.cpp index 8680018d7..dcf7cd358 100644 --- a/twin/kcmtwin/twinrules/ruleswidget.cpp +++ b/twin/kcmtwin/twinrules/ruleswidget.cpp @@ -735,7 +735,7 @@ EditShortcut::EditShortcut( TQWidget* parent, const char* name ) void EditShortcut::editShortcut() { - ShortcutDialog dlg( KShortcut( shortcut->text()), topLevelWidget()); + ShortcutDialog dlg( TDEShortcut( shortcut->text()), topLevelWidget()); if( dlg.exec() == TQDialog::Accepted ) shortcut->setText( dlg.shortcut().toString()); } @@ -762,8 +762,8 @@ TQString EditShortcutDialog::shortcut() const return widget->shortcut->text(); } -ShortcutDialog::ShortcutDialog( const KShortcut& cut, TQWidget* parent, const char* name ) - : KShortcutDialog( cut, false /*TODO???*/, parent, name ) +ShortcutDialog::ShortcutDialog( const TDEShortcut& cut, TQWidget* parent, const char* name ) + : TDEShortcutDialog( cut, false /*TODO???*/, parent, name ) { } @@ -783,19 +783,19 @@ void ShortcutDialog::accept() } if( seq.key( 0 ) == Key_Space ) { // clear - setShortcut( KShortcut()); - KShortcutDialog::accept(); + setShortcut( TDEShortcut()); + TDEShortcutDialog::accept(); return; } if( seq.key( 0 ).modFlags() == 0 ) { // no shortcuts without modifiers - KShortcut cut = shortcut(); + TDEShortcut cut = shortcut(); cut.setSeq( i, KKeySequence()); setShortcut( cut ); return; } } - KShortcutDialog::accept(); + TDEShortcutDialog::accept(); } } // namespace diff --git a/twin/kcmtwin/twinrules/ruleswidget.h b/twin/kcmtwin/twinrules/ruleswidget.h index 2a9b0d036..f3f6f9881 100644 --- a/twin/kcmtwin/twinrules/ruleswidget.h +++ b/twin/kcmtwin/twinrules/ruleswidget.h @@ -135,11 +135,11 @@ class EditShortcutDialog // slightly duped from utils.cpp class ShortcutDialog - : public KShortcutDialog + : public TDEShortcutDialog { Q_OBJECT public: - ShortcutDialog( const KShortcut& cut, TQWidget* parent = NULL, const char* name = NULL ); + ShortcutDialog( const TDEShortcut& cut, TQWidget* parent = NULL, const char* name = NULL ); virtual void accept(); }; diff --git a/twin/kcmtwin/twinrules/ruleswidgetbase.ui b/twin/kcmtwin/twinrules/ruleswidgetbase.ui index c83bbef92..d99b475b2 100644 --- a/twin/kcmtwin/twinrules/ruleswidgetbase.ui +++ b/twin/kcmtwin/twinrules/ruleswidgetbase.ui @@ -329,7 +329,7 @@ <cstring>types</cstring> </property> </widget> - <widget class="KListBox" row="1" column="0" rowspan="1" colspan="4"> + <widget class="TDEListBox" row="1" column="0" rowspan="1" colspan="4"> <item> <property name="text"> <string>Normal Window</string> diff --git a/twin/notifications.cpp b/twin/notifications.cpp index 288cbd029..5a83e9bce 100644 --- a/twin/notifications.cpp +++ b/twin/notifications.cpp @@ -105,9 +105,9 @@ bool Notify::raise( Event e, const TQString& message, Client* c ) return false; // There may be a deadlock if KNotify event is sent while KWin has X grabbed. -// If KNotify is not running, KLauncher may do X requests (startup notification, whatever) +// If KNotify is not running, TDELauncher may do X requests (startup notification, whatever) // that will block it. And KNotifyClient waits for the launch to succeed, which means -// KLauncher waits for X and KWin waits for KLauncher. So postpone events in such case. +// TDELauncher waits for X and KWin waits for TDELauncher. So postpone events in such case. if( grabbedXServer()) { EventData data; diff --git a/twin/sm.cpp b/twin/sm.cpp index 0ce286fdd..3a07d7b80 100644 --- a/twin/sm.cpp +++ b/twin/sm.cpp @@ -251,7 +251,7 @@ bool Workspace::sessionInfoWindowTypeMatch( Client* c, SessionInfo* info ) // maybe needed later #if 0 -// KMainWindow's without name() given have WM_WINDOW_ROLE in the form +// TDEMainWindow's without name() given have WM_WINDOW_ROLE in the form // of <appname>-mainwindow#<number> // when comparing them for fake session info, it's probably better to check // them without the trailing number diff --git a/twin/tabbox.cpp b/twin/tabbox.cpp index 85da5a7be..7d343962f 100644 --- a/twin/tabbox.cpp +++ b/twin/tabbox.cpp @@ -847,7 +847,7 @@ static bool areModKeysDepressed( const KKeySequence& seq ) return areKeySymXsDepressed( false, rgKeySyms, nKeySyms ); } -static bool areModKeysDepressed( const KShortcut& cut ) +static bool areModKeysDepressed( const TDEShortcut& cut ) { for( unsigned int i = 0; i < cut.count(); diff --git a/twin/useractions.cpp b/twin/useractions.cpp index 1b5769f8d..f3bf3ed18 100644 --- a/twin/useractions.cpp +++ b/twin/useractions.cpp @@ -320,7 +320,7 @@ void Workspace::setupWindowShortcutDone( bool ok ) client_keys->suspend( false ); if( ok ) { - client_keys_client->setShortcut( KShortcut( client_keys_dialog->shortcut()).toString()); + client_keys_client->setShortcut( TDEShortcut( client_keys_dialog->shortcut()).toString()); } closeActivePopup(); delete client_keys_dialog; @@ -1053,7 +1053,7 @@ void Workspace::slotWindowOperations() void Workspace::showWindowMenu( const TQRect &pos, Client* cl ) { - if (!kapp->authorizeKAction("twin_rmb")) + if (!kapp->authorizeTDEAction("twin_rmb")) return; if( !cl ) return; @@ -1120,19 +1120,19 @@ void Client::setShortcut( const TQString& _cut ) { TQString cut = rules()->checkShortcut( _cut ); if( cut.isEmpty()) - return setShortcutInternal( KShortcut()); + return setShortcutInternal( TDEShortcut()); // Format: // base+(abcdef)<space>base+(abcdef) // E.g. Alt+Ctrl+(ABCDEF) Win+X,Win+(ABCDEF) if( !cut.contains( '(' ) && !cut.contains( ')' ) && !cut.contains( ' ' )) { - if( workspace()->shortcutAvailable( KShortcut( cut ), this )) - setShortcutInternal( KShortcut( cut )); + if( workspace()->shortcutAvailable( TDEShortcut( cut ), this )) + setShortcutInternal( TDEShortcut( cut )); else - setShortcutInternal( KShortcut()); + setShortcutInternal( TDEShortcut()); return; } - TQValueList< KShortcut > keys; + TQValueList< TDEShortcut > keys; TQStringList groups = TQStringList::split( ' ', cut ); for( TQStringList::ConstIterator it = groups.begin(); it != groups.end(); @@ -1147,20 +1147,20 @@ void Client::setShortcut( const TQString& _cut ) i < list.length(); ++i ) { - KShortcut c( base + list[ i ] ); + TDEShortcut c( base + list[ i ] ); if( !c.isNull()) keys.append( c ); } } } - for( TQValueList< KShortcut >::ConstIterator it = keys.begin(); + for( TQValueList< TDEShortcut >::ConstIterator it = keys.begin(); it != keys.end(); ++it ) { if( _shortcut == *it ) // current one is in the list return; } - for( TQValueList< KShortcut >::ConstIterator it = keys.begin(); + for( TQValueList< TDEShortcut >::ConstIterator it = keys.begin(); it != keys.end(); ++it ) { @@ -1170,10 +1170,10 @@ void Client::setShortcut( const TQString& _cut ) return; } } - setShortcutInternal( KShortcut()); + setShortcutInternal( TDEShortcut()); } -void Client::setShortcutInternal( const KShortcut& cut ) +void Client::setShortcutInternal( const TDEShortcut& cut ) { if( _shortcut == cut ) return; @@ -1182,7 +1182,7 @@ void Client::setShortcutInternal( const KShortcut& cut ) workspace()->clientShortcutUpdated( this ); } -bool Workspace::shortcutAvailable( const KShortcut& cut, Client* ignore ) const +bool Workspace::shortcutAvailable( const TDEShortcut& cut, Client* ignore ) const { // TODO check global shortcuts etc. for( ClientList::ConstIterator it = clients.begin(); diff --git a/twin/utils.cpp b/twin/utils.cpp index 1159deb30..47c09b0e5 100644 --- a/twin/utils.cpp +++ b/twin/utils.cpp @@ -137,7 +137,7 @@ void Motif::readFlags( WId w, bool& noborder, bool& resize, bool& move, //************************************ KWinSelectionOwner::KWinSelectionOwner( int screen_P ) - : KSelectionOwner( make_selection_atom( screen_P ), screen_P ) + : TDESelectionOwner( make_selection_atom( screen_P ), screen_P ) { } @@ -152,7 +152,7 @@ Atom KWinSelectionOwner::make_selection_atom( int screen_P ) void KWinSelectionOwner::getAtoms() { - KSelectionOwner::getAtoms(); + TDESelectionOwner::getAtoms(); if( xa_version == None ) { Atom atoms[ 1 ]; @@ -165,7 +165,7 @@ void KWinSelectionOwner::getAtoms() void KWinSelectionOwner::replyTargets( Atom property_P, Window requestor_P ) { - KSelectionOwner::replyTargets( property_P, requestor_P ); + TDESelectionOwner::replyTargets( property_P, requestor_P ); Atom atoms[ 1 ] = { xa_version }; // PropModeAppend ! XChangeProperty( tqt_xdisplay(), requestor_P, property_P, XA_ATOM, 32, PropModeAppend, @@ -181,7 +181,7 @@ bool KWinSelectionOwner::genericReply( Atom target_P, Atom property_P, Window re PropModeReplace, reinterpret_cast< unsigned char* >( &version ), 2 ); } else - return KSelectionOwner::genericReply( target_P, property_P, requestor_P ); + return TDESelectionOwner::genericReply( target_P, property_P, requestor_P ); return true; } @@ -351,8 +351,8 @@ bool isLocalMachine( const TQCString& host ) } #ifndef KCMRULES -ShortcutDialog::ShortcutDialog( const KShortcut& cut ) - : KShortcutDialog( cut, false /*TODO???*/ ) +ShortcutDialog::ShortcutDialog( const TDEShortcut& cut ) + : TDEShortcutDialog( cut, false /*TODO???*/ ) { // make it a popup, so that it has the grab XSetWindowAttributes attrs; @@ -377,19 +377,19 @@ void ShortcutDialog::accept() } if( seq.key( 0 ) == Key_Space ) { // clear - setShortcut( KShortcut()); - KShortcutDialog::accept(); + setShortcut( TDEShortcut()); + TDEShortcutDialog::accept(); return; } if( seq.key( 0 ).modFlags() == 0 ) { // no shortcuts without modifiers - KShortcut cut = shortcut(); + TDEShortcut cut = shortcut(); cut.setSeq( i, KKeySequence()); setShortcut( cut ); return; } } - KShortcutDialog::accept(); + TDEShortcutDialog::accept(); } // Workaround for Qt bug causing #119142 - wheel event causes only calling @@ -399,7 +399,7 @@ void ShortcutDialog::accept() void ShortcutDialog::hide() { close(); - return KShortcutDialog::hide(); + return TDEShortcutDialog::hide(); } #endif diff --git a/twin/utils.h b/twin/utils.h index 538a7c6b5..94edb8b4d 100644 --- a/twin/utils.h +++ b/twin/utils.h @@ -153,7 +153,7 @@ class Motif }; class KWinSelectionOwner - : public KSelectionOwner + : public TDESelectionOwner { Q_OBJECT public: @@ -254,17 +254,17 @@ void checkNonExistentClients(); #ifndef KCMRULES // Qt dialogs emit no signal when closed :( class ShortcutDialog - : public KShortcutDialog + : public TDEShortcutDialog { Q_OBJECT public: - ShortcutDialog( const KShortcut& cut ); + ShortcutDialog( const TDEShortcut& cut ); virtual void accept(); virtual void hide(); signals: void dialogDone( bool ok ); protected: - virtual void done( int r ) { KShortcutDialog::done( r ); emit dialogDone( r == Accepted ); } + virtual void done( int r ) { TDEShortcutDialog::done( r ); emit dialogDone( r == Accepted ); } }; #endif diff --git a/twin/workspace.cpp b/twin/workspace.cpp index d7ce0d884..21598fbd2 100644 --- a/twin/workspace.cpp +++ b/twin/workspace.cpp @@ -56,7 +56,7 @@ extern int screen_number; Workspace *Workspace::_self = 0; TDEProcess* kompmgr = 0; -KSelectionOwner* kompmgr_selection; +TDESelectionOwner* kompmgr_selection; bool allowKompmgrRestart = TRUE; @@ -416,8 +416,8 @@ void Workspace::init() char nm[ 100 ]; sprintf( nm, "_KDE_TOPMENU_OWNER_S%d", DefaultScreen( tqt_xdisplay())); Atom topmenu_atom = XInternAtom( tqt_xdisplay(), nm, False ); - topmenu_selection = new KSelectionOwner( topmenu_atom ); - topmenu_watcher = new KSelectionWatcher( topmenu_atom ); + topmenu_selection = new TDESelectionOwner( topmenu_atom ); + topmenu_watcher = new TDESelectionWatcher( topmenu_atom ); // TODO grabXServer(); - where exactly put this? topmenu selection claiming down belong must be before { // begin updates blocker block @@ -2814,7 +2814,7 @@ void Workspace::startKompmgr() delete kompmgr_selection; char selection_name[ 100 ]; sprintf( selection_name, "_NET_WM_CM_S%d", DefaultScreen( tqt_xdisplay())); - kompmgr_selection = new KSelectionOwner( selection_name ); + kompmgr_selection = new TDESelectionOwner( selection_name ); connect( kompmgr_selection, TQT_SIGNAL( lostOwnership()), TQT_SLOT( stopKompmgr())); kompmgr_selection->claim( true ); connect(kompmgr, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(restartKompmgr(TDEProcess*))); diff --git a/twin/workspace.h b/twin/workspace.h index e1db8bfbd..74f898668 100644 --- a/twin/workspace.h +++ b/twin/workspace.h @@ -29,7 +29,7 @@ License. See the file "COPYING" for the exact licensing terms. class TQPopupMenu; class TDEConfig; class TDEGlobalAccel; -class KShortcutDialog; +class TDEShortcutDialog; class TDEStartupInfo; class TDEStartupInfoId; class TDEStartupInfoData; @@ -276,7 +276,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin bool forcedGlobalMouseGrab() const; void clientShortcutUpdated( Client* c ); - bool shortcutAvailable( const KShortcut& cut, Client* ignore = NULL ) const; + bool shortcutAvailable( const TDEShortcut& cut, Client* ignore = NULL ) const; bool globalShortcutsDisabled() const; void disableGlobalShortcuts( bool disable ); void disableGlobalShortcutsForClient( bool disable ); @@ -567,10 +567,10 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin //KKeyNative walkThroughDesktopsKeycode, walkBackThroughDesktopsKeycode; //KKeyNative walkThroughDesktopListKeycode, walkBackThroughDesktopListKeycode; //KKeyNative walkThroughWindowsKeycode, walkBackThroughWindowsKeycode; - KShortcut cutWalkThroughDesktops, cutWalkThroughDesktopsReverse; - KShortcut cutWalkThroughDesktopList, cutWalkThroughDesktopListReverse; - KShortcut cutWalkThroughWindows, cutWalkThroughWindowsReverse; - KShortcut cutWalkThroughApps, cutWalkThroughAppsReverse; + TDEShortcut cutWalkThroughDesktops, cutWalkThroughDesktopsReverse; + TDEShortcut cutWalkThroughDesktopList, cutWalkThroughDesktopListReverse; + TDEShortcut cutWalkThroughWindows, cutWalkThroughWindowsReverse; + TDEShortcut cutWalkThroughApps, cutWalkThroughAppsReverse; bool mouse_emulation; unsigned int mouse_emulation_state; WId mouse_emulation_window; @@ -641,8 +641,8 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin TQRect** screenarea; // array of workareas per xinerama screen for all virtual desktops bool managing_topmenus; - KSelectionOwner* topmenu_selection; - KSelectionWatcher* topmenu_watcher; + TDESelectionOwner* topmenu_selection; + TDESelectionWatcher* topmenu_watcher; ClientList topmenus; // doesn't own them mutable int topmenu_height; TQWidget* topmenu_space; |