diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:50:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:50:05 -0600 |
| commit | 2178da111f72dc574457d5242d120b4d10ea5edd (patch) | |
| tree | 3f1a143f751c624ab24c35d67229121c98c7cefa /kmoon | |
| parent | f39ce360454f118af0d94b215b83dbd950276ff7 (diff) | |
| download | tdetoys-2178da111f72dc574457d5242d120b4d10ea5edd.tar.gz tdetoys-2178da111f72dc574457d5242d120b4d10ea5edd.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kmoon')
| -rw-r--r-- | kmoon/kmoonapplet.cpp | 6 | ||||
| -rw-r--r-- | kmoon/kmoonwidget.cpp | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/kmoon/kmoonapplet.cpp b/kmoon/kmoonapplet.cpp index 092f9d0..dd6603c 100644 --- a/kmoon/kmoonapplet.cpp +++ b/kmoon/kmoonapplet.cpp @@ -55,7 +55,7 @@ extern "C" { KDE_EXPORT KPanelApplet *init(TQWidget *parent, const TQString& configFile) { - KGlobal::locale()->insertCatalogue("kmoon"); + TDEGlobal::locale()->insertCatalogue("kmoon"); return new MoonPAWidget(configFile, KPanelApplet::Normal, KPanelApplet::About|KPanelApplet::Preferences, parent, "kmoonapplet"); @@ -66,7 +66,7 @@ MoonPAWidget::MoonPAWidget(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) : KPanelApplet(configFile, type, actions, parent, name) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("General"); TQVBoxLayout *vbox = new TQVBoxLayout(this, 0,0); @@ -129,7 +129,7 @@ void MoonPAWidget::settings() moon->setAngle(dlg.getAngle()); moon->setNorthHemi(dlg.getNorthHemi()); moon->setMask(dlg.getMask()); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("General"); config->writeEntry("Rotation", moon->angle()); config->writeEntry("Northern", moon->northHemi()); diff --git a/kmoon/kmoonwidget.cpp b/kmoon/kmoonwidget.cpp index fd4dcf1..6837c7b 100644 --- a/kmoon/kmoonwidget.cpp +++ b/kmoon/kmoonwidget.cpp @@ -57,7 +57,7 @@ MoonWidget::MoonWidget(TQWidget *parent, const char *name) time_t clock; counter = -1; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("General"); _angle = config->readNumEntry("Rotation", 0); _north = config->readBoolEntry("Northern", true); @@ -94,30 +94,30 @@ void MoonWidget::calcStatus( time_t time ) TQDateTime ln; ln.setTime_t( last_new ); - kdDebug() << KGlobal::locale()->formatDateTime( ln ) << endl; + kdDebug() << TDEGlobal::locale()->formatDateTime( ln ) << endl; time_t first_quarter = JDtoDate( moonphasebylunation( lun, 1 ), 0 ); TQDateTime fq; fq.setTime_t( first_quarter ); - kdDebug() << KGlobal::locale()->formatDateTime( fq ) << endl; + kdDebug() << TDEGlobal::locale()->formatDateTime( fq ) << endl; time_t full_moon = JDtoDate( moonphasebylunation( lun, 2 ), 0 ); TQDateTime fm; fm.setTime_t( full_moon ); - kdDebug() << KGlobal::locale()->formatDateTime( fm ) << endl; + kdDebug() << TDEGlobal::locale()->formatDateTime( fm ) << endl; time_t third_quarter = JDtoDate( moonphasebylunation( lun, 3 ), 0 ); TQDateTime tq; tq.setTime_t( third_quarter ); - kdDebug() << KGlobal::locale()->formatDateTime( tq ) << endl; + kdDebug() << TDEGlobal::locale()->formatDateTime( tq ) << endl; TQDateTime nn; nn.setTime_t( next_new ); - kdDebug() << KGlobal::locale()->formatDateTime( nn ) << endl; + kdDebug() << TDEGlobal::locale()->formatDateTime( nn ) << endl; TQDateTime now; now.setTime_t( time ); - kdDebug() << KGlobal::locale()->formatDateTime( now ) << endl; + kdDebug() << TDEGlobal::locale()->formatDateTime( now ) << endl; counter = ln.daysTo( now ); kdDebug() << "counter " << counter << " " << fm.daysTo( now ) << endl; |