diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:49:30 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:49:30 -0600 |
commit | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch) | |
tree | d087071b1e8fcf79698938efec19f8e48bab0799 /korganizer/plugins | |
parent | 5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff) | |
download | tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'korganizer/plugins')
-rw-r--r-- | korganizer/plugins/exchange/exchange.cpp | 2 | ||||
-rw-r--r-- | korganizer/plugins/hebrew/configdialog.cpp | 2 | ||||
-rw-r--r-- | korganizer/plugins/hebrew/hebrew.cpp | 2 | ||||
-rw-r--r-- | korganizer/plugins/printing/year/yearprint.cpp | 2 | ||||
-rw-r--r-- | korganizer/plugins/projectview/projectview.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp index 063c6756e..ca3c4c497 100644 --- a/korganizer/plugins/exchange/exchange.cpp +++ b/korganizer/plugins/exchange/exchange.cpp @@ -49,7 +49,7 @@ class ExchangeFactory : public KOrg::PartFactory { KOrg::Part *create(KOrg::MainWindow *parent, const char *name) { kdDebug(5850) << "Registering Exchange Plugin...\n"; - KGlobal::locale()->insertCatalogue("libkpimexchange"); + TDEGlobal::locale()->insertCatalogue("libkpimexchange"); return new Exchange(parent,name); } }; diff --git a/korganizer/plugins/hebrew/configdialog.cpp b/korganizer/plugins/hebrew/configdialog.cpp index 6298151ac..54a118523 100644 --- a/korganizer/plugins/hebrew/configdialog.cpp +++ b/korganizer/plugins/hebrew/configdialog.cpp @@ -63,7 +63,7 @@ void ConfigDialog::load() config.setGroup("Calendar/Hebrew Calendar Plugin"); israel_box->setChecked(config. readBoolEntry("Israel", - (KGlobal::locale()-> + (TDEGlobal::locale()-> country() == ".il"))); parsha_box->setChecked(config.readBoolEntry("Parsha", true)); chol_box->setChecked(config.readBoolEntry("Chol_HaMoed", true)); diff --git a/korganizer/plugins/hebrew/hebrew.cpp b/korganizer/plugins/hebrew/hebrew.cpp index 8a9f37bd4..742c7849d 100644 --- a/korganizer/plugins/hebrew/hebrew.cpp +++ b/korganizer/plugins/hebrew/hebrew.cpp @@ -51,7 +51,7 @@ TQString Hebrew::shortText(const TQDate & date) config.setGroup("Calendar/Hebrew Calendar Plugin"); IsraelP = config.readBoolEntry("Israel", - (KGlobal::locale()->country() == ".il")); + (TDEGlobal::locale()->country() == ".il")); Holiday::ParshaP = config.readBoolEntry("Parsha", true); Holiday::CholP = config.readBoolEntry("Chol_HaMoed", true); Holiday::OmerP = config.readBoolEntry("Omer", true); diff --git a/korganizer/plugins/printing/year/yearprint.cpp b/korganizer/plugins/printing/year/yearprint.cpp index 0c124bbeb..f22e1b17a 100644 --- a/korganizer/plugins/printing/year/yearprint.cpp +++ b/korganizer/plugins/printing/year/yearprint.cpp @@ -138,7 +138,7 @@ void CalPrintYear::setDateRange( const TQDate& from, const TQDate& to ) void CalPrintYear::print( TQPainter &p, int width, int height ) { const KCalendarSystem *calsys = calendarSystem(); - KLocale *locale = KGlobal::locale(); + KLocale *locale = TDEGlobal::locale(); if ( !calsys || !locale ) return; TQRect headerBox( 0, 0, width, headerHeight() ); diff --git a/korganizer/plugins/projectview/projectview.cpp b/korganizer/plugins/projectview/projectview.cpp index 64cdd7a3f..da7d5f486 100644 --- a/korganizer/plugins/projectview/projectview.cpp +++ b/korganizer/plugins/projectview/projectview.cpp @@ -37,7 +37,7 @@ class ProjectViewFactory : public KOrg::PartFactory { public: KOrg::Part *create(KOrg::MainWindow *parent, const char *name) { - KGlobal::locale()->insertCatalogue( "kgantt" ); + TDEGlobal::locale()->insertCatalogue( "kgantt" ); return new ProjectView(parent,name); } }; |