summaryrefslogtreecommitdiffstats
path: root/kab
diff options
context:
space:
mode:
Diffstat (limited to 'kab')
-rw-r--r--kab/CMakeLists.txt3
-rw-r--r--kab/ChangeLog2
-rw-r--r--kab/Makefile.am6
-rw-r--r--kab/addressbook.cpp (renamed from kab/addressbook.cc)18
-rw-r--r--kab/addressbook.h4
-rw-r--r--kab/kabapi.cpp (renamed from kab/kabapi.cc)10
-rw-r--r--kab/kabapi.h4
-rw-r--r--kab/qconfigDB.cpp (renamed from kab/qconfigDB.cc)12
-rw-r--r--kab/qconfigDB.h6
9 files changed, 32 insertions, 33 deletions
diff --git a/kab/CMakeLists.txt b/kab/CMakeLists.txt
index 12e1ced42..a4e881466 100644
--- a/kab/CMakeLists.txt
+++ b/kab/CMakeLists.txt
@@ -27,10 +27,9 @@ link_directories(
set( target kab )
set( ${target}_SRCS
- kabapi.cc addressbook.cc qconfigDB.cc
+ kabapi.cpp addressbook.cpp qconfigDB.cpp
)
tde_add_library( ${target} STATIC_PIC AUTOMOC
SOURCES ${${target}_SRCS}
- DEPENDENCIES dcopidl
)
diff --git a/kab/ChangeLog b/kab/ChangeLog
index d3e36fcc1..51715a70d 100644
--- a/kab/ChangeLog
+++ b/kab/ChangeLog
@@ -11,7 +11,7 @@ Tue Dec 22 22:56:58 1998 Mirko Boehm <mirko@kde.org>
* businesscard.h (class BusinessCard): Hopefully remove
trigraph.
- * datepickerdialog.cc (DateLabel): Removed default value
+ * datepickerdialog.cpp (DateLabel): Removed default value
in the implementation.
* keyvaluemap.h: Removed a default value for a function
diff --git a/kab/Makefile.am b/kab/Makefile.am
index 89e1aab8e..66018aed5 100644
--- a/kab/Makefile.am
+++ b/kab/Makefile.am
@@ -5,9 +5,9 @@ KABVERSION= 4.0.0
KABPATCH= 0
libkab_la_SOURCES = \
- kabapi.cc \
- addressbook.cc \
- qconfigDB.cc
+ kabapi.cpp \
+ addressbook.cpp \
+ qconfigDB.cpp
libkab_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined
libkab_la_LIBADD = ../tdeui/libtdeui.la
diff --git a/kab/addressbook.cc b/kab/addressbook.cpp
index 85a991252..aa1ddfdfb 100644
--- a/kab/addressbook.cc
+++ b/kab/addressbook.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*-
+/*
This file implements the basic personal information management class
used in the TDE addressbook.
@@ -23,7 +23,7 @@
#include <tdeapplication.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <kdebug.h>
#include <tdemessagebox.h>
@@ -100,7 +100,7 @@ const int AddressBook::Entry::NoOfFields
=sizeof(AddressBook::Entry::Fields)/sizeof(AddressBook::Entry::Fields[0]);
struct QStringLess
- : public binary_function<const TQString&, const TQString&, bool>
+ : public std::function<bool(const TQString&, const TQString&)>
{
/** The function operator, inline. */
bool operator()(const TQString& x, const TQString& y) const
@@ -418,12 +418,12 @@ AddressBook::AddressBook(TQWidget* parent, const char* name, bool loadit)
KMessageBox::error(this,
i18n("Cannot initialize local variables."),
i18n("Out of Memory"));
- kapp->quit(); // It is critical, but will possibly never happen.
+ tdeApp->quit(); // It is critical, but will possibly never happen.
}
- connect(data, TQT_SIGNAL(fileChanged()), TQT_SLOT(dataFileChanged()));
- connect(data, TQT_SIGNAL(changed(QConfigDB*)),
- TQT_SLOT(reloaded(QConfigDB*)));
- connect(config, TQT_SIGNAL(fileChanged()), TQT_SLOT(configFileChanged()));
+ connect(data, TQ_SIGNAL(fileChanged()), TQ_SLOT(dataFileChanged()));
+ connect(data, TQ_SIGNAL(changed(QConfigDB*)),
+ TQ_SLOT(reloaded(QConfigDB*)));
+ connect(config, TQ_SIGNAL(fileChanged()), TQ_SLOT(configFileChanged()));
// ----- set style:
filename = locate( "data", STD_CONFIGFILENAME);
@@ -1066,7 +1066,7 @@ AddressBook::add(const Entry& entry, KabKey& key, bool update)
KMessageBox::error(this,
i18n("Cannot initialize local variables."),
i18n("Out of Memory"));
- kapp->quit(); // It is critical, but will possibly never happen.
+ tdeApp->quit(); // It is critical, but will possibly never happen.
return InternError; // shut the compiler up...
}
// ----- lock the file:
diff --git a/kab/addressbook.h b/kab/addressbook.h
index bd71b23b9..1137407b3 100644
--- a/kab/addressbook.h
+++ b/kab/addressbook.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*-
+/*
This file declares the basic personal information management class
used in the TDE addressbook.
@@ -183,7 +183,7 @@ class CategoriesMap : public TQMap<int, TQString>
class AddressBook : public TQFrame
{
// ############################################################################
- Q_OBJECT
+ TQ_OBJECT
// ----------------------------------------------------------------------------
public:
/**
diff --git a/kab/kabapi.cc b/kab/kabapi.cpp
index 7f2159e24..2008f1f88 100644
--- a/kab/kabapi.cc
+++ b/kab/kabapi.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*-
+/*
This file implements the application programming interface
for using kab's addressbook files within other programs.
Parse it with kdoc to get the API documentation.
@@ -43,8 +43,8 @@ KabAPI::KabAPI(TQWidget* parent, const char* name)
setMainWidget(listbox);
showButtonApply(false);
enableButtonSeparator(true);
- connect(listbox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(entrySelected(int)));
- connect(listbox, TQT_SIGNAL(doubleClicked ( TQListBoxItem * )),TQT_SLOT(slotDoubleClicked ( TQListBoxItem * )));
+ connect(listbox, TQ_SIGNAL(highlighted(int)), TQ_SLOT(entrySelected(int)));
+ connect(listbox, TQ_SIGNAL(doubleClicked ( TQListBoxItem * )),TQ_SLOT(slotDoubleClicked ( TQListBoxItem * )));
}
@@ -90,8 +90,8 @@ AddressBook::ErrorCode KabAPI::init()
book=new AddressBook(0, "KABAPI::book", true); //change parent from "this" to "0" //dsweet
if(book->getState()==AddressBook::NoError)
{
- connect(book, TQT_SIGNAL(setStatus(const TQString&)),
- TQT_SLOT(setStatusSlot(const TQString&)));
+ connect(book, TQ_SIGNAL(setStatus(const TQString&)),
+ TQ_SLOT(setStatusSlot(const TQString&)));
return AddressBook::NoError;
} else {
return AddressBook::InternError;
diff --git a/kab/kabapi.h b/kab/kabapi.h
index 6204efc39..b2585760a 100644
--- a/kab/kabapi.h
+++ b/kab/kabapi.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*-
+/*
Dialog widget using the addressbook,
provided for inclusion in other programs.
@@ -68,7 +68,7 @@ class TDEListBox;
class KabAPI : public KDialogBase
{
// ############################################################################
- Q_OBJECT
+ TQ_OBJECT
// ----------------------------------------------------------------------------
public:
/**
diff --git a/kab/qconfigDB.cc b/kab/qconfigDB.cpp
index dc77a1e1b..ed4c2b15a 100644
--- a/kab/qconfigDB.cc
+++ b/kab/qconfigDB.cpp
@@ -656,7 +656,7 @@ KeyValueMap::insert(const TQCString& key, const TQString& value, bool force)
TQCString v;
// -----
v=value.utf8();
- kdDebug(GUARD, KAB_KDEBUG_AREA) << "KeyValueMap::insert[QString]: trying to "
+ kdDebug(GUARD, KAB_KDEBUG_AREA) << "KeyValueMap::insert[TQString]: trying to "
"insert \"" << (!value.isNull() ? "true" : "false")
<< "\" for key\n -->"
<< v
@@ -670,19 +670,19 @@ KeyValueMap::get(const TQCString& key, TQString& value) const
{
bool GUARD; GUARD=false;
// ###########################################################################
- kdDebug(GUARD, KAB_KDEBUG_AREA) << "KeyValueMap::get[QString]: trying to get "
+ kdDebug(GUARD, KAB_KDEBUG_AREA) << "KeyValueMap::get[TQString]: trying to get "
"a TQString value for key " << key << endl;
TQCString v;
// ----- get string representation:
if(!get(key, v))
{
- kdDebug(GUARD, KAB_KDEBUG_AREA) << "KeyValueMap::get[QString]: key "
+ kdDebug(GUARD, KAB_KDEBUG_AREA) << "KeyValueMap::get[TQString]: key "
<< key << " not in KeyValueMap.\n";
return false;
}
// ----- find its state:
value=TQString::fromUtf8(v); // is there a better way?
- kdDebug(GUARD, KAB_KDEBUG_AREA) << "KeyValueMap::get[QString]: success, value"
+ kdDebug(GUARD, KAB_KDEBUG_AREA) << "KeyValueMap::get[TQString]: success, value"
" (in UTF8) is " << v << endl;
return true;
// ###########################################################################
@@ -712,7 +712,7 @@ KeyValueMap::get(const TQCString& key, bool& value) const
bool GUARD; GUARD=false;
// ###########################################################################
kdDebug(GUARD, KAB_KDEBUG_AREA) << "KeyValueMap::get[bool]: trying to get "
- "BOOL value for key " << key << endl;
+ "bool value for key " << key << endl;
TQCString v;
// ----- get string representation:
if(!get(key, v))
@@ -2221,7 +2221,7 @@ QConfigDB::watch(bool state)
if(timer==0)
{
timer=new TQTimer(this);
- connect(timer, TQT_SIGNAL(timeout()), TQT_SLOT(checkFileChanged()));
+ connect(timer, TQ_SIGNAL(timeout()), TQ_SLOT(checkFileChanged()));
}
timer->start(1000);
} else { // stop timer
diff --git a/kab/qconfigDB.h b/kab/qconfigDB.h
index 12fdac3f5..f74e5886c 100644
--- a/kab/qconfigDB.h
+++ b/kab/qconfigDB.h
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
#ifndef QCONFIGDB_H
#define QCONFIGDB_H
@@ -20,6 +19,7 @@
namespace std { }
using namespace std;
+#include <functional>
#include <list>
#include <map>
#include <tqwidget.h>
@@ -44,7 +44,7 @@ class TQTextStream;
* it is called with.
*/
struct QCStringLess
- : public binary_function<const TQCString&, const TQCString&, bool>
+ : public std::function<bool(const TQCString&, const TQCString&)>
{
/**
* The function operator, inline.
@@ -551,7 +551,7 @@ public:
class QConfigDB : public TQWidget
{
// ############################################################################
- Q_OBJECT
+ TQ_OBJECT
// ----------------------------------------------------------------------------
protected:
/**
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-26 19:10:59 +0000