From 5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 6 Feb 2013 19:44:17 -0600
Subject: Rename KCmd to avoid conflicts with KDE4

---
 konqueror/keditbookmarks/kbookmarkmerger.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'konqueror/keditbookmarks/kbookmarkmerger.cpp')

diff --git a/konqueror/keditbookmarks/kbookmarkmerger.cpp b/konqueror/keditbookmarks/kbookmarkmerger.cpp
index 1fbcd6c03..6d7357bb6 100644
--- a/konqueror/keditbookmarks/kbookmarkmerger.cpp
+++ b/konqueror/keditbookmarks/kbookmarkmerger.cpp
@@ -37,10 +37,10 @@
 
 #include <X11/Xlib.h>
 
-static const KCmdLineOptions cmdLineOptions[] =
+static const TDECmdLineOptions cmdLineOptions[] =
 {
 	{ "+directory", I18N_NOOP( "Directory to scan for extra bookmarks" ), 0 },
-	KCmdLineLastOption
+	TDECmdLineLastOption
 };
 
 // The code for this function was taken from kdesktop/kcheckrunning.cpp
-- 
cgit v1.2.1