summaryrefslogtreecommitdiffstats
path: root/lib/compatibility
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:16:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:16:01 -0600
commit9771f17f8cc5252b12ec5f3edf47ff9bffdf997f (patch)
treeb9e389db87bdba126010d03fb5bccdc748d0e6fa /lib/compatibility
parent9930e16dde86b7de9b792613d826f4f8648b9768 (diff)
downloadtdewebdev-9771f17f8cc5252b12ec5f3edf47ff9bffdf997f.tar.gz
tdewebdev-9771f17f8cc5252b12ec5f3edf47ff9bffdf997f.zip
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'lib/compatibility')
-rw-r--r--lib/compatibility/knewstuff/downloaddialog.cpp26
-rw-r--r--lib/compatibility/knewstuff/downloaddialog.h6
-rw-r--r--lib/compatibility/knewstuff/knewstuff.cpp6
-rw-r--r--lib/compatibility/knewstuff/knewstuff.h8
-rw-r--r--lib/compatibility/knewstuff/providerdialog.cpp8
-rw-r--r--lib/compatibility/knewstuff/providerdialog.h4
-rw-r--r--lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp12
-rw-r--r--lib/compatibility/tdemdi/qextmdi/kdockwidget.h8
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h2
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp38
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h22
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp10
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp4
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h2
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor_p.h2
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp2
16 files changed, 80 insertions, 80 deletions
diff --git a/lib/compatibility/knewstuff/downloaddialog.cpp b/lib/compatibility/knewstuff/downloaddialog.cpp
index afc27b16..670d989e 100644
--- a/lib/compatibility/knewstuff/downloaddialog.cpp
+++ b/lib/compatibility/knewstuff/downloaddialog.cpp
@@ -46,11 +46,11 @@
using namespace KNS;
-class NumSortListViewItem : public KListViewItem
+class NumSortListViewItem : public TDEListViewItem
{
public:
NumSortListViewItem( TQListView * parent, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), TQString label5 = TQString(), TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString() ) :
- KListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8 )
+ TDEListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8 )
{
}
@@ -62,7 +62,7 @@ class NumSortListViewItem : public KListViewItem
s.sprintf("%08d", text(col).toInt());
return s;
}
- return KListViewItem::key( col, asc );
+ return TDEListViewItem::key( col, asc );
}
};
@@ -136,10 +136,10 @@ void DownloadDialog::load(TQString providerList)
void DownloadDialog::clear()
{
- TQMap<TQWidget*, TQValueList<KListView*>* >::Iterator it;
+ TQMap<TQWidget*, TQValueList<TDEListView*>* >::Iterator it;
for(it = m_map.begin(); it != m_map.end(); ++it)
{
- TQValueList<KListView*> *v = it.data();
+ TQValueList<TDEListView*> *v = it.data();
kdDebug() << "clear listviews in " << v << endl;
if(v)
{
@@ -179,7 +179,7 @@ void DownloadDialog::addProvider(Provider *p)
KTabCtl *ctl;
TQWidget *w_d, *w_r, *w_l;
TQWidget *w2;
- KListView *lvtmp_r, *lvtmp_d, *lvtmp_l;
+ TDEListView *lvtmp_r, *lvtmp_d, *lvtmp_l;
TQTextBrowser *rt;
TQString tmp;
int ret;
@@ -217,19 +217,19 @@ void DownloadDialog::addProvider(Provider *p)
TQHBoxLayout *box = new TQHBoxLayout(frame);
box->add(ctl);
- lvtmp_r = new KListView(w_r);
+ lvtmp_r = new TDEListView(w_r);
lvtmp_r->addColumn(i18n("Name"));
lvtmp_r->addColumn(i18n("Version"));
lvtmp_r->addColumn(i18n("Rating"));
lvtmp_r->setSorting(2, false);
- lvtmp_d = new KListView(w_d);
+ lvtmp_d = new TDEListView(w_d);
lvtmp_d->addColumn(i18n("Name"));
lvtmp_d->addColumn(i18n("Version"));
lvtmp_d->addColumn(i18n("Downloads"));
lvtmp_d->setSorting(2, false);
- lvtmp_l = new KListView(w_l);
+ lvtmp_l = new TDEListView(w_l);
lvtmp_l->addColumn(i18n("Name"));
lvtmp_l->addColumn(i18n("Version"));
lvtmp_l->addColumn(i18n("Release Date"));
@@ -264,7 +264,7 @@ void DownloadDialog::addProvider(Provider *p)
TQVBoxLayout *box4 = new TQVBoxLayout(w_l);
box4->add(lvtmp_l);
- TQValueList<KListView*> *v = new TQValueList<KListView*>;
+ TQValueList<TDEListView*> *v = new TQValueList<TDEListView*>;
*v << lvtmp_r << lvtmp_d << lvtmp_l;
m_map[frame] = v;
m_rts[frame] = rt;
@@ -363,11 +363,11 @@ void DownloadDialog::addEntry(Entry *entry)
else if(installed < 0) pix = TDEGlobal::iconLoader()->loadIcon("history", KIcon::Small);
else pix = TQPixmap();
- KListViewItem *tmp_r = new KListViewItem(lv_r,
+ TDEListViewItem *tmp_r = new TDEListViewItem(lv_r,
entry->name(), entry->version(), TQString("%1").arg(entry->rating()));
- KListViewItem *tmp_d = new NumSortListViewItem(lv_d,
+ TDEListViewItem *tmp_d = new NumSortListViewItem(lv_d,
entry->name(), entry->version(), TQString("%1").arg(entry->downloads()));
- KListViewItem *tmp_l = new KListViewItem(lv_l,
+ TDEListViewItem *tmp_l = new TDEListViewItem(lv_l,
entry->name(), entry->version(), TDEGlobal::locale()->formatDate(entry->releaseDate()));
tmp_r->setPixmap(0, pix);
diff --git a/lib/compatibility/knewstuff/downloaddialog.h b/lib/compatibility/knewstuff/downloaddialog.h
index 3c7257d7..7f1fd602 100644
--- a/lib/compatibility/knewstuff/downloaddialog.h
+++ b/lib/compatibility/knewstuff/downloaddialog.h
@@ -28,7 +28,7 @@ namespace TDEIO
class Job;
}
-class KListView;
+class TDEListView;
class TQTextBrowser;
class TQFrame;
class KNewStuffGeneric;
@@ -212,7 +212,7 @@ class KDE_EXPORT DownloadDialog : public KDialogBase
ProviderLoader *m_loader;
TQString m_entryname;
- KListView *lv_r, *lv_d, *lv_l;
+ TDEListView *lv_r, *lv_d, *lv_l;
TQTextBrowser *m_rt;
TQFrame *m_frame;
TQListViewItem *m_entryitem;
@@ -220,7 +220,7 @@ class KDE_EXPORT DownloadDialog : public KDialogBase
Entry *m_entry;
KNewStuffGeneric *m_s;
int m_curtab;
- TQMap<TQWidget*, TQValueList<KListView*>* > m_map;
+ TQMap<TQWidget*, TQValueList<TDEListView*>* > m_map;
TQMap<TQWidget*, Provider*> m_providers;
TQMap<TQWidget*, TQTextBrowser*> m_rts;
TQMap<TQWidget*, TQValueList<TQPushButton*>* > m_buttons;
diff --git a/lib/compatibility/knewstuff/knewstuff.cpp b/lib/compatibility/knewstuff/knewstuff.cpp
index 6bfbb333..d36a1ef1 100644
--- a/lib/compatibility/knewstuff/knewstuff.cpp
+++ b/lib/compatibility/knewstuff/knewstuff.cpp
@@ -30,12 +30,12 @@
using namespace KNS;
-KAction* KNS::standardAction(const TQString& what,
+TDEAction* KNS::standardAction(const TQString& what,
const TQObject *recvr,
- const char *slot, KActionCollection* parent,
+ const char *slot, TDEActionCollection* parent,
const char *name)
{
- return new KAction(i18n("Download New %1").arg(what), "knewstuff",
+ return new TDEAction(i18n("Download New %1").arg(what), "knewstuff",
0, recvr, slot, parent, name);
}
diff --git a/lib/compatibility/knewstuff/knewstuff.h b/lib/compatibility/knewstuff/knewstuff.h
index 455063a3..1e4f65c7 100644
--- a/lib/compatibility/knewstuff/knewstuff.h
+++ b/lib/compatibility/knewstuff/knewstuff.h
@@ -26,17 +26,17 @@
class TQObject;
class TQWidget;
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
namespace KNS {
class Engine;
class Entry;
-KAction* standardAction(const TQString& what,
+TDEAction* standardAction(const TQString& what,
const TQObject *recvr,
const char *slot,
- KActionCollection* parent,
+ TDEActionCollection* parent,
const char *name = 0);
}
diff --git a/lib/compatibility/knewstuff/providerdialog.cpp b/lib/compatibility/knewstuff/providerdialog.cpp
index a6625870..23aa9438 100644
--- a/lib/compatibility/knewstuff/providerdialog.cpp
+++ b/lib/compatibility/knewstuff/providerdialog.cpp
@@ -34,11 +34,11 @@
using namespace KNS;
-class ProviderItem : public KListViewItem
+class ProviderItem : public TDEListViewItem
{
public:
- ProviderItem( KListView *parent, Provider *provider ) :
- KListViewItem( parent ), mProvider( provider )
+ ProviderItem( TDEListView *parent, Provider *provider ) :
+ TDEListViewItem( parent ), mProvider( provider )
{
setText( 0, provider->name() );
}
@@ -61,7 +61,7 @@ ProviderDialog::ProviderDialog( Engine *engine, TQWidget *parent ) :
TQLabel *description = new TQLabel( i18n("Please select one of the providers listed below:"), topPage );
topLayout->addWidget( description );
- mListView = new KListView( topPage );
+ mListView = new TDEListView( topPage );
mListView->addColumn( i18n("Name") );
topLayout->addWidget( mListView );
}
diff --git a/lib/compatibility/knewstuff/providerdialog.h b/lib/compatibility/knewstuff/providerdialog.h
index a17ddac3..c9002bb8 100644
--- a/lib/compatibility/knewstuff/providerdialog.h
+++ b/lib/compatibility/knewstuff/providerdialog.h
@@ -22,7 +22,7 @@
#include <kdialogbase.h>
-class KListView;
+class TDEListView;
namespace KNS {
@@ -69,7 +69,7 @@ class ProviderDialog : public KDialogBase
private:
Engine *mEngine;
- KListView *mListView;
+ TDEListView *mListView;
};
}
diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
index b0f12173..64f5848f 100644
--- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
@@ -91,7 +91,7 @@ static const char* const not_close_xpm[]={
"#####"};
/**
- * A special kind of KMainWindow that is able to have dockwidget child widgets.
+ * A special kind of TDEMainWindow that is able to have dockwidget child widgets.
*
* The main widget should be a dockwidget where other dockwidgets can be docked to
* the left, right, top, bottom or to the middle.
@@ -100,7 +100,7 @@ static const char* const not_close_xpm[]={
* @author Max Judin.
*/
KDockMainWindow::KDockMainWindow( TQWidget* parent, const char *name, WFlags f)
-:KMainWindow( parent, name, f )
+:TDEMainWindow( parent, name, f )
{
TQString new_name = TQString(name) + TQString("_DockManager");
dockManager = new KDockManager( this, new_name.latin1() );
@@ -126,7 +126,7 @@ void KDockMainWindow::setView( TQWidget *view )
}
#ifndef NO_KDE2
- KMainWindow::setCentralWidget(view);
+ TDEMainWindow::setCentralWidget(view);
#else
TQMainWindow::setCentralWidget(view);
#endif
@@ -1634,7 +1634,7 @@ KDockManager::KDockManager( TQWidget* mainWindow , const char* name )
menuData->setAutoDelete( true );
#ifndef NO_KDE2
- menu = new KPopupMenu();
+ menu = new TDEPopupMenu();
#else
menu = new TQPopupMenu();
#endif
@@ -3264,10 +3264,10 @@ void KDockManager::virtual_hook( int, void* )
{ /*BASE::virtual_hook( id, data );*/ }
void KDockMainWindow::virtual_hook( int id, void* data )
-{ KMainWindow::virtual_hook( id, data ); }
+{ TDEMainWindow::virtual_hook( id, data ); }
void KDockArea::virtual_hook( int, void* )
-{ /*KMainWindow::virtual_hook( id, data );*/ }
+{ /*TDEMainWindow::virtual_hook( id, data );*/ }
#ifndef NO_INCLUDE_MOCFILES // for TQt-only projects, because tmake doesn't take this name
diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.h b/lib/compatibility/tdemdi/qextmdi/kdockwidget.h
index 5b355867..69e5f7dc 100644
--- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.h
+++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.h
@@ -36,7 +36,7 @@
- KDockTabGroup - minor helper class
- KDockWidget - IMPORTANT CLASS: the one and only dockwidget class
- KDockManager - helper class
- - KDockMainWindow - IMPORTANT CLASS: a special KMainWindow that can have dockwidgets
+ - KDockMainWindow - IMPORTANT CLASS: a special TDEMainWindow that can have dockwidgets
- KDockArea - like KDockMainWindow but inherits just TQWidget
IMPORTANT Note: This file compiles also in TQt-only mode by using the NO_KDE2 precompiler definition!
@@ -82,7 +82,7 @@ class TQHBoxLayout;
class TQPixmap;
#ifndef NO_KDE2
-class KToolBar;
+class TDEToolBar;
class TDEConfig;
#else
class TQToolBar;
@@ -1264,7 +1264,7 @@ private:
};
/**
- * A special kind of KMainWindow that is able to have dockwidget child widgets (and member of the dockwidget class set).
+ * A special kind of TDEMainWindow that is able to have dockwidget child widgets (and member of the dockwidget class set).
*
* The main widget should be a KDockWidget where other KDockWidget can be docked to
* the left, right, top, bottom or to the middle.
@@ -1306,7 +1306,7 @@ private:
*
* @author Max Judin (documentation: Falk Brettschneider).
*/
-class TDEUI_EXPORT KDockMainWindow : public KMainWindow
+class TDEUI_EXPORT KDockMainWindow : public TDEMainWindow
{
Q_OBJECT
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h
index 4678f0f8..abf853be 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h
@@ -13,7 +13,7 @@
#include <ktabwidget.h>
#include <tdemdidefines.h>
-class KPopupMenu;
+class TDEPopupMenu;
//KDE4: Add a d pointer
/**
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
index bef9fb12..4c9930be 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
@@ -57,9 +57,9 @@ using namespace KMDIPrivate;
-ToggleToolViewAction::ToggleToolViewAction( const TQString& text, const KShortcut& cut, KDockWidget *dw, KMdiMainFrm *mdiMainFrm,
+ToggleToolViewAction::ToggleToolViewAction( const TQString& text, const TDEShortcut& cut, KDockWidget *dw, KMdiMainFrm *mdiMainFrm,
TQObject* parent, const char* name )
- : KToggleAction( text, cut, parent, name ), m_dw( dw ), m_mdiMainFrm( mdiMainFrm )
+ : TDEToggleAction( text, cut, parent, name ), m_dw( dw ), m_mdiMainFrm( mdiMainFrm )
{
if ( m_dw )
{
@@ -136,10 +136,10 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c
if ( actionCollection() ->kaccel() == 0 )
actionCollection() ->setWidget( mdiMainFrm );
- m_toolMenu = new KActionMenu( i18n( "Tool &Views" ), actionCollection(), "tdemdi_toolview_menu" );
+ m_toolMenu = new TDEActionMenu( i18n( "Tool &Views" ), actionCollection(), "tdemdi_toolview_menu" );
if ( showMDIModeAction )
{
- m_mdiModeAction = new KSelectAction( i18n( "MDI Mode" ), 0, actionCollection() );
+ m_mdiModeAction = new TDESelectAction( i18n( "MDI Mode" ), 0, actionCollection() );
TQStringList modes;
modes << i18n( "&Toplevel Mode" ) << i18n( "C&hildframe Mode" ) << i18n( "Ta&b Page Mode" ) << i18n( "I&DEAl Mode" );
m_mdiModeAction->setItems( modes );
@@ -151,19 +151,19 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c
connect( m_mdiMainFrm, TQT_SIGNAL( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ),
this, TQT_SLOT( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ) );
- m_gotoToolDockMenu = new KActionMenu( i18n( "Tool &Docks" ), actionCollection(), "tdemdi_tooldock_menu" );
- m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Top Dock" ), ALT + CTRL + SHIFT + Key_T, TQT_TQOBJECT(this), TQT_SIGNAL( toggleTop() ),
+ m_gotoToolDockMenu = new TDEActionMenu( i18n( "Tool &Docks" ), actionCollection(), "tdemdi_tooldock_menu" );
+ m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Top Dock" ), ALT + CTRL + SHIFT + Key_T, TQT_TQOBJECT(this), TQT_SIGNAL( toggleTop() ),
actionCollection(), "tdemdi_activate_top" ) );
- m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Left Dock" ), ALT + CTRL + SHIFT + Key_L, TQT_TQOBJECT(this), TQT_SIGNAL( toggleLeft() ),
+ m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Left Dock" ), ALT + CTRL + SHIFT + Key_L, TQT_TQOBJECT(this), TQT_SIGNAL( toggleLeft() ),
actionCollection(), "tdemdi_activate_left" ) );
- m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Right Dock" ), ALT + CTRL + SHIFT + Key_R, TQT_TQOBJECT(this), TQT_SIGNAL( toggleRight() ),
+ m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Right Dock" ), ALT + CTRL + SHIFT + Key_R, TQT_TQOBJECT(this), TQT_SIGNAL( toggleRight() ),
actionCollection(), "tdemdi_activate_right" ) );
- m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, TQT_TQOBJECT(this), TQT_SIGNAL( toggleBottom() ),
+ m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, TQT_TQOBJECT(this), TQT_SIGNAL( toggleBottom() ),
actionCollection(), "tdemdi_activate_bottom" ) );
- m_gotoToolDockMenu->insert( new KActionSeparator( actionCollection(), "tdemdi_goto_menu_separator" ) );
- m_gotoToolDockMenu->insert( new KAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( prevToolViewInDock() ),
+ m_gotoToolDockMenu->insert( new TDEActionSeparator( actionCollection(), "tdemdi_goto_menu_separator" ) );
+ m_gotoToolDockMenu->insert( new TDEAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( prevToolViewInDock() ),
actionCollection(), "tdemdi_prev_toolview" ) );
- m_gotoToolDockMenu->insert( new KAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( nextToolViewInDock() ),
+ m_gotoToolDockMenu->insert( new TDEAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( nextToolViewInDock() ),
actionCollection(), "tdemdi_next_toolview" ) );
actionCollection() ->readShortcutSettings( "Shortcuts", kapp->config() );
@@ -224,10 +224,10 @@ void KMDIGUIClient::setupActions()
// m_toolBars = builder.toolBars();
- // m_toolViewActions.append(new KAction( "TESTKMDIGUICLIENT", TQString(), 0,
+ // m_toolViewActions.append(new TDEAction( "TESTKMDIGUICLIENT", TQString(), 0,
// this, TQT_SLOT(blah()),actionCollection(),"nothing"));
- TQPtrList<KAction> addList;
+ TQPtrList<TDEAction> addList;
if ( m_toolViewActions.count() < 3 )
for ( uint i = 0;i < m_toolViewActions.count();i++ )
addList.append( m_toolViewActions.at( i ) );
@@ -250,14 +250,14 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva )
TQString aname = TQString( "tdemdi_toolview_" ) + mtva->wrappedWidget() ->name();
// try to read the action shortcut
- KShortcut sc;
+ TDEShortcut sc;
TDEConfig *cfg = kapp->config();
TQString _grp = cfg->group();
cfg->setGroup( "Shortcuts" );
// if ( cfg->hasKey( aname ) )
- sc = KShortcut( cfg->readEntry( aname, "" ) );
+ sc = TDEShortcut( cfg->readEntry( aname, "" ) );
cfg->setGroup( _grp );
- KAction *a = new ToggleToolViewAction( i18n( "Show %1" ).arg( mtva->wrappedWidget() ->caption() ),
+ TDEAction *a = new ToggleToolViewAction( i18n( "Show %1" ).arg( mtva->wrappedWidget() ->caption() ),
/*TQString()*/sc, dynamic_cast<KDockWidget*>( mtva->wrapperWidget() ),
m_mdiMainFrm, actionCollection(), aname.latin1() );
#if KDE_IS_VERSION(3,2,90)
@@ -275,8 +275,8 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva )
void KMDIGUIClient::actionDeleted( TQObject* a )
{
- m_toolViewActions.remove( static_cast<KAction*>( a ) );
- /* if (!m_toolMenu.isNull()) m_toolMenu->remove(static_cast<KAction*>(a));*/
+ m_toolViewActions.remove( static_cast<TDEAction*>( a ) );
+ /* if (!m_toolMenu.isNull()) m_toolMenu->remove(static_cast<TDEAction*>(a));*/
setupActions();
}
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h
index 46cc8ad2..98c606ce 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h
@@ -25,8 +25,8 @@
#include <kaction.h>
#include "tdemdidefines.h"
-class KMainWindow;
-class KToolBar;
+class TDEMainWindow;
+class TDEToolBar;
class KMdiToolViewAccessor;
class KMdiMainFrm;
class KDockWidget;
@@ -105,27 +105,27 @@ private:
KMdi::MdiMode m_mdiMode;
TQGuardedPtr<KMdiMainFrm> m_mdiMainFrm;
- TQPtrList<KAction> m_toolViewActions;
- TQPtrList<KAction> m_documentViewActions;
+ TQPtrList<TDEAction> m_toolViewActions;
+ TQPtrList<TDEAction> m_documentViewActions;
- KActionMenu *m_docMenu;
- KActionMenu *m_toolMenu;
- KSelectAction *m_mdiModeAction;
+ TDEActionMenu *m_docMenu;
+ TDEActionMenu *m_toolMenu;
+ TDESelectAction *m_mdiModeAction;
- KActionMenu *m_gotoToolDockMenu;
+ TDEActionMenu *m_gotoToolDockMenu;
};
/**
- * A KToggleAction specifically for toggling the showing
+ * A TDEToggleAction specifically for toggling the showing
* or the hiding of a KMDI tool view
*/
-class KMDI_EXPORT ToggleToolViewAction: public KToggleAction
+class KMDI_EXPORT ToggleToolViewAction: public TDEToggleAction
{
Q_OBJECT
public:
- ToggleToolViewAction( const TQString& text, const KShortcut& cut = KShortcut(), KDockWidget *dw = 0, KMdiMainFrm *mdiMainFrm = 0,
+ ToggleToolViewAction( const TQString& text, const TDEShortcut& cut = TDEShortcut(), KDockWidget *dw = 0, KMdiMainFrm *mdiMainFrm = 0,
TQObject* parent = 0, const char* name = 0 );
virtual ~ToggleToolViewAction();
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
index de17b7f1..1aa659a5 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
@@ -131,7 +131,7 @@ public:
KMdiFocusList *focusList;
int m_styleIDEAlMode;
int m_toolviewStyle;
- KAction *closeWindowAction;
+ TDEAction *closeWindowAction;
};
//============ constructor ============//
@@ -216,7 +216,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod
m_pPlacingMenu = new TQPopupMenu( this, "placing_menu" );
- d->closeWindowAction = new KAction(i18n("&Close"),
+ d->closeWindowAction = new TDEAction(i18n("&Close"),
#ifdef TQ_WS_WIN
CTRL|Key_F4,
#else
@@ -1200,10 +1200,10 @@ bool KMdiMainFrm::eventFilter( TQObject * /*obj*/, TQEvent *e )
{
if ( switching() )
{
- KAction * a = actionCollection() ->action( "view_last_window" ) ;
+ TDEAction * a = actionCollection() ->action( "view_last_window" ) ;
if ( a )
{
- const KShortcut cut( a->shortcut() );
+ const TDEShortcut cut( a->shortcut() );
const KKeySequence& seq = cut.seq( 0 );
const KKey& key = seq.key( 0 );
int modFlags = key.modFlags();
@@ -1226,7 +1226,7 @@ bool KMdiMainFrm::eventFilter( TQObject * /*obj*/, TQEvent *e )
}
else
{
- kdDebug(760) << "KAction( \"view_last_window\") not found." << endl;
+ kdDebug(760) << "TDEAction( \"view_last_window\") not found." << endl;
}
}
}
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp
index 3c61dab2..6de04e4c 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp
@@ -141,7 +141,7 @@ TQString KMdiTaskBarButton::actualText() const
//####################################################################
KMdiTaskBar::KMdiTaskBar( KMdiMainFrm *parent, TQMainWindow::ToolBarDock dock )
- : KToolBar( parent, "KMdiTaskBar", /*honor_style*/ false, /*readConfig*/ true )
+ : TDEToolBar( parent, "KMdiTaskBar", /*honor_style*/ false, /*readConfig*/ true )
, m_pCurrentFocusedWindow( 0 )
, m_pStretchSpace( 0 )
, m_layoutIsPending( false )
@@ -384,7 +384,7 @@ void KMdiTaskBar::resizeEvent( TQResizeEvent* rse )
layoutTaskBar( rse->size().width() );
}
}
- KToolBar::resizeEvent( rse );
+ TDEToolBar::resizeEvent( rse );
}
// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h
index 50b77d9b..9d0267bb 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h
@@ -127,7 +127,7 @@ class KMdiTaskBarPrivate;
* KMdiTaskBarButtons can be added or removed dynamically.<br>
* The button sizes are adjusted dynamically, as well.
*/
-class KMDI_EXPORT KMdiTaskBar : public KToolBar
+class KMDI_EXPORT KMdiTaskBar : public TDEToolBar
{
Q_OBJECT
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor_p.h b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor_p.h
index 81e770e8..c3812792 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor_p.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor_p.h
@@ -42,7 +42,7 @@ public:
}
TQGuardedPtr<KDockWidget> widgetContainer;
TQWidget* widget;
- TQGuardedPtr<KAction> action;
+ TQGuardedPtr<TDEAction> action;
};
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp
index 511e50a0..131a252e 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp
@@ -871,7 +871,7 @@ KMultiTabBar::~KMultiTabBar() {
/*int KMultiTabBar::insertButton(TQPixmap pic,int id ,const TQString&)
{
- (new KToolbarButton(pic,id,m_internal))->show();
+ (new TDEToolbarButton(pic,id,m_internal))->show();
return 0;
}*/