TDE
/
kbarcode
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kbarcode
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KABC namespace

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent f5628f48e5
commit deb8e90cbe
11 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File

2
acinclude.m4
Unescape View File

@ -2074,7 +2074,7 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-ltdeabc")
AC_SUBST(LIB_TDEABC, "-ltdeabc")
AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts")

2
kbarcode/Makefile.am
Unescape View File

@ -20,7 +20,7 @@ bin_PROGRAMS = kbarcode
# the application source, library search path, and link libraries
kbarcode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kbarcode_LDADD = $(LIB_KABC) $(LIB_KSPELL) $(LIB_TDEPRINT) \
kbarcode_LDADD = $(LIB_TDEABC) $(LIB_KSPELL) $(LIB_TDEPRINT) \
$(LIB_TDEUI) -lkjs -lpcre
noinst_HEADERS = barcodecombo.h barcodedialog.h barcodedialogs.h \

2
kbarcode/batchprinter.cpp
Unescape View File

@ -533,7 +533,7 @@ void BatchPrinter::setData( TVariableList* list )
m_vardata = list;
}
void BatchPrinter::setData( KABC::AddresseeList* list )
void BatchPrinter::setData( TDEABC::AddresseeList* list )
{
if( m_addrdata )
delete m_addrdata;

6
kbarcode/batchprinter.h
Unescape View File

@ -23,7 +23,7 @@
#include <tqmap.h>
#include <tqvaluelist.h>
namespace KABC {
namespace TDEABC {
class AddresseeList;
}
@ -96,7 +96,7 @@ class BatchPrinter
/** set the address data for the batchprinter
* @p list will be deleted by the batchprinter
*/
void setData( KABC::AddresseeList* list );
void setData( TDEABC::AddresseeList* list );
inline void setImageFilename( const EImageFileName e ) { m_image_filename = e; }
inline void setImageCustomFilename( const TQString & name ) { m_image_custom_filename = name; };
@ -154,7 +154,7 @@ class BatchPrinter
Measurements m_measure;
TQValueList<data>* m_data;
TVariableList* m_vardata;
KABC::AddresseeList* m_addrdata;
TDEABC::AddresseeList* m_addrdata;
TQString m_serial;
TQString m_name;

12
kbarcode/batchwizard.cpp
Unescape View File

@ -68,7 +68,7 @@
class AddressListViewItem : public TDEListViewItem {
public:
AddressListViewItem(TQListView *parent, KABC::Addressee & addr )
AddressListViewItem(TQListView *parent, TDEABC::Addressee & addr )
: TDEListViewItem( parent ), m_address( addr )
{
this->setText( 0, m_address.givenName() );
@ -76,12 +76,12 @@ public:
this->setText( 2, m_address.preferredEmail() );
}
const KABC::Addressee & address() const {
const TDEABC::Addressee & address() const {
return m_address;
}
private:
KABC::Addressee m_address;
TDEABC::Addressee m_address;
};
@ -699,7 +699,7 @@ void BatchWizard::setupBatchPrinter( BatchPrinter* batch, int m )
}
else if( radioAddressBook->isChecked() )
{
KABC::AddresseeList* list = new KABC::AddresseeList;
TDEABC::AddresseeList* list = new TDEABC::AddresseeList;
TQListViewItem* item = listSelectedAddress->firstChild();
while( item )
{
@ -1026,10 +1026,10 @@ void BatchWizard::fillVarList()
void BatchWizard::fillAddressList()
{
KABC::AddressBook* ab = KABC::StdAddressBook::self();
TDEABC::AddressBook* ab = TDEABC::StdAddressBook::self();
listAddress->clear();
KABC::AddressBook::Iterator it;
TDEABC::AddressBook::Iterator it;
listAddress->setUpdatesEnabled( false );
for ( it = ab->begin(); it != ab->end(); ++it )
new AddressListViewItem( listAddress, *it );

2
kbarcode/configdialog.cpp
Unescape View File

@ -44,7 +44,7 @@
#include <kpushbutton.h>
const TQString cached = I18N_NOOP("There are currently %1 cached barcodes.");
using namespace KABC;
using namespace TDEABC;
ConfigDialog::ConfigDialog( TQWidget* parent )
: KDialogBase( IconList, i18n("Configure KBarcode"), KDialogBase::Ok|KDialogBase::Cancel,

2
kbarcode/labeleditor.cpp
Unescape View File

@ -119,7 +119,7 @@
#define KBARCODE_UNDO_LIMIT 25
using namespace KABC;
using namespace TDEABC;
LabelEditor::LabelEditor( TQWidget *parent, TQString _filename, const char *name, WFlags f )
: DCOPObject( "LabelEditor" ),

2
kbarcode/previewdialog.cpp
Unescape View File

@ -173,7 +173,7 @@ void PreviewDialog::setupSql()
void PreviewDialog::selectAddress()
{
m_address = KABC::AddresseeDialog::getAddressee( this );
m_address = TDEABC::AddresseeDialog::getAddressee( this );
if( !m_address.isEmpty() )
lineAddr->setText( m_address.realName() );
else

2
kbarcode/previewdialog.h
Unescape View File

@ -61,7 +61,7 @@ class PreviewDialog : public TQDialog {
KPushButton* buttonClose;
KPushButton* buttonAddr;
KABC::Addressee m_address;
TDEABC::Addressee m_address;
Definition* def;
TQIODevice* file;

102
kbarcode/tokenprovider.cpp
Unescape View File

@ -290,43 +290,43 @@ void TokenProvider::init()
category.tokens.clear();
category.tokens.append( tToken( TOK_ADDRESS_NAME, i18n("Name") ) );
category.tokens.append( tToken( TOK_ADDRESS_GIVEN_NAME, KABC::Addressee::givenNameLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_FAMILY_NAME, KABC::Addressee::familyNameLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_EMAIL, KABC::Addressee::emailLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_GIVEN_NAME, TDEABC::Addressee::givenNameLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_FAMILY_NAME, TDEABC::Addressee::familyNameLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_EMAIL, TDEABC::Addressee::emailLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_FULL_EMAIL, i18n("Full E-Mail") ) );
category.tokens.append( tToken( TOK_ADDRESS_PHONE_PREF, KABC::PhoneNumber::label( KABC::PhoneNumber::Pref ) ) );
category.tokens.append( tToken( TOK_ADDRESS_PHONE_HOME, KABC::PhoneNumber::label( KABC::PhoneNumber::Home ) ) );
category.tokens.append( tToken( TOK_ADDRESS_PHONE_WORK, KABC::PhoneNumber::label( KABC::PhoneNumber::Work ) ) );
category.tokens.append( tToken( TOK_ADDRESS_PHONE_MSG, KABC::PhoneNumber::label( KABC::PhoneNumber::Msg ) ) );
category.tokens.append( tToken( TOK_ADDRESS_PHONE_VOICE, KABC::PhoneNumber::label( KABC::PhoneNumber::Voice ) ) );
category.tokens.append( tToken( TOK_ADDRESS_PHONE_FAX, KABC::PhoneNumber::label( KABC::PhoneNumber::Fax ) ) );
category.tokens.append( tToken( TOK_ADDRESS_PHONE_CELL, KABC::PhoneNumber::label( KABC::PhoneNumber::Cell ) ) );
category.tokens.append( tToken( TOK_ADDRESS_PHONE_VIDEO, KABC::PhoneNumber::label( KABC::PhoneNumber::Video ) ) );
category.tokens.append( tToken( TOK_ADDRESS_PHONE_BBS, KABC::PhoneNumber::label( KABC::PhoneNumber::Bbs ) ) );
category.tokens.append( tToken( TOK_ADDRESS_PHONE_MODEM, KABC::PhoneNumber::label( KABC::PhoneNumber::Modem ) ) );
category.tokens.append( tToken( TOK_ADDRESS_PHONE_CAR, KABC::PhoneNumber::label( KABC::PhoneNumber::Car ) ) );
category.tokens.append( tToken( TOK_ADDRESS_PHONE_ISDN, KABC::PhoneNumber::label( KABC::PhoneNumber::Isdn ) ) );
category.tokens.append( tToken( TOK_ADDRESS_PHONE_PCS, KABC::PhoneNumber::label( KABC::PhoneNumber::Pcs ) ) );
category.tokens.append( tToken( TOK_ADDRESS_PHONE_PAGER, KABC::PhoneNumber::label( KABC::PhoneNumber::Pager ) ) );
category.tokens.append( tToken( TOK_ADDRESS_ADDRESS_POB, KABC::Address::postOfficeBoxLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_ADDRESS_EXTENDED, KABC::Address::extendedLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_ADDRESS_STREET, KABC::Address::streetLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_ADDRESS_LOCALITY, KABC::Address::localityLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_ADDRESS_REGION, KABC::Address::regionLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_ADDRESS_POSTALCODE, KABC::Address::postalCodeLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_ADDRESS_COUNTRY, KABC::Address::countryLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_ADDRESS_LABEL, KABC::Address::labelLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_PHONE_PREF, TDEABC::PhoneNumber::label( TDEABC::PhoneNumber::Pref ) ) );
category.tokens.append( tToken( TOK_ADDRESS_PHONE_HOME, TDEABC::PhoneNumber::label( TDEABC::PhoneNumber::Home ) ) );
category.tokens.append( tToken( TOK_ADDRESS_PHONE_WORK, TDEABC::PhoneNumber::label( TDEABC::PhoneNumber::Work ) ) );
category.tokens.append( tToken( TOK_ADDRESS_PHONE_MSG, TDEABC::PhoneNumber::label( TDEABC::PhoneNumber::Msg ) ) );
category.tokens.append( tToken( TOK_ADDRESS_PHONE_VOICE, TDEABC::PhoneNumber::label( TDEABC::PhoneNumber::Voice ) ) );
category.tokens.append( tToken( TOK_ADDRESS_PHONE_FAX, TDEABC::PhoneNumber::label( TDEABC::PhoneNumber::Fax ) ) );
category.tokens.append( tToken( TOK_ADDRESS_PHONE_CELL, TDEABC::PhoneNumber::label( TDEABC::PhoneNumber::Cell ) ) );
category.tokens.append( tToken( TOK_ADDRESS_PHONE_VIDEO, TDEABC::PhoneNumber::label( TDEABC::PhoneNumber::Video ) ) );
category.tokens.append( tToken( TOK_ADDRESS_PHONE_BBS, TDEABC::PhoneNumber::label( TDEABC::PhoneNumber::Bbs ) ) );
category.tokens.append( tToken( TOK_ADDRESS_PHONE_MODEM, TDEABC::PhoneNumber::label( TDEABC::PhoneNumber::Modem ) ) );
category.tokens.append( tToken( TOK_ADDRESS_PHONE_CAR, TDEABC::PhoneNumber::label( TDEABC::PhoneNumber::Car ) ) );
category.tokens.append( tToken( TOK_ADDRESS_PHONE_ISDN, TDEABC::PhoneNumber::label( TDEABC::PhoneNumber::Isdn ) ) );
category.tokens.append( tToken( TOK_ADDRESS_PHONE_PCS, TDEABC::PhoneNumber::label( TDEABC::PhoneNumber::Pcs ) ) );
category.tokens.append( tToken( TOK_ADDRESS_PHONE_PAGER, TDEABC::PhoneNumber::label( TDEABC::PhoneNumber::Pager ) ) );
category.tokens.append( tToken( TOK_ADDRESS_ADDRESS_POB, TDEABC::Address::postOfficeBoxLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_ADDRESS_EXTENDED, TDEABC::Address::extendedLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_ADDRESS_STREET, TDEABC::Address::streetLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_ADDRESS_LOCALITY, TDEABC::Address::localityLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_ADDRESS_REGION, TDEABC::Address::regionLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_ADDRESS_POSTALCODE, TDEABC::Address::postalCodeLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_ADDRESS_COUNTRY, TDEABC::Address::countryLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_ADDRESS_LABEL, TDEABC::Address::labelLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS, i18n("Formatted Address") ) );
category.tokens.append( tToken( TOK_ADDRESS_URL, KABC::Addressee::urlLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_NICK, KABC::Addressee::nickNameLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_ADDITIONAL_NAME, KABC::Addressee::additionalNameLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_PREFIX, KABC::Addressee::prefixLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_SUFFIX, KABC::Addressee::suffixLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_BIRTHDAY, KABC::Addressee::birthdayLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_TITLE, KABC::Addressee::titleLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_ROLE, KABC::Addressee::roleLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_NOTE, KABC::Addressee::noteLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_ORGANIZATION, KABC::Addressee::organizationLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_URL, TDEABC::Addressee::urlLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_NICK, TDEABC::Addressee::nickNameLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_ADDITIONAL_NAME, TDEABC::Addressee::additionalNameLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_PREFIX, TDEABC::Addressee::prefixLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_SUFFIX, TDEABC::Addressee::suffixLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_BIRTHDAY, TDEABC::Addressee::birthdayLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_TITLE, TDEABC::Addressee::titleLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_ROLE, TDEABC::Addressee::roleLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_NOTE, TDEABC::Addressee::noteLabel() ) );
category.tokens.append( tToken( TOK_ADDRESS_ORGANIZATION, TDEABC::Addressee::organizationLabel() ) );
category.category = CAT_ADDRESS;
s_categories.append( category );
}
@ -600,10 +600,10 @@ TQString TokenProvider::processAddresses( const TQString & t )
if( !m_address || !t.startsWith( "address" ) )
return ret;
KABC::Address addr = m_address->address( KABC::Address::Pref );
TDEABC::Address addr = m_address->address( TDEABC::Address::Pref );
if( addr.isEmpty() )
{
KABC::Address::List list = m_address->addresses();
TDEABC::Address::List list = m_address->addresses();
for( int i=0;i<list.count();i++ )
if( !list[i].isEmpty() )
{
@ -639,72 +639,72 @@ TQString TokenProvider::processAddresses( const TQString & t )
}
else if( t == TOK_ADDRESS_PHONE_PREF )
{
ret = m_address->phoneNumber( KABC::PhoneNumber::Pref ).number();
ret = m_address->phoneNumber( TDEABC::PhoneNumber::Pref ).number();
found = true;
}
else if( t == TOK_ADDRESS_PHONE_HOME )
{
ret = m_address->phoneNumber( KABC::PhoneNumber::Home ).number();
ret = m_address->phoneNumber( TDEABC::PhoneNumber::Home ).number();
found = true;
}
else if( t == TOK_ADDRESS_PHONE_WORK )
{
ret = m_address->phoneNumber( KABC::PhoneNumber::Work ).number();
ret = m_address->phoneNumber( TDEABC::PhoneNumber::Work ).number();
found = true;
}
else if( t == TOK_ADDRESS_PHONE_MSG )
{
ret = m_address->phoneNumber( KABC::PhoneNumber::Msg ).number();
ret = m_address->phoneNumber( TDEABC::PhoneNumber::Msg ).number();
found = true;
}
else if( t == TOK_ADDRESS_PHONE_VOICE )
{
ret = m_address->phoneNumber( KABC::PhoneNumber::Voice ).number();
ret = m_address->phoneNumber( TDEABC::PhoneNumber::Voice ).number();
found = true;
}
else if( t == TOK_ADDRESS_PHONE_FAX )
{
ret = m_address->phoneNumber( KABC::PhoneNumber::Fax ).number();
ret = m_address->phoneNumber( TDEABC::PhoneNumber::Fax ).number();
found = true;
}
else if( t == TOK_ADDRESS_PHONE_CELL )
{
ret = m_address->phoneNumber( KABC::PhoneNumber::Cell ).number();
ret = m_address->phoneNumber( TDEABC::PhoneNumber::Cell ).number();
found = true;
}
else if( t == TOK_ADDRESS_PHONE_VIDEO )
{
ret = m_address->phoneNumber( KABC::PhoneNumber::Video ).number();
ret = m_address->phoneNumber( TDEABC::PhoneNumber::Video ).number();
found = true;
}
else if( t == TOK_ADDRESS_PHONE_BBS )
{
ret = m_address->phoneNumber( KABC::PhoneNumber::Bbs ).number();
ret = m_address->phoneNumber( TDEABC::PhoneNumber::Bbs ).number();
found = true;
}
else if( t == TOK_ADDRESS_PHONE_MODEM )
{
ret = m_address->phoneNumber( KABC::PhoneNumber::Modem ).number();
ret = m_address->phoneNumber( TDEABC::PhoneNumber::Modem ).number();
found = true;
}
else if( t == TOK_ADDRESS_PHONE_CAR )
{
ret = m_address->phoneNumber( KABC::PhoneNumber::Car ).number();
ret = m_address->phoneNumber( TDEABC::PhoneNumber::Car ).number();
found = true;
}
else if( t == TOK_ADDRESS_PHONE_ISDN )
{
ret = m_address->phoneNumber( KABC::PhoneNumber::Isdn ).number();
ret = m_address->phoneNumber( TDEABC::PhoneNumber::Isdn ).number();
found = true;
}
else if( t == TOK_ADDRESS_PHONE_PCS )
{
ret = m_address->phoneNumber( KABC::PhoneNumber::Pcs ).number();
ret = m_address->phoneNumber( TDEABC::PhoneNumber::Pcs ).number();
found = true;
}
else if( t == TOK_ADDRESS_PHONE_PAGER )
{
ret = m_address->phoneNumber( KABC::PhoneNumber::Pager ).number();
ret = m_address->phoneNumber( TDEABC::PhoneNumber::Pager ).number();
found = true;
}
else if( t == TOK_ADDRESS_ADDRESS_POB )

6
kbarcode/tokenprovider.h
Unescape View File

@ -29,7 +29,7 @@
#include "documentitem.h"
namespace KABC {
namespace TDEABC {
class Addressee;
};
@ -117,7 +117,7 @@ class TokenProvider {
inline void setCol( unsigned int c ) { col = c; m_update = true; }
inline void setRow( unsigned int r ) { row = r; m_update = true; }
inline void setSerial( const TQString &t, unsigned int inc ) { m_serial = t; m_increment = inc; m_update = true; m_contains_update = true;}
inline void setAddressee( KABC::Addressee* pAddressee ) { m_address = pAddressee; }
inline void setAddressee( TDEABC::Addressee* pAddressee ) { m_address = pAddressee; }
inline int index() const { return m_index; }
inline unsigned int page() const { return m_page; }
@ -224,7 +224,7 @@ class TokenProvider {
TQPaintDevice* m_printer;
TQRegExp date_reg_exp ;
KABC::Addressee* m_address;
TDEABC::Addressee* m_address;
TQStringList* m_findUserVarsList;
static TQValueList<tCategories> s_categories;

Write Preview
Loading…
Cancel
Save