Attachment #2659 for bug #2625

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 2625
Collapse All | Expand All

Lines 13-18 add_subdirectory( vcard ) Link Here

(-)a/tdeabc/CMakeLists.txt (+1 lines)
13	add_subdirectory( vcardparser )	13	add_subdirectory( vcardparser )
14	add_subdirectory( formats )	14	add_subdirectory( formats )
15	add_subdirectory( plugins )	15	add_subdirectory( plugins )
		16	add_subdirectory( tests )
16		17
17	include_directories(	18	include_directories(
18	${CMAKE_CURRENT_BINARY_DIR}	19	${CMAKE_CURRENT_BINARY_DIR}

Lines 51-57 class KABC_EXPORT EmailSelectDialog : public KDialogBase Link Here

(-)a/tdeabc/distributionlisteditor.h (-1 / +1 lines)
51	/**	51	/**
52	@obsolete	52	@obsolete
53	*/	53	*/
54	class DistributionListEditor : public TQWidget	54	class KABC_EXPORT DistributionListEditor : public TQWidget
55	{	55	{
56	Q_OBJECT	56	Q_OBJECT
57	public:	57	public:

Lines 78-83 Ticket *ResourceSql::requestSaveTicket() Link Here

(-)a/tdeabc/plugins/sql/resourcesql.cpp (+5 lines)
78	return createTicket( this );	78	return createTicket( this );
79	}	79	}
80		80
		81	void ResourceSql::releaseSaveTicket( Ticket *ticket )
		82	{
		83	delete ticket;
		84	}
		85
81	bool ResourceSql::open()	86	bool ResourceSql::open()
82	{	87	{
83	TQStringList drivers = TQSqlDatabase::drivers();	88	TQStringList drivers = TQSqlDatabase::drivers();





namespace TDEABC {

class KABC_EXPORT ResourceSql : public Resource
{
public:
  ResourceSql( AddressBook *ab, const TQString &user, const TQString &password,
    const TQString &db, const TQString &host );
  ResourceSql( AddressBook *ab, const TDEConfig * );
  
  virtual bool open();
  virtual void close();
  
  virtual Ticket *requestSaveTicket();
  virtual void releaseSaveTicket( Ticket* );

  virtual bool load();
  virtual bool save( Ticket * ticket );

  virtual TQString identifier() const;

private:
  void init(const TQString &user, const TQString &password,




#################################################
#
#  (C) 2016 Slávek Banko
#  slavek.banko (AT) axis.cz
#
#  Improvements and feedback are welcome
#
#  This file is released under GPL >= 2
#
#################################################

include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${TQT_INCLUDE_DIRS}
  ${CMAKE_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}
  ${CMAKE_SOURCE_DIR}/dcop
  ${CMAKE_BINARY_DIR}/tdecore
  ${CMAKE_SOURCE_DIR}/tdecore
  ${CMAKE_SOURCE_DIR}/tdeui
  ${CMAKE_SOURCE_DIR}/tdeio
  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
  ${CMAKE_BINARY_DIR}/tdeabc
  ${CMAKE_SOURCE_DIR}/tdeabc
  ${CMAKE_SOURCE_DIR}/kab
  ${CMAKE_SOURCE_DIR}/tdeabc/plugins/sql
  ${CMAKE_SOURCE_DIR}/tdeabc/vcardparser
  ${CMAKE_SOURCE_DIR}/tdeabc/vcard/include
  ${CMAKE_SOURCE_DIR}/tdeabc/vcard/include/generated
  ${CMAKE_SOURCE_DIR}/tdeabc/vcardparser
)

link_directories(
  ${TDECORE_LIBRARY_DIRS}
)

set( TDEABC_TESTS_LINK
  ${TQT_LIBRARIES}
  DCOP-shared
  tdecore-shared
  tdeui-shared
  tdefx-shared
  tdeio-shared
  tdetexteditor-shared
  tdeabc-shared
)


##### test programs ##############################

tde_add_executable( testlock
  SOURCES testlock.cpp AUTOMOC
  LINK ${TDEABC_TESTS_LINK}
)

tde_add_executable( testldapclient
  SOURCES testldapclient.cpp AUTOMOC
  LINK ${TDEABC_TESTS_LINK}
)

tde_add_executable( testkabc
  SOURCES testkabc.cpp AUTOMOC
  LINK ${TDEABC_TESTS_LINK}
)

tde_add_executable( testaddressee
  SOURCES testaddressee.cpp AUTOMOC
  LINK ${TDEABC_TESTS_LINK}
)

tde_add_executable( testaddresseelist
  SOURCES testaddresseelist.cpp AUTOMOC
  LINK ${TDEABC_TESTS_LINK}
)

tde_add_executable( testaddressfmt
  SOURCES testaddressfmt.cpp AUTOMOC
  LINK ${TDEABC_TESTS_LINK}
)

tde_add_executable( testkabcdlg
  SOURCES testkabcdlg.cpp AUTOMOC
  LINK ${TDEABC_TESTS_LINK}
)

tde_add_executable( testdistlist
  SOURCES testdistlist.cpp AUTOMOC
  LINK ${TDEABC_TESTS_LINK}
)

tde_add_executable( testaddresslineedit
  SOURCES testaddresslineedit.cpp AUTOMOC
  LINK ${TDEABC_TESTS_LINK}
)

tde_add_executable( bigread
  SOURCES bigread.cpp AUTOMOC
  LINK ${TDEABC_TESTS_LINK} tdeabc_file-shared
)

tde_add_executable( bigwrite
  SOURCES bigwrite.cpp AUTOMOC
  LINK ${TDEABC_TESTS_LINK} tdeabc_file-shared
)

# Plugin ResourceSql is not built == can not be tested
#
# tde_add_executable( testdb
#   SOURCES testdb.cpp AUTOMOC
#   LINK ${TDEABC_TESTS_LINK} tdeabc_file-shared
# )

tde_add_executable( kabcargl
  SOURCES kabcargl.cpp AUTOMOC
  LINK ${TDEABC_TESTS_LINK} tdeabc_file-shared
)

Lines 50-55 bigwrite_SOURCES = bigwrite.cpp Link Here

(-)a/tdeabc/tests/Makefile.am (-2 / +2 lines)
50	testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor	50	testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
51	testdb_SOURCES = testdb.cpp	51	testdb_SOURCES = testdb.cpp
52		52
53	tdeabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor	53	kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
54	tdeabcargl_SOURCES = tdeabcargl.cpp	54	kabcargl_SOURCES = kabcargl.cpp
55		55




  d.setCountry ("");

  tqDebug( "-------------------------------------\nShould have german address formatting, local country formatting\n" );
  tqDebug( "%s", a.formattedAddress("Jim Knopf").latin1() );
  tqDebug( "-------------------------------------\nShould have US address formatting, local country formatting\n" );
  tqDebug( "%s", b.formattedAddress("Huck Finn").latin1() );
  tqDebug( "-------------------------------------\nShould have german address formatting, local country formatting\n" );
  tqDebug( "%s", c.formattedAddress("Jim Knopf").latin1() );
  tqDebug( "-------------------------------------\nShould have local address formatting, local country formatting\n" );
  tqDebug( "%s", d.formattedAddress("Jim Knopf").latin1() );
}







  AddressBook ab;
  
  ResourceSql r( &ab, "root", "kde4ever", "tdeabc", "localhost" );
  if ( ! r.open() ) {
    kdDebug() << "Failed to open resource." << endl;
  }
  
  r.load();
  
  r.close();
  

Return to bug 2625

Lines 30-51 class TQSqlDatabase; Link Here

(-)a/tdeabc/plugins/sql/resourcesql.h (-7 / +8 lines)
30		30
31	namespace TDEABC {	31	namespace TDEABC {
32		32
33	class ResourceSql : public Resource	33	class KABC_EXPORT ResourceSql : public Resource
34	{	34	{
35	public:	35	public:
36	ResourceSql( AddressBook *ab, const TQString &user, const TQString &password,	36	ResourceSql( AddressBook *ab, const TQString &user, const TQString &password,
37	const TQString &db, const TQString &host );	37	const TQString &db, const TQString &host );
38	ResourceSql( AddressBook ab, const TDEConfig );	38	ResourceSql( AddressBook ab, const TDEConfig );
39		39
40	bool open();	40	virtual bool open();
41	void close();	41	virtual void close();
42		42
43	Ticket *requestSaveTicket();	43	virtual Ticket *requestSaveTicket();
		44	virtual void releaseSaveTicket( Ticket* );
44		45
45	bool load();	46	virtual bool load();
46	bool save( Ticket * ticket );	47	virtual bool save( Ticket * ticket );
47		48
48	TQString identifier() const;	49	virtual TQString identifier() const;
49		50
50	private:	51	private:
51	void init(const TQString &user, const TQString &password,	52	void init(const TQString &user, const TQString &password,

Lines 20-31 int main(int argc,char **argv) Link Here

(-)a/tdeabc/tests/testdb.cpp (-2 / +2 lines)
20		20
21	AddressBook ab;	21	AddressBook ab;
22		22
23	ResourceSql r( &ab, "root", "kde4ever", "localhost" );	23	ResourceSql r( &ab, "root", "kde4ever", "tdeabc", "localhost" );
24	if ( ! r.open() ) {	24	if ( ! r.open() ) {
25	kdDebug() << "Failed to open resource." << endl;	25	kdDebug() << "Failed to open resource." << endl;
26	}	26	}
27		27
28	r.load( &ab );	28	r.load();
29		29
30	r.close();	30	r.close();
31		31

Line 0 Link Here

(-)a/tdeabc/tests/CMakeLists.txt (+116 lines)
		1	#################################################
		2	#
		3	# (C) 2016 Slávek Banko
		4	# slavek.banko (AT) axis.cz
		5	#
		6	# Improvements and feedback are welcome
		7	#
		8	# This file is released under GPL >= 2
		9	#
		10	#################################################
		11
		12	include_directories(
		13	${CMAKE_CURRENT_BINARY_DIR}
		14	${TQT_INCLUDE_DIRS}
		15	${CMAKE_BINARY_DIR}
		16	${CMAKE_SOURCE_DIR}
		17	${CMAKE_SOURCE_DIR}/dcop
		18	${CMAKE_BINARY_DIR}/tdecore
		19	${CMAKE_SOURCE_DIR}/tdecore
		20	${CMAKE_SOURCE_DIR}/tdeui
		21	${CMAKE_SOURCE_DIR}/tdeio
		22	${CMAKE_SOURCE_DIR}/tdeio/tdeio
		23	${CMAKE_BINARY_DIR}/tdeabc
		24	${CMAKE_SOURCE_DIR}/tdeabc
		25	${CMAKE_SOURCE_DIR}/kab
		26	${CMAKE_SOURCE_DIR}/tdeabc/plugins/sql
		27	${CMAKE_SOURCE_DIR}/tdeabc/vcardparser
		28	${CMAKE_SOURCE_DIR}/tdeabc/vcard/include
		29	${CMAKE_SOURCE_DIR}/tdeabc/vcard/include/generated
		30	${CMAKE_SOURCE_DIR}/tdeabc/vcardparser
		31	)
		32
		33	link_directories(
		34	${TDECORE_LIBRARY_DIRS}
		35	)
		36
		37	set( TDEABC_TESTS_LINK
		38	${TQT_LIBRARIES}
		39	DCOP-shared
		40	tdecore-shared
		41	tdeui-shared
		42	tdefx-shared
		43	tdeio-shared
		44	tdetexteditor-shared
		45	tdeabc-shared
		46	)
		47
		48
		49	##### test programs ##############################
		50
		51	tde_add_executable( testlock
		52	SOURCES testlock.cpp AUTOMOC
		53	LINK ${TDEABC_TESTS_LINK}
		54	)
		55
		56	tde_add_executable( testldapclient
		57	SOURCES testldapclient.cpp AUTOMOC
		58	LINK ${TDEABC_TESTS_LINK}
		59	)
		60
		61	tde_add_executable( testkabc
		62	SOURCES testkabc.cpp AUTOMOC
		63	LINK ${TDEABC_TESTS_LINK}
		64	)
65
66	tde_add_executable( testaddressee
67	SOURCES testaddressee.cpp AUTOMOC
68	LINK ${TDEABC_TESTS_LINK}
69	)
70
71	tde_add_executable( testaddresseelist
72	SOURCES testaddresseelist.cpp AUTOMOC
73	LINK ${TDEABC_TESTS_LINK}
74	)
75
76	tde_add_executable( testaddressfmt
77	SOURCES testaddressfmt.cpp AUTOMOC
78	LINK ${TDEABC_TESTS_LINK}
79	)
80
81	tde_add_executable( testkabcdlg
82	SOURCES testkabcdlg.cpp AUTOMOC
83	LINK ${TDEABC_TESTS_LINK}
84	)
85
86	tde_add_executable( testdistlist
87	SOURCES testdistlist.cpp AUTOMOC
88	LINK ${TDEABC_TESTS_LINK}
89	)
90
91	tde_add_executable( testaddresslineedit
92	SOURCES testaddresslineedit.cpp AUTOMOC
93	LINK ${TDEABC_TESTS_LINK}
94	)
95
96	tde_add_executable( bigread
97	SOURCES bigread.cpp AUTOMOC
98	LINK ${TDEABC_TESTS_LINK} tdeabc_file-shared
99	)
100
101	tde_add_executable( bigwrite
102	SOURCES bigwrite.cpp AUTOMOC
103	LINK ${TDEABC_TESTS_LINK} tdeabc_file-shared
104	)
105
106	# Plugin ResourceSql is not built == can not be tested
107	#
108	# tde_add_executable( testdb
109	# SOURCES testdb.cpp AUTOMOC
110	# LINK ${TDEABC_TESTS_LINK} tdeabc_file-shared
111	# )
112
113	tde_add_executable( kabcargl
114	SOURCES kabcargl.cpp AUTOMOC
115	LINK ${TDEABC_TESTS_LINK} tdeabc_file-shared
116	)

Lines 51-63 int main(int argc,char **argv) Link Here

(-)a/tdeabc/tests/testaddressfmt.cpp (-4 / +4 lines)
51	d.setCountry ("");	51	d.setCountry ("");
52		52
53	tqDebug( "-------------------------------------\nShould have german address formatting, local country formatting\n" );	53	tqDebug( "-------------------------------------\nShould have german address formatting, local country formatting\n" );
54	tqDebug( a.formattedAddress("Jim Knopf").latin1() );	54	tqDebug( "%s", a.formattedAddress("Jim Knopf").latin1() );
55	tqDebug( "-------------------------------------\nShould have US address formatting, local country formatting\n" );	55	tqDebug( "-------------------------------------\nShould have US address formatting, local country formatting\n" );
56	tqDebug( b.formattedAddress("Huck Finn").latin1() );	56	tqDebug( "%s", b.formattedAddress("Huck Finn").latin1() );
57	tqDebug( "-------------------------------------\nShould have german address formatting, local country formatting\n" );	57	tqDebug( "-------------------------------------\nShould have german address formatting, local country formatting\n" );
58	tqDebug( c.formattedAddress("Jim Knopf").latin1() );	58	tqDebug( "%s", c.formattedAddress("Jim Knopf").latin1() );
59	tqDebug( "-------------------------------------\nShould have local address formatting, local country formatting\n" );	59	tqDebug( "-------------------------------------\nShould have local address formatting, local country formatting\n" );
60	tqDebug( d.formattedAddress("Jim Knopf").latin1() );	60	tqDebug( "%s", d.formattedAddress("Jim Knopf").latin1() );
61	}	61	}
62		62
63		63