summaryrefslogtreecommitdiffstats
path: root/libtdepim/tests
diff options
context:
space:
mode:
Diffstat (limited to 'libtdepim/tests')
-rw-r--r--libtdepim/tests/Makefile.am4
-rw-r--r--libtdepim/tests/test_kregexp.cpp2
-rw-r--r--libtdepim/tests/testdateedit.cpp4
-rw-r--r--libtdepim/tests/testdateedit.h2
-rw-r--r--libtdepim/tests/testdistrlist.h2
-rw-r--r--libtdepim/tests/testutf7encoder.cpp16
6 files changed, 15 insertions, 15 deletions
diff --git a/libtdepim/tests/Makefile.am b/libtdepim/tests/Makefile.am
index 0af1a25a..0cc51436 100644
--- a/libtdepim/tests/Makefile.am
+++ b/libtdepim/tests/Makefile.am
@@ -1,5 +1,5 @@
AM_CPPFLAGS = -I$(top_builddir)/libtdepim -I$(top_srcdir)/libtdepim -I$(top_srcdir)/libemailfunctions $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
LDADD = ../libtdepim.la $(LIB_TDECORE)
check_PROGRAMS = testwizard testaddresseelineedit \
@@ -29,7 +29,7 @@ testkincidencechooser_SOURCES = testkincidencechooser.cpp
METASOURCES = AUTO
-#example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+#example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
#example_LDADD = ../libtdepim.la $(LIB_TDECORE)
#example_SOURCES = example.cpp exampleprefs_base.kcfgc
diff --git a/libtdepim/tests/test_kregexp.cpp b/libtdepim/tests/test_kregexp.cpp
index f02d60b1..19c52fed 100644
--- a/libtdepim/tests/test_kregexp.cpp
+++ b/libtdepim/tests/test_kregexp.cpp
@@ -1,6 +1,6 @@
#include <kregexp3.h>
#include <kdebug.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
int
main()
diff --git a/libtdepim/tests/testdateedit.cpp b/libtdepim/tests/testdateedit.cpp
index a87e950c..39c8447d 100644
--- a/libtdepim/tests/testdateedit.cpp
+++ b/libtdepim/tests/testdateedit.cpp
@@ -39,8 +39,8 @@ DateEdit::DateEdit( TQWidget *parent, const char *name )
KDateEdit *edit = new KDateEdit( this );
layout->addWidget( edit );
- connect( edit, TQT_SIGNAL( dateChanged( const TQDate& ) ),
- this, TQT_SLOT( dateChanged( const TQDate& ) ) );
+ connect( edit, TQ_SIGNAL( dateChanged( const TQDate& ) ),
+ this, TQ_SLOT( dateChanged( const TQDate& ) ) );
}
void DateEdit::dateChanged( const TQDate &date )
diff --git a/libtdepim/tests/testdateedit.h b/libtdepim/tests/testdateedit.h
index 73c9ec91..82fbddb9 100644
--- a/libtdepim/tests/testdateedit.h
+++ b/libtdepim/tests/testdateedit.h
@@ -26,7 +26,7 @@
class DateEdit : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/tests/testdistrlist.h b/libtdepim/tests/testdistrlist.h
index 1e602a33..62375ffc 100644
--- a/libtdepim/tests/testdistrlist.h
+++ b/libtdepim/tests/testdistrlist.h
@@ -23,7 +23,7 @@
class TestDistrList : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/tests/testutf7encoder.cpp b/libtdepim/tests/testutf7encoder.cpp
index 46fbd4d8..6c67afb2 100644
--- a/libtdepim/tests/testutf7encoder.cpp
+++ b/libtdepim/tests/testutf7encoder.cpp
@@ -16,8 +16,8 @@ void main( int argc, char * argv[] ) {
<< "\"" << argv[1] << "\"\n" << endl;
cout << "Encode optional direct set and whitespace:\n" << endl;
- codec->setEncodeWhitespace(TRUE);
- codec->setEncodeOptionalDirect(TRUE);
+ codec->setEncodeWhitespace(true);
+ codec->setEncodeOptionalDirect(true);
enc = codec->makeEncoder();
len = arg.length();
@@ -40,8 +40,8 @@ void main( int argc, char * argv[] ) {
delete enc;
cout << "Encode optional direct set and not whitespace:\n" << endl;
- codec->setEncodeWhitespace(FALSE);
- codec->setEncodeOptionalDirect(TRUE);
+ codec->setEncodeWhitespace(false);
+ codec->setEncodeOptionalDirect(true);
enc = codec->makeEncoder();
len = arg.length();
@@ -52,8 +52,8 @@ void main( int argc, char * argv[] ) {
cout << "Don't encode optional direct set, but whitespace:\n" << endl;
- codec->setEncodeWhitespace(TRUE);
- codec->setEncodeOptionalDirect(FALSE);
+ codec->setEncodeWhitespace(true);
+ codec->setEncodeOptionalDirect(false);
enc = codec->makeEncoder();
len = arg.length();
@@ -64,8 +64,8 @@ void main( int argc, char * argv[] ) {
cout << "Encode neither optional direct set, nor whitespace:\n" << endl;
- codec->setEncodeWhitespace(FALSE);
- codec->setEncodeOptionalDirect(FALSE);
+ codec->setEncodeWhitespace(false);
+ codec->setEncodeOptionalDirect(false);
enc = codec->makeEncoder();
len = arg.length();