summaryrefslogtreecommitdiffstats
path: root/koshell
diff options
context:
space:
mode:
Diffstat (limited to 'koshell')
-rw-r--r--koshell/iconsidepane.cpp18
-rw-r--r--koshell/iconsidepane.h14
-rw-r--r--koshell/koshell_main.cc2
-rw-r--r--koshell/koshell_shell.cc10
-rw-r--r--koshell/koshell_shell.h4
5 files changed, 24 insertions, 24 deletions
diff --git a/koshell/iconsidepane.cpp b/koshell/iconsidepane.cpp
index 3c88f8b6..87fb5251 100644
--- a/koshell/iconsidepane.cpp
+++ b/koshell/iconsidepane.cpp
@@ -203,10 +203,10 @@ void EntryItem::setPaintActive( bool paintActive )
// ************************************************
-Navigator::Navigator(bool _selectable, KPopupMenu * menu, IconSidePane *_iconsidepane, TQWidget *parent, const char *name )
- : KListBox( parent, name ), mSidePane( _iconsidepane ), mPopupMenu( menu )
+Navigator::Navigator(bool _selectable, TDEPopupMenu * menu, IconSidePane *_iconsidepane, TQWidget *parent, const char *name )
+ : TDEListBox( parent, name ), mSidePane( _iconsidepane ), mPopupMenu( menu )
{
- setSelectionMode( KListBox::Single );
+ setSelectionMode( TDEListBox::Single );
viewport()->setBackgroundMode( PaletteBackground );
setFrameStyle( TQFrame::NoFrame );
setHScrollBarMode( TQScrollView::AlwaysOff );
@@ -246,7 +246,7 @@ bool Navigator::showIcons()
void Navigator::mouseReleaseEvent(TQMouseEvent *e)
{
- KListBox::mouseReleaseEvent(e);
+ TDEListBox::mouseReleaseEvent(e);
if ( e->button() != Qt::LeftButton || !mLeftMouseButtonPressed )
return;
if ( itemAt( e->pos() ) && executedItem == selectedItem() )
@@ -266,13 +266,13 @@ void Navigator::mousePressEvent(TQMouseEvent *e)
}
else
mLeftMouseButtonPressed = true;
- KListBox::mousePressEvent(e);
+ TDEListBox::mousePressEvent(e);
}
void Navigator::enterEvent( TQEvent *event )
{
// work around TQt behaviour: onItem is not emmitted in enterEvent()
- KListBox::enterEvent( event );
+ TDEListBox::enterEvent( event );
emit onItem( itemAt( mapFromGlobal( TQCursor::pos() ) ) );
}
@@ -415,7 +415,7 @@ IconSidePane::IconSidePane(TQWidget *parent, const char *name )
mShowIcons = KoShellSettings::sidePaneShowIcons();
mShowText = KoShellSettings::sidePaneShowText();
mViewMode = sizeIntToEnum( KoShellSettings::sidePaneIconSize() );
- mPopupMenu = new KPopupMenu(0);
+ mPopupMenu = new TDEPopupMenu(0);
mPopupMenu->insertTitle( i18n( "Icon Size" ) );
mPopupMenu->insertItem( i18n( "Large" ), (int)LargeIcons );
mPopupMenu->setItemEnabled( (int)LargeIcons, mShowIcons );
@@ -580,12 +580,12 @@ IconViewMode IconSidePane::sizeIntToEnum(int size) const
}
}
-void IconSidePane::setActionCollection( KActionCollection *actionCollection )
+void IconSidePane::setActionCollection( TDEActionCollection *actionCollection )
{
mActionCollection = actionCollection;
}
-KActionCollection *IconSidePane::actionCollection() const
+TDEActionCollection *IconSidePane::actionCollection() const
{
return mActionCollection;
}
diff --git a/koshell/iconsidepane.h b/koshell/iconsidepane.h
index fb7ac2db..5510ffa9 100644
--- a/koshell/iconsidepane.h
+++ b/koshell/iconsidepane.h
@@ -114,12 +114,12 @@ class EntryItemToolTip : public TQToolTip
/**
Navigation pane showing all parts relevant to the user
*/
-class Navigator : public KListBox
+class Navigator : public TDEListBox
{
Q_OBJECT
public:
- Navigator(bool _selectable, KPopupMenu*, IconSidePane *, TQWidget *parent = 0, const char *name = 0 );
+ Navigator(bool _selectable, TDEPopupMenu*, IconSidePane *, TQWidget *parent = 0, const char *name = 0 );
int insertItem(const TQString &_text, const TQString &_pix);
@@ -156,7 +156,7 @@ class Navigator : public KListBox
int mMinWidth;
TQListBoxItem *executedItem;
bool mLeftMouseButtonPressed;
- KPopupMenu *mPopupMenu;
+ TDEPopupMenu *mPopupMenu;
bool mSelectable;
TQListBoxItem* mMouseOn;
};
@@ -169,8 +169,8 @@ class IconSidePane :public TQVBox
IconSidePane( TQWidget *parent, const char *name = 0 );
~IconSidePane();
- void setActionCollection( KActionCollection *actionCollection );
- KActionCollection *actionCollection() const;
+ void setActionCollection( TDEActionCollection *actionCollection );
+ TDEActionCollection *actionCollection() const;
int insertItem(const TQString & _pix, const TQString &_text);
int insertItem(int _grp, const TQString & _pix, const TQString &_text);
@@ -203,8 +203,8 @@ class IconSidePane :public TQVBox
TQValueList<int> mWidgetStackIds;
Navigator *mCurrentNavigator;
TQButtonGroup *m_buttongroup;
- KActionCollection *mActionCollection;
- KPopupMenu *mPopupMenu;
+ TDEActionCollection *mActionCollection;
+ TDEPopupMenu *mPopupMenu;
IconViewMode mViewMode;
bool mShowIcons;
diff --git a/koshell/koshell_main.cc b/koshell/koshell_main.cc
index 83be2342..ecfd34f0 100644
--- a/koshell/koshell_main.cc
+++ b/koshell/koshell_main.cc
@@ -49,7 +49,7 @@ int KoShellApp::newInstance()
{
if ( isRestored() ) {
// There can only be one main window
- if ( KMainWindow::canBeRestored( 1 ) ) {
+ if ( TDEMainWindow::canBeRestored( 1 ) ) {
mMainWindow = new KoShellWindow();
setMainWidget( mMainWindow );
mMainWindow->show();
diff --git a/koshell/koshell_shell.cc b/koshell/koshell_shell.cc
index abd7eaa2..763026e3 100644
--- a/koshell/koshell_shell.cc
+++ b/koshell/koshell_shell.cc
@@ -539,9 +539,9 @@ void KoShellWindow::slotFileOpen()
url=dialog->selectedURL();
recentAction()->addURL( url );
if ( url.isLocalFile() )
- KRecentDocument::add(url.path(-1));
+ TDERecentDocument::add(url.path(-1));
else
- KRecentDocument::add(url.url(-1), true);
+ TDERecentDocument::add(url.url(-1), true);
}
else
return;
@@ -669,7 +669,7 @@ TQString KoShellWindow::configFile() const
void KoShellWindow::tab_contextMenu(TQWidget * w,const TQPoint &p)
{
- KPopupMenu menu;
+ TDEPopupMenu menu;
KIconLoader il;
int const mnuSave = menu.insertItem( il.loadIconSet( "filesave", KIcon::Small ), i18n("Save") );
int const mnuClose = menu.insertItem( il.loadIcon( "fileclose", KIcon::Small ), i18n("Close") );
@@ -729,9 +729,9 @@ void KoShellWindow::showPartSpecificHelp()
KoShellGUIClient::KoShellGUIClient( KoShellWindow *window ) : KXMLGUIClient()
{
setXMLFile( "koshellui.rc", true, true );
- window->mnuSaveAll = new KAction( i18n("Save All"), 0, TQT_TQOBJECT(window), TQT_SLOT( saveAll() ), actionCollection(), "save_all" );
+ window->mnuSaveAll = new TDEAction( i18n("Save All"), 0, TQT_TQOBJECT(window), TQT_SLOT( saveAll() ), actionCollection(), "save_all" );
window->mnuSaveAll->setEnabled(false);
- window->partSpecificHelpAction = new KAction(i18n("Part Handbook"), "contents", 0, TQT_TQOBJECT(window), TQT_SLOT(showPartSpecificHelp()),
+ window->partSpecificHelpAction = new TDEAction(i18n("Part Handbook"), "contents", 0, TQT_TQOBJECT(window), TQT_SLOT(showPartSpecificHelp()),
actionCollection(), "partSpecificHelp");
window->partSpecificHelpAction->setEnabled(false);
}
diff --git a/koshell/koshell_shell.h b/koshell/koshell_shell.h
index 4167bf31..d25cedd5 100644
--- a/koshell/koshell_shell.h
+++ b/koshell/koshell_shell.h
@@ -61,8 +61,8 @@ public:
virtual TQString configFile() const;
- KAction *mnuSaveAll;
- KAction* partSpecificHelpAction;
+ TDEAction *mnuSaveAll;
+ TDEAction* partSpecificHelpAction;
protected slots: