summaryrefslogtreecommitdiffstats
path: root/kcontrol/kfontinst/kcmfontinst
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/kfontinst/kcmfontinst')
-rw-r--r--kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp24
-rw-r--r--kcontrol/kfontinst/kcmfontinst/KCmFontInst.h16
-rw-r--r--kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp24
-rw-r--r--kcontrol/kfontinst/kcmfontinst/KFileFontView.h16
4 files changed, 40 insertions, 40 deletions
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
{