summaryrefslogtreecommitdiffstats
path: root/tdemdi
diff options
context:
space:
mode:
Diffstat (limited to 'tdemdi')
-rw-r--r--tdemdi/tdemdi/guiclient.cpp8
-rw-r--r--tdemdi/tdemdi/guiclient.h4
-rw-r--r--tdemdi/tdemdi/mainwindow.h2
-rw-r--r--tdemdi/tdemdi/tabwidget.cpp2
-rw-r--r--tdemdi/tdemdi/toolviewaccessor_p.h2
-rw-r--r--tdemdi/tdemdidocumentviewtabwidget.cpp2
-rw-r--r--tdemdi/tdemdiguiclient.cpp10
-rw-r--r--tdemdi/tdemdiguiclient.h2
-rw-r--r--tdemdi/tdemdimainfrm.cpp2
-rw-r--r--tdemdi/tdemdimainfrm.h2
-rw-r--r--tdemdi/tdemditaskbar.h2
-rw-r--r--tdemdi/tdemditoolviewaccessor_p.h2
12 files changed, 20 insertions, 20 deletions
diff --git a/tdemdi/tdemdi/guiclient.cpp b/tdemdi/tdemdi/guiclient.cpp
index 536508992..d3e162e14 100644
--- a/tdemdi/tdemdi/guiclient.cpp
+++ b/tdemdi/tdemdi/guiclient.cpp
@@ -1,7 +1,7 @@
/* This file is part of the KDE libraries
Copyright (C) 2003 Joseph Wenninger <jowenn@kde.org>
Copyright (C) 2004 Christoph Cullmann <cullmann@kde.org>
- based on ktoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
+ based on tdetoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -24,9 +24,9 @@
#include <tqpopupmenu.h>
#include <kapplication.h>
#include <tdeconfig.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
#include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <tqstring.h>
#include <kdebug.h>
#include <kdockwidget.h>
@@ -73,7 +73,7 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name)
setXML( completeDescription, false /*merge*/ );
}
- if (actionCollection()->kaccel()==0)
+ if (actionCollection()->tdeaccel()==0)
actionCollection()->setWidget(mdiMainFrm);
m_toolMenu=new TDEActionMenu(i18n("Tool &Views"),actionCollection(),"tdemdi_toolview_menu");
diff --git a/tdemdi/tdemdi/guiclient.h b/tdemdi/tdemdi/guiclient.h
index 5c8822a0a..4f12e4b30 100644
--- a/tdemdi/tdemdi/guiclient.h
+++ b/tdemdi/tdemdi/guiclient.h
@@ -1,7 +1,7 @@
/* This file is part of the KDE libraries
Copyright (C) 2003 Joseph Wenninger <jowenn@kde.org>
Copyright (C) 2004 Christoph Cullmann <cullmann@kde.org>
- based on ktoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
+ based on tdetoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -24,7 +24,7 @@
#include <tqobject.h>
#include <tqguardedptr.h>
#include <kxmlguiclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <tdemdi/global.h>
diff --git a/tdemdi/tdemdi/mainwindow.h b/tdemdi/tdemdi/mainwindow.h
index 0916cb908..e8ae6e9fc 100644
--- a/tdemdi/tdemdi/mainwindow.h
+++ b/tdemdi/tdemdi/mainwindow.h
@@ -44,7 +44,7 @@
#include <tdeparts/dockmainwindow.h>
#include <kmenubar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <tqptrlist.h>
#include <tqrect.h>
diff --git a/tdemdi/tdemdi/tabwidget.cpp b/tdemdi/tdemdi/tabwidget.cpp
index 2d9603bf5..261fb6d55 100644
--- a/tdemdi/tdemdi/tabwidget.cpp
+++ b/tdemdi/tdemdi/tabwidget.cpp
@@ -40,7 +40,7 @@
*/
#include <ktabbar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kdebug.h>
#include <tqobjectlist.h>
diff --git a/tdemdi/tdemdi/toolviewaccessor_p.h b/tdemdi/tdemdi/toolviewaccessor_p.h
index db2eb9dc8..e5f2b9138 100644
--- a/tdemdi/tdemdi/toolviewaccessor_p.h
+++ b/tdemdi/tdemdi/toolviewaccessor_p.h
@@ -22,7 +22,7 @@
#include <kdockwidget.h>
#include <tqguardedptr.h>
-#include <kaction.h>
+#include <tdeaction.h>
namespace KMDIPrivate
{
diff --git a/tdemdi/tdemdidocumentviewtabwidget.cpp b/tdemdi/tdemdidocumentviewtabwidget.cpp
index dcfa60976..936125e7f 100644
--- a/tdemdi/tdemdidocumentviewtabwidget.cpp
+++ b/tdemdi/tdemdidocumentviewtabwidget.cpp
@@ -10,7 +10,7 @@
#include <tqtimer.h>
#include <ktabbar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include "tdemdidocumentviewtabwidget.h"
KMdiDocumentViewTabWidget::KMdiDocumentViewTabWidget( TQWidget* parent, const char* name ) : KTabWidget( parent, name )
diff --git a/tdemdi/tdemdiguiclient.cpp b/tdemdi/tdemdiguiclient.cpp
index 449157b7a..c9b2f70f3 100644
--- a/tdemdi/tdemdiguiclient.cpp
+++ b/tdemdi/tdemdiguiclient.cpp
@@ -1,6 +1,6 @@
/* This file is part of the KDE libraries
Copyright (C) 2003 Joseph Wenninger <jowenn@kde.org>
- based on ktoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
+ based on tdetoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -23,10 +23,10 @@
#include <tqpopupmenu.h>
#include <kapplication.h>
#include <tdeconfig.h>
-#include <ktoolbar.h>
-#include <kmainwindow.h>
+#include <tdetoolbar.h>
+#include <tdemainwindow.h>
#include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <tqstring.h>
#include <assert.h>
#include <kdebug.h>
@@ -134,7 +134,7 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c
setXML( completeDescription, false /*merge*/ );
}
- if ( actionCollection() ->kaccel() == 0 )
+ if ( actionCollection() ->tdeaccel() == 0 )
actionCollection() ->setWidget( mdiMainFrm );
m_toolMenu = new TDEActionMenu( i18n( "Tool &Views" ), actionCollection(), "tdemdi_toolview_menu" );
if ( showMDIModeAction )
diff --git a/tdemdi/tdemdiguiclient.h b/tdemdi/tdemdiguiclient.h
index 22f9e51f0..711cf9f0d 100644
--- a/tdemdi/tdemdiguiclient.h
+++ b/tdemdi/tdemdiguiclient.h
@@ -22,7 +22,7 @@
#include <tqobject.h>
#include <tqguardedptr.h>
#include <kxmlguiclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include "tdemdidefines.h"
class TDEMainWindow;
diff --git a/tdemdi/tdemdimainfrm.cpp b/tdemdi/tdemdimainfrm.cpp
index 6f14c09bd..771afb8de 100644
--- a/tdemdi/tdemdimainfrm.cpp
+++ b/tdemdi/tdemdimainfrm.cpp
@@ -49,7 +49,7 @@
#include <tdeversion.h>
#include <tqtabwidget.h>
#include <klocale.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
#include <kiconloader.h>
#include <tdemdidockcontainer.h>
diff --git a/tdemdi/tdemdimainfrm.h b/tdemdi/tdemdimainfrm.h
index 08dc83db9..720324ad5 100644
--- a/tdemdi/tdemdimainfrm.h
+++ b/tdemdi/tdemdimainfrm.h
@@ -33,7 +33,7 @@
#include <tdeparts/dockmainwindow.h>
#include <kmenubar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <tqptrlist.h>
#include <tqrect.h>
diff --git a/tdemdi/tdemditaskbar.h b/tdemdi/tdemditaskbar.h
index 9c853e7cf..3f90fb346 100644
--- a/tdemdi/tdemditaskbar.h
+++ b/tdemdi/tdemditaskbar.h
@@ -28,7 +28,7 @@
#ifndef _KMDITASKBAR_H_
#define _KMDITASKBAR_H_
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
#include <tqptrlist.h>
#include <tqpixmap.h>
#include <tqlabel.h>
diff --git a/tdemdi/tdemditoolviewaccessor_p.h b/tdemdi/tdemditoolviewaccessor_p.h
index c3812792f..ec19b8629 100644
--- a/tdemdi/tdemditoolviewaccessor_p.h
+++ b/tdemdi/tdemditoolviewaccessor_p.h
@@ -27,7 +27,7 @@
#include <tqwidget.h>
#include <kdockwidget.h>
#include <tqguardedptr.h>
-#include <kaction.h>
+#include <tdeaction.h>
class KMDI_EXPORT KMdiToolViewAccessorPrivate {
public:
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-17 09:33:38 +0000