diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:30:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:30:37 -0600 |
| commit | 00c3041bcca175069e36271b72188965ad1ffcf5 (patch) | |
| tree | ac654751aa6d89f7da1faf4af1db1121164250b5 /kipi-plugins/printwizard | |
| parent | cee209f8b3fe41533e21171f62ca32c552c2d2b3 (diff) | |
| download | kipi-plugins-00c3041bcca175069e36271b72188965ad1ffcf5.tar.gz kipi-plugins-00c3041bcca175069e36271b72188965ad1ffcf5.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kipi-plugins/printwizard')
| -rw-r--r-- | kipi-plugins/printwizard/frmprintwizard.cpp | 4 | ||||
| -rw-r--r-- | kipi-plugins/printwizard/frmprintwizard.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kipi-plugins/printwizard/frmprintwizard.cpp b/kipi-plugins/printwizard/frmprintwizard.cpp index 5328ca8..94db6e6 100644 --- a/kipi-plugins/printwizard/frmprintwizard.cpp +++ b/kipi-plugins/printwizard/frmprintwizard.cpp @@ -186,7 +186,7 @@ FrmPrintWizard::FrmPrintWizard(TQWidget *parent, const char *name ) loadSettings(); - m_Proc = new KProcess; + m_Proc = new TDEProcess; *m_Proc << "kjobviewer" << "--all"; } @@ -555,7 +555,7 @@ TQString FrmPrintWizard::captionFormatter(TPhoto *photo, const TQString& format) // %l focal length str.replace("%f", fi.fileName()); str.replace("%c", photo->exiv2Iface()->getExifComment()); - str.replace("%d", KGlobal::locale()->formatDateTime(photo->exiv2Iface()->getImageDateTime(), + str.replace("%d", TDEGlobal::locale()->formatDateTime(photo->exiv2Iface()->getImageDateTime(), false, false)); str.replace("%t", photo->exiv2Iface()->getExifTagString("Exif.Photo.ExposureTime")); str.replace("%i", photo->exiv2Iface()->getExifTagString("Exif.Photo.ISOSpeedRatings")); diff --git a/kipi-plugins/printwizard/frmprintwizard.h b/kipi-plugins/printwizard/frmprintwizard.h index b555afc..9b01ae0 100644 --- a/kipi-plugins/printwizard/frmprintwizard.h +++ b/kipi-plugins/printwizard/frmprintwizard.h @@ -33,7 +33,7 @@ #include "frmprintwizardbase.h" class TQPushButton; -class KProcess; +class TDEProcess; namespace KIPIPrintWizardPlugin { @@ -75,7 +75,7 @@ private: TQPtrList<TPhotoSize> m_photoSizes; PageSize m_pageSize; - KProcess *m_Proc; + TDEProcess *m_Proc; TQString m_tempPath; int m_currentPreviewPage; |