diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
commit | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch) | |
tree | d087071b1e8fcf79698938efec19f8e48bab0799 /libkholidays/kholidays.cpp | |
parent | 5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff) | |
download | tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'libkholidays/kholidays.cpp')
-rw-r--r-- | libkholidays/kholidays.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libkholidays/kholidays.cpp b/libkholidays/kholidays.cpp index 3b4ec63a2..369b021cb 100644 --- a/libkholidays/kholidays.cpp +++ b/libkholidays/kholidays.cpp @@ -41,7 +41,7 @@ extern "C" { TQStringList KHolidays::locations() { TQStringList files = - KGlobal::dirs()->findAllResources( "data", "libkholidays/" + generateFileName( "*" ), + TDEGlobal::dirs()->findAllResources( "data", "libkholidays/" + generateFileName( "*" ), false, true ); TQStringList locs; @@ -59,7 +59,7 @@ TQString KHolidays::fileForLocation( const TQString &location ) TQString KHolidays::userPath( bool create ) { - return KGlobal::dirs()->saveLocation( "data", "libkholidays/", create ); + return TDEGlobal::dirs()->saveLocation( "data", "libkholidays/", create ); } TQString KHolidays::generateFileName( const TQString &location ) |