Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs

1 files changed, 0 insertions, 54 deletions

diff --git a/kabc/locknull.h b/kabc/locknull.h
deleted file mode 100644
index dfefe122a..000000000
--- a/kabc/locknull.h
+++ /dev/null
@@ -1,54 +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.
-*/
-#ifndef KABC_LOCKNULL_H
-#define KABC_LOCKNULL_H
-
-#include <tqstring.h>
-
-#include "lock.h"
-
-namespace KABC {
-
-/**
-  This class provides a lock without actually locking. It can be constructed in
-  two ways: One that let all locks succeed and one that let all locks fail.
-*/
-class KABC_EXPORT LockNull : public Lock
-{
-  public:
-    LockNull( bool allowAccess );
-    ~LockNull();
-
-    bool lock();
-    bool unlock();
-
-    TQString error() const;
-
-  private:
-    bool mAllowAccess;
-
-    class Private;
-    Private *d;
-};
-
-}
-
-#endif