diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:16:20 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:16:20 -0600 |
commit | dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5 (patch) | |
tree | 4ebcd3dac0133d8d3fa880bbf83692c305b7350d /kcontrol/kfontinst/kcmfontinst | |
parent | 1a9478c6e1b77b05814af8fa02cd563a5da8946b (diff) | |
download | tdebase-dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5.tar.gz tdebase-dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/kfontinst/kcmfontinst')
-rw-r--r-- | kcontrol/kfontinst/kcmfontinst/KCmFontInst.h | 2 | ||||
-rw-r--r-- | kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h index 14cb8ee58..c3d64c7b0 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h @@ -39,7 +39,7 @@ #include <kconfig.h> #include <kio/job.h> #ifdef HAVE_XFT -#include <kparts/part.h> +#include <tdeparts/part.h> #endif class KDirOperator; diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp index 03158eff7..0d05799d9 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp @@ -475,7 +475,7 @@ TQDragObject *CKFileFontView::dragObject() urls.append( (*it)->url() ); if(urls.count()> 1) - pixmap = DesktopIcon("kmultiple", KIcon::SizeSmall); + pixmap = DesktopIcon("tdemultiple", KIcon::SizeSmall); if(pixmap.isNull()) pixmap = currentFileItem()->pixmap(KIcon::SizeSmall); |