summaryrefslogtreecommitdiffstats
path: root/kmenuedit/menuinfo.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:11:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:11:21 -0600
commitf537c21b68e08f649b1b297bce8f3904603137e0 (patch)
treefb33065387509dea898c90022ddec9c3f8ede86d /kmenuedit/menuinfo.cpp
parentdc5f267664506a312203c26bfe9001a448b0bb0f (diff)
downloadtdebase-f537c21b68e08f649b1b297bce8f3904603137e0.tar.gz
tdebase-f537c21b68e08f649b1b297bce8f3904603137e0.zip
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kmenuedit/menuinfo.cpp')
-rw-r--r--kmenuedit/menuinfo.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/kmenuedit/menuinfo.cpp b/kmenuedit/menuinfo.cpp
index e04f92c18..03c3a2e57 100644
--- a/kmenuedit/menuinfo.cpp
+++ b/kmenuedit/menuinfo.cpp
@@ -254,7 +254,7 @@ bool MenuFolderInfo::hasDirt()
return false;
}
-KService::Ptr MenuFolderInfo::findServiceShortcut(const KShortcut&cut)
+KService::Ptr MenuFolderInfo::findServiceShortcut(const TDEShortcut&cut)
{
KService::Ptr result;
// Check sub-menus
@@ -382,7 +382,7 @@ void MenuEntryInfo::setIcon(const TQString &_icon)
desktopFile()->writeEntry("Icon", icon);
}
-KShortcut MenuEntryInfo::shortcut()
+TDEShortcut MenuEntryInfo::shortcut()
{
if (!shortcutLoaded)
{
@@ -395,7 +395,7 @@ KShortcut MenuEntryInfo::shortcut()
return shortCut;
}
-static bool isEmpty(const KShortcut &shortCut)
+static bool isEmpty(const TDEShortcut &shortCut)
{
for(int i = shortCut.count(); i--;)
{
@@ -405,7 +405,7 @@ static bool isEmpty(const KShortcut &shortCut)
return true;
}
-static void freeShortcut(const KShortcut &shortCut)
+static void freeShortcut(const TDEShortcut &shortCut)
{
if (!isEmpty(shortCut))
{
@@ -420,7 +420,7 @@ static void freeShortcut(const KShortcut &shortCut)
}
}
-static void allocateShortcut(const KShortcut &shortCut)
+static void allocateShortcut(const TDEShortcut &shortCut)
{
if (!isEmpty(shortCut))
{
@@ -435,7 +435,7 @@ static void allocateShortcut(const KShortcut &shortCut)
}
}
-void MenuEntryInfo::setShortcut(const KShortcut &_shortcut)
+void MenuEntryInfo::setShortcut(const TDEShortcut &_shortcut)
{
if (shortCut == _shortcut)
return;
@@ -445,7 +445,7 @@ void MenuEntryInfo::setShortcut(const KShortcut &_shortcut)
shortCut = _shortcut;
if (isEmpty(shortCut))
- shortCut = KShortcut(); // Normalize
+ shortCut = TDEShortcut(); // Normalize
shortcutLoaded = true;
shortcutDirty = true;
@@ -455,8 +455,8 @@ void MenuEntryInfo::setInUse(bool inUse)
{
if (inUse)
{
- KShortcut temp = shortcut();
- shortCut = KShortcut();
+ TDEShortcut temp = shortcut();
+ shortCut = TDEShortcut();
if (isShortcutAvailable(temp))
shortCut = temp;
else
@@ -478,7 +478,7 @@ void MenuEntryInfo::setInUse(bool inUse)
}
}
-bool MenuEntryInfo::isShortcutAvailable(const KShortcut &_shortcut)
+bool MenuEntryInfo::isShortcutAvailable(const TDEShortcut &_shortcut)
{
if (shortCut == _shortcut)
return true;