From ed99a30644c19b0a3cf0d2147243532df4daa16b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:57:54 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 kabc/locknull.cpp | 63 -------------------------------------------------------
 1 file changed, 63 deletions(-)
 delete mode 100644 kabc/locknull.cpp

(limited to 'kabc/locknull.cpp')

diff --git a/kabc/locknull.cpp b/kabc/locknull.cpp
deleted file mode 100644
index 234c2c214..000000000
--- a/kabc/locknull.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-    This file is part of libkabc.
-
-    Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#include "locknull.h"
-
-#include <klocale.h>
-#include <kdebug.h>
-
-using namespace KABC;
-
-LockNull::LockNull( bool allowAccess )
-  : Lock( TQString::null ), mAllowAccess( allowAccess )
-{
-}
-
-LockNull::~LockNull()
-{
-  unlock();
-}
-
-bool LockNull::lock()
-{
-  if ( !mAllowAccess ) return false;
-  
-  kdWarning() << "LockNull::lock() force success. Doesn't actually lock."
-              << endl;
-  
-  emit locked();
-  
-  return true;
-}
-
-bool LockNull::unlock()
-{
-  emit unlocked();
-  return true;
-}
-
-TQString LockNull::error() const
-{
-  if ( mAllowAccess )
-    return i18n("LockNull: All locks succeed but no actual locking is done.");
-  else
-    return i18n("LockNull: All locks fail.");
-}
-- 
cgit v1.2.3