summaryrefslogtreecommitdiffstats
path: root/kate/app
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:11:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:11:21 -0600
commitf537c21b68e08f649b1b297bce8f3904603137e0 (patch)
treefb33065387509dea898c90022ddec9c3f8ede86d /kate/app
parentdc5f267664506a312203c26bfe9001a448b0bb0f (diff)
downloadtdebase-f537c21b68e08f649b1b297bce8f3904603137e0.tar.gz
tdebase-f537c21b68e08f649b1b297bce8f3904603137e0.zip
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kate/app')
-rw-r--r--kate/app/kateapp.cpp2
-rw-r--r--kate/app/kateconfigplugindialogpage.cpp2
-rw-r--r--kate/app/kateconfigplugindialogpage.h2
-rw-r--r--kate/app/kateexternaltools.cpp14
-rw-r--r--kate/app/kateexternaltools.h10
-rw-r--r--kate/app/katefilelist.cpp18
-rw-r--r--kate/app/katefilelist.h16
-rw-r--r--kate/app/katefileselector.cpp32
-rw-r--r--kate/app/katefileselector.h14
-rw-r--r--kate/app/kategrepdialog.cpp2
-rw-r--r--kate/app/katemailfilesdialog.cpp2
-rw-r--r--kate/app/katemailfilesdialog.h2
-rw-r--r--kate/app/katemain.h12
-rw-r--r--kate/app/katemainwindow.cpp28
-rw-r--r--kate/app/katemainwindow.h10
-rw-r--r--kate/app/katemdi.cpp22
-rw-r--r--kate/app/katemdi.h12
-rw-r--r--kate/app/katemwmodonhddialog.cpp4
-rw-r--r--kate/app/katemwmodonhddialog.h2
-rw-r--r--kate/app/katesavemodifieddialog.cpp2
-rw-r--r--kate/app/katesavemodifieddialog.h4
-rw-r--r--kate/app/katesession.cpp10
-rw-r--r--kate/app/katesession.h10
-rw-r--r--kate/app/kateviewmanager.cpp24
-rw-r--r--kate/app/kateviewmanager.h14
-rw-r--r--kate/app/kateviewspace.cpp2
-rw-r--r--kate/app/kbookmarkhandler.cpp4
-rw-r--r--kate/app/kbookmarkhandler.h10
-rw-r--r--kate/app/kwritemain.cpp12
-rw-r--r--kate/app/kwritemain.h14
30 files changed, 156 insertions, 156 deletions
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&nbsp;&gt;&gt;</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;