diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:37:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:37:21 -0600 |
| commit | 86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch) | |
| tree | 97d3ac2c2f60780d9a1de4f82caac7cb27534501 /libkcal/tests | |
| parent | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff) | |
| download | tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'libkcal/tests')
| -rw-r--r-- | libkcal/tests/testresource.cpp | 6 | ||||
| -rw-r--r-- | libkcal/tests/testresource.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libkcal/tests/testresource.cpp b/libkcal/tests/testresource.cpp index b7f2f24c4..25c9e5d6c 100644 --- a/libkcal/tests/testresource.cpp +++ b/libkcal/tests/testresource.cpp @@ -68,9 +68,9 @@ int main(int argc, char *argv[]) TQString type = TQString(); if ( args->getOption( "resource" ) ) type = TQString::fromLocal8Bit( args->getOption( "resource" ) ); - KConfig *config = 0; + TDEConfig *config = 0; if ( args->getOption( "configfile" ) ) - config = new KConfig( KURL( args->getOption( "configfile" ) ).url() ); + config = new TDEConfig( KURL( args->getOption( "configfile" ) ).url() ); kdDebug() << KURL( args->getOption( "configfile" ) ).url() << endl; KCal::TestResource test( type, config ); test.setup(); @@ -82,7 +82,7 @@ int main(int argc, char *argv[]) namespace KCal { -TestResource::TestResource( const TQString &type, KConfig *config ) +TestResource::TestResource( const TQString &type, TDEConfig *config ) :m_resource_type( type ), m_config( config ), m_res( 0 ) {} diff --git a/libkcal/tests/testresource.h b/libkcal/tests/testresource.h index f6d7fc127..4d17c7b48 100644 --- a/libkcal/tests/testresource.h +++ b/libkcal/tests/testresource.h @@ -20,7 +20,7 @@ #define TESTRESOURCE_H #include <tqobject.h> -class KConfig; +class TDEConfig; namespace KCal { @@ -32,7 +32,7 @@ class TestResource : public TQObject public: - TestResource( const TQString& type, KConfig *config ); + TestResource( const TQString& type, TDEConfig *config ); void setup(); void runAll(); void cleanup(); @@ -49,7 +49,7 @@ public: private: bool check(const TQString& txt, TQString a, TQString b); TQString m_resource_type; - KConfig *m_config; + TDEConfig *m_config; ResourceCalendar *m_res; }; } |