From a9bde819f2b421dcc44741156e75eca4bb5fb4f4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:49:30 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- libkholidays/kholidays.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libkholidays') 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 ) -- cgit v1.2.1