Rename KApplication to TDEApplication to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 0d7188f7b8
commit 5e95cfc145

@ -2003,20 +2003,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h> #include <kapp.h>
int main() { int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n", printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data()); TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n");

@ -140,7 +140,7 @@ AcquireImageDialog::~AcquireImageDialog()
void AcquireImageDialog::slotHelp() void AcquireImageDialog::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("acquireimages", "kipi-plugins"); TDEApplication::kApplication()->invokeHelp("acquireimages", "kipi-plugins");
} }
void AcquireImageDialog::readSettings(void) void AcquireImageDialog::readSettings(void)

@ -174,7 +174,7 @@ ScreenGrabDialog::~ScreenGrabDialog()
void ScreenGrabDialog::slotHelp() void ScreenGrabDialog::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("acquireimages", "kipi-plugins"); TDEApplication::kApplication()->invokeHelp("acquireimages", "kipi-plugins");
} }
void ScreenGrabDialog::slotClose( void ) void ScreenGrabDialog::slotClose( void )

@ -116,7 +116,7 @@ BorderImagesDialog::~BorderImagesDialog()
void BorderImagesDialog::slotHelp( void ) void BorderImagesDialog::slotHelp( void )
{ {
KApplication::kApplication()->invokeHelp("borderimages", "kipi-plugins"); TDEApplication::kApplication()->invokeHelp("borderimages", "kipi-plugins");
} }
void BorderImagesDialog::slotOptionsClicked(void) void BorderImagesDialog::slotOptionsClicked(void)

@ -137,7 +137,7 @@ ColorImagesDialog::~ColorImagesDialog()
void ColorImagesDialog::slotHelp( void ) void ColorImagesDialog::slotHelp( void )
{ {
KApplication::kApplication()->invokeHelp("colorimages", TDEApplication::kApplication()->invokeHelp("colorimages",
"kipi-plugins"); "kipi-plugins");
} }

@ -147,7 +147,7 @@ ConvertImagesDialog::~ConvertImagesDialog()
void ConvertImagesDialog::slotHelp( void ) void ConvertImagesDialog::slotHelp( void )
{ {
KApplication::kApplication()->invokeHelp("convertimages", "kipi-plugins"); TDEApplication::kApplication()->invokeHelp("convertimages", "kipi-plugins");
} }
void ConvertImagesDialog::slotTypeChanged(int type) void ConvertImagesDialog::slotTypeChanged(int type)

@ -135,7 +135,7 @@ EffectImagesDialog::~EffectImagesDialog()
void EffectImagesDialog::slotHelp( void ) void EffectImagesDialog::slotHelp( void )
{ {
KApplication::kApplication()->invokeHelp("effectimages", TDEApplication::kApplication()->invokeHelp("effectimages",
"kipi-plugins"); "kipi-plugins");
} }

@ -123,7 +123,7 @@ FilterImagesDialog::~FilterImagesDialog()
void FilterImagesDialog::slotHelp( void ) void FilterImagesDialog::slotHelp( void )
{ {
KApplication::kApplication()->invokeHelp("filterimages", "kipi-plugins"); TDEApplication::kApplication()->invokeHelp("filterimages", "kipi-plugins");
} }
void FilterImagesDialog::slotTypeChanged(int type) void FilterImagesDialog::slotTypeChanged(int type)

@ -173,7 +173,7 @@ ImagePreview::~ImagePreview()
void ImagePreview::slotHelp( void ) void ImagePreview::slotHelp( void )
{ {
KApplication::kApplication()->invokeHelp("", "kipi-plugins"); TDEApplication::kApplication()->invokeHelp("", "kipi-plugins");
} }
void ImagePreview::slotWheelChanged( int delta ) void ImagePreview::slotWheelChanged( int delta )

@ -98,7 +98,7 @@ OutputDialog::~OutputDialog()
void OutputDialog::slotHelp( void ) void OutputDialog::slotHelp( void )
{ {
KApplication::kApplication()->invokeHelp("", TDEApplication::kApplication()->invokeHelp("",
"kipi-plugins"); "kipi-plugins");
} }

@ -100,7 +100,7 @@ RecompressImagesDialog::~RecompressImagesDialog()
void RecompressImagesDialog::slotHelp( void ) void RecompressImagesDialog::slotHelp( void )
{ {
KApplication::kApplication()->invokeHelp("recompressimages", "kipi-plugins"); TDEApplication::kApplication()->invokeHelp("recompressimages", "kipi-plugins");
} }
void RecompressImagesDialog::slotOptionsClicked(void) void RecompressImagesDialog::slotOptionsClicked(void)

@ -124,7 +124,7 @@ ResizeImagesDialog::~ResizeImagesDialog()
void ResizeImagesDialog::slotHelp( void ) void ResizeImagesDialog::slotHelp( void )
{ {
KApplication::kApplication()->invokeHelp("resizeimages", "kipi-plugins"); TDEApplication::kApplication()->invokeHelp("resizeimages", "kipi-plugins");
} }
void ResizeImagesDialog::slotOptionsClicked(void) void ResizeImagesDialog::slotOptionsClicked(void)

@ -180,7 +180,7 @@ CalWizard::~CalWizard()
void CalWizard::slotHelp() void CalWizard::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("calendar", "kipi-plugins"); TDEApplication::kApplication()->invokeHelp("calendar", "kipi-plugins");
} }
void CalWizard::slotPageSelected(const TQString&) void CalWizard::slotPageSelected(const TQString&)
@ -222,7 +222,7 @@ void CalWizard::slotPageSelected(const TQString&)
"calendar for<br>the current year or a year in the " "calendar for<br>the current year or a year in the "
"past.")+"</b>"; "past.")+"</b>";
KApplication::startServiceByName("KJobViewer"); TDEApplication::startServiceByName("KJobViewer");
TQString extra2 = i18n("<br><br>You can see KJobViewer is already started. " TQString extra2 = i18n("<br><br>You can see KJobViewer is already started. "
"After the plugin has prepared the calendar, it is passed to " "After the plugin has prepared the calendar, it is passed to "
"the PDF printer. In the KJobViewer you can see the progress " "the PDF printer. In the KJobViewer you can see the progress "

@ -125,7 +125,7 @@ void MonthWidget::setImage( const KURL &url )
imagePath_ = url; imagePath_ = url;
CalSettings::instance()->setImage(month_, imagePath_); CalSettings::instance()->setImage(month_, imagePath_);
KIconLoader* iconLoader = KApplication::kApplication()->iconLoader(); KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
TQPixmap pix = iconLoader->loadIcon("image", KIcon::NoGroup, 64 ); TQPixmap pix = iconLoader->loadIcon("image", KIcon::NoGroup, 64 );
if ( pixmap_ ) if ( pixmap_ )
delete pixmap_; delete pixmap_;

@ -73,7 +73,7 @@ CDArchiving::CDArchiving( KIPI::Interface* interface, TQObject *parent, KAction
: TQObject(parent) : TQObject(parent)
{ {
KImageIO::registerFormats(); KImageIO::registerFormats();
const KAboutData *data = KApplication::kApplication()->aboutData(); const KAboutData *data = TDEApplication::kApplication()->aboutData();
m_hostName = TQString( data->appName() ); m_hostName = TQString( data->appName() );
m_hostURL = data->homepage(); m_hostURL = data->homepage();

@ -132,7 +132,7 @@ CDArchivingDialog::~CDArchivingDialog()
void CDArchivingDialog::slotHelp() void CDArchivingDialog::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("cdarchiving", "kipi-plugins"); TDEApplication::kApplication()->invokeHelp("cdarchiving", "kipi-plugins");
} }
void CDArchivingDialog::setupSelection(void) void CDArchivingDialog::setupSelection(void)

@ -288,7 +288,7 @@ DisplayCompare::~DisplayCompare()
void DisplayCompare::slotHelp() void DisplayCompare::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("findduplicateimages", TDEApplication::kApplication()->invokeHelp("findduplicateimages",
"kipi-plugins"); "kipi-plugins");
} }
@ -341,7 +341,7 @@ void DisplayCompare::slotDelete( void )
void DisplayCompare::slotDisplayLeft(TQListViewItem * item) void DisplayCompare::slotDisplayLeft(TQListViewItem * item)
{ {
KApplication::setOverrideCursor( waitCursor ); TDEApplication::setOverrideCursor( waitCursor );
listEq->clear(); listEq->clear();
FindOriginalItem *pitem = static_cast<FindOriginalItem*>( item ); FindOriginalItem *pitem = static_cast<FindOriginalItem*>( item );
TQPtrVector < TQFile > *list = (TQPtrVector < TQFile > *)m_cmp.find(pitem->fullpath()); TQPtrVector < TQFile > *list = (TQPtrVector < TQFile > *)m_cmp.find(pitem->fullpath());
@ -404,7 +404,7 @@ void DisplayCompare::slotDisplayLeft(TQListViewItem * item)
preview2->setPixmap(TQPixmap()); preview2->setPixmap(TQPixmap());
listEq->setSelected(last, true); listEq->setSelected(last, true);
KApplication::restoreOverrideCursor(); TDEApplication::restoreOverrideCursor();
} }
@ -420,7 +420,7 @@ void DisplayCompare::slotGotPreview1(const KFileItem* /*url*/, const TQPixmap &p
void DisplayCompare::slotDisplayRight(TQListViewItem * item) void DisplayCompare::slotDisplayRight(TQListViewItem * item)
{ {
KApplication::setOverrideCursor( waitCursor ); TDEApplication::setOverrideCursor( waitCursor );
FindDuplicateItem *pitem = static_cast<FindDuplicateItem*>( item ); FindDuplicateItem *pitem = static_cast<FindDuplicateItem*>( item );
TQImage im(pitem->fullpath()); TQImage im(pitem->fullpath());
@ -447,7 +447,7 @@ void DisplayCompare::slotDisplayRight(TQListViewItem * item)
connect(thumbJob2, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), connect(thumbJob2, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
TQT_SLOT(slotGotPreview2(const KFileItem*, const TQPixmap&))); TQT_SLOT(slotGotPreview2(const KFileItem*, const TQPixmap&)));
KApplication::restoreOverrideCursor(); TDEApplication::restoreOverrideCursor();
} }

@ -213,7 +213,7 @@ void FindDuplicateDialog::setupPageMethod(void)
void FindDuplicateDialog::slotHelp() void FindDuplicateDialog::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("findduplicateimages", TDEApplication::kApplication()->invokeHelp("findduplicateimages",
"kipi-plugins"); "kipi-plugins");
} }

@ -198,7 +198,7 @@ void FlickrTalker::slotAuthenticate()
url.addQueryItem("api_sig", md5); url.addQueryItem("api_sig", md5);
kdDebug() << "Authenticate url: " << url << endl; kdDebug() << "Authenticate url: " << url << endl;
KApplication::kApplication()->invokeBrowser(url.url()); TDEApplication::kApplication()->invokeBrowser(url.url());
int valueOk = KMessageBox::questionYesNo(TQT_TQWIDGET(kapp->activeWindow()), int valueOk = KMessageBox::questionYesNo(TQT_TQWIDGET(kapp->activeWindow()),
i18n("Please Follow through the instructions in the browser window and " i18n("Please Follow through the instructions in the browser window and "
"return back to press ok if you are authenticated or press No"), "return back to press ok if you are authenticated or press No"),

@ -273,7 +273,7 @@ void FlickrWindow::writeSettings()
void FlickrWindow::slotHelp() void FlickrWindow::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("flickrexport", "kipi-plugins"); TDEApplication::kApplication()->invokeHelp("flickrexport", "kipi-plugins");
} }
void FlickrWindow::slotDoLogin() void FlickrWindow::slotDoLogin()
@ -334,7 +334,7 @@ void FlickrWindow::slotAlbums( const TQValueList<GAlbum>& albumList )
//m_photoView->write( "<html></html>" ); //m_photoView->write( "<html></html>" );
//m_photoView->end(); //m_photoView->end();
KIconLoader* iconLoader = KApplication::kApplication()->iconLoader(); KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
TQPixmap pix = iconLoader->loadIcon( "folder", KIcon::NoGroup, 32 ); TQPixmap pix = iconLoader->loadIcon( "folder", KIcon::NoGroup, 32 );
typedef TQValueList<GAlbum> GAlbumList; typedef TQValueList<GAlbum> GAlbumList;

@ -49,7 +49,7 @@ namespace KIPIFlickrExportPlugin
MPForm::MPForm() MPForm::MPForm()
{ {
m_boundary = "----------"; m_boundary = "----------";
m_boundary += KApplication::randomString(42 + 13).ascii(); m_boundary += TDEApplication::randomString(42 + 13).ascii();
} }
MPForm::~MPForm() MPForm::~MPForm()

@ -40,7 +40,7 @@ namespace KIPIGalleryExportPlugin
GalleryMPForm::GalleryMPForm() GalleryMPForm::GalleryMPForm()
{ {
m_boundary = "----------"; m_boundary = "----------";
m_boundary += KApplication::randomString( 42 + 13 ).ascii(); m_boundary += TDEApplication::randomString( 42 + 13 ).ascii();
if (GalleryTalker::isGallery2()) if (GalleryTalker::isGallery2())
{ {

@ -192,7 +192,7 @@ GalleryWindow::~GalleryWindow()
void GalleryWindow::slotHelp() void GalleryWindow::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("galleryexport", "kipi-plugins"); TDEApplication::kApplication()->invokeHelp("galleryexport", "kipi-plugins");
} }
void GalleryWindow::slotDoLogin() void GalleryWindow::slotDoLogin()
@ -282,7 +282,7 @@ void GalleryWindow::slotAlbums( const TQValueList<GAlbum>& albumList )
m_photoView->write( "<html></html>" ); m_photoView->write( "<html></html>" );
m_photoView->end(); m_photoView->end();
KIconLoader* iconLoader = KApplication::kApplication()->iconLoader(); KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
TQPixmap pix = iconLoader->loadIcon( "folder", KIcon::NoGroup, 32 ); TQPixmap pix = iconLoader->loadIcon( "folder", KIcon::NoGroup, 32 );
typedef TQValueList<GAlbum> GAlbumList; typedef TQValueList<GAlbum> GAlbumList;

@ -196,7 +196,7 @@ GPSEditDialog::~GPSEditDialog()
void GPSEditDialog::slotHelp() void GPSEditDialog::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("gpssync", "kipi-plugins"); TDEApplication::kApplication()->invokeHelp("gpssync", "kipi-plugins");
} }
void GPSEditDialog::closeEvent(TQCloseEvent *e) void GPSEditDialog::closeEvent(TQCloseEvent *e)

@ -282,7 +282,7 @@ GPSSyncDialog::~GPSSyncDialog()
void GPSSyncDialog::slotHelp() void GPSSyncDialog::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("gpssync", "kipi-plugins"); TDEApplication::kApplication()->invokeHelp("gpssync", "kipi-plugins");
} }
void GPSSyncDialog::setImages( const KURL::List& images ) void GPSSyncDialog::setImages( const KURL::List& images )

@ -59,7 +59,7 @@ namespace KIPIGPSSyncPlugin
kmlExport::kmlExport(KIPI::Interface* interface) kmlExport::kmlExport(KIPI::Interface* interface)
{ {
m_interface = interface; m_interface = interface;
TQWidget* parent = KApplication::kApplication()->mainWidget(); TQWidget* parent = TDEApplication::kApplication()->mainWidget();
m_progressDialog = new KIPI::BatchProgressDialog(parent, i18n("Generating KML file...")); m_progressDialog = new KIPI::BatchProgressDialog(parent, i18n("Generating KML file..."));
} }
@ -450,7 +450,7 @@ void kmlExport::generate()
if (defectImage) if (defectImage)
{ {
/** @todo if defectImage==count there are no pictures exported, does it worst to continue? */ /** @todo if defectImage==count there are no pictures exported, does it worst to continue? */
TQWidget* parent = KApplication::kApplication()->mainWidget(); TQWidget* parent = TDEApplication::kApplication()->mainWidget();
KMessageBox::information(parent, i18n("No position data for 1 picture", KMessageBox::information(parent, i18n("No position data for 1 picture",
"No position data for %n pictures", defectImage)); "No position data for %n pictures", defectImage));
} }

@ -328,7 +328,7 @@ void KMLExportConfig::slotOk()
void KMLExportConfig::slotHelp() void KMLExportConfig::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("KMLExport", "kipi-plugins"); TDEApplication::kApplication()->invokeHelp("KMLExport", "kipi-plugins");
} }
void KMLExportConfig::GoogleMapTargetRadioButton__toggled(bool) void KMLExportConfig::GoogleMapTargetRadioButton__toggled(bool)

@ -77,7 +77,7 @@ void Plugin::slotActivate() {
GalleryInfo info; GalleryInfo info;
info.readConfig(); info.readConfig();
TQWidget* parent=KApplication::kApplication()->mainWidget(); TQWidget* parent=TDEApplication::kApplication()->mainWidget();
Wizard wizard(parent, interface, &info); Wizard wizard(parent, interface, &info);
if (wizard.exec()==TQDialog::Rejected) return; if (wizard.exec()==TQDialog::Rejected) return;
info.writeConfig(); info.writeConfig();

@ -225,7 +225,7 @@ Wizard::~Wizard() {
} }
void Wizard::showHelp() { void Wizard::showHelp() {
KApplication::kApplication()->invokeHelp("htmlexport", "kipi-plugins"); TDEApplication::kApplication()->invokeHelp("htmlexport", "kipi-plugins");
} }
void Wizard::updateFinishButton() { void Wizard::updateFinishButton() {

@ -154,7 +154,7 @@ CameraSelection::~CameraSelection() {
void CameraSelection::slotHelp() void CameraSelection::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("kameraklient", TDEApplication::kApplication()->invokeHelp("kameraklient",
"kipi-plugins"); "kipi-plugins");
} }

@ -231,7 +231,7 @@ CameraUI::~CameraUI() {
void CameraUI::slotHelp() void CameraUI::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("kameraklient", TDEApplication::kApplication()->invokeHelp("kameraklient",
"kipi-plugins"); "kipi-plugins");
} }

@ -51,7 +51,7 @@ DMessageBox::DMessageBox() : TQWidget(0, 0, WShowModal | WStyle_DialogBorder| WD
// ---------------------------------------------------- // ----------------------------------------------------
TQHBox *hbox = new TQHBox(this); TQHBox *hbox = new TQHBox(this);
hbox->setSpacing(5); hbox->setSpacing(5);
TQPixmap pix = KApplication::kApplication()->iconLoader()->loadIcon("error", TQPixmap pix = TDEApplication::kApplication()->iconLoader()->loadIcon("error",
KIcon::NoGroup, KIcon::NoGroup,
KIcon::SizeMedium, KIcon::SizeMedium,
KIcon::DefaultState, KIcon::DefaultState,

@ -146,7 +146,7 @@ SetupCamera::~SetupCamera() {
void SetupCamera::slotHelp() void SetupCamera::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("kameraklient", TDEApplication::kApplication()->invokeHelp("kameraklient",
"kipi-plugins"); "kipi-plugins");
} }

@ -105,7 +105,7 @@ CommentEditDialog::CommentEditDialog(TQWidget* parent)
TQLabel *title = new TQLabel(i18n("<p>Enter the image caption hosted by <b>%1</b>. " TQLabel *title = new TQLabel(i18n("<p>Enter the image caption hosted by <b>%1</b>. "
"This field is not limited (excepted with IPTC). UTF-8 encoding " "This field is not limited (excepted with IPTC). UTF-8 encoding "
"will be used to save text.") "will be used to save text.")
.arg(KApplication::kApplication()->aboutData()->appName()), .arg(TDEApplication::kApplication()->aboutData()->appName()),
plainPage()); plainPage());
d->userCommentEdit = new KTextEdit(plainPage()); d->userCommentEdit = new KTextEdit(plainPage());
@ -140,7 +140,7 @@ CommentEditDialog::~CommentEditDialog()
void CommentEditDialog::slotHelp() void CommentEditDialog::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("metadataedit", "kipi-plugins"); TDEApplication::kApplication()->invokeHelp("metadataedit", "kipi-plugins");
} }
void CommentEditDialog::closeEvent(TQCloseEvent *e) void CommentEditDialog::closeEvent(TQCloseEvent *e)

@ -101,7 +101,7 @@ CommentRemoveDialog::CommentRemoveDialog(TQWidget* parent)
TQVBoxLayout *vlay = new TQVBoxLayout(plainPage(), 0, KDialog::spacingHint()); TQVBoxLayout *vlay = new TQVBoxLayout(plainPage(), 0, KDialog::spacingHint());
d->removeHOSTCommentCheck = new TQCheckBox(i18n("Remove caption created by %1") d->removeHOSTCommentCheck = new TQCheckBox(i18n("Remove caption created by %1")
.arg(KApplication::kApplication()->aboutData()->appName()), .arg(TDEApplication::kApplication()->aboutData()->appName()),
plainPage()); plainPage());
d->removeJFIFCommentCheck = new TQCheckBox(i18n("Remove JFIF Comment section"), plainPage()); d->removeJFIFCommentCheck = new TQCheckBox(i18n("Remove JFIF Comment section"), plainPage());
d->removeEXIFCommentCheck = new TQCheckBox(i18n("Remove EXIF Comment"), plainPage()); d->removeEXIFCommentCheck = new TQCheckBox(i18n("Remove EXIF Comment"), plainPage());
@ -131,7 +131,7 @@ CommentRemoveDialog::~CommentRemoveDialog()
void CommentRemoveDialog::slotHelp() void CommentRemoveDialog::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("metadataedit", "kipi-plugins"); TDEApplication::kApplication()->invokeHelp("metadataedit", "kipi-plugins");
} }
void CommentRemoveDialog::closeEvent(TQCloseEvent *e) void CommentRemoveDialog::closeEvent(TQCloseEvent *e)

@ -151,7 +151,7 @@ EXIFCaption::EXIFCaption(TQWidget* parent)
"will be used to save the text.")); "will be used to save the text."));
d->syncHOSTCommentCheck = new TQCheckBox(i18n("Sync captions entered through %1") d->syncHOSTCommentCheck = new TQCheckBox(i18n("Sync captions entered through %1")
.arg(KApplication::kApplication()->aboutData()->appName()), .arg(TDEApplication::kApplication()->aboutData()->appName()),
parent); parent);
d->syncJFIFCommentCheck = new TQCheckBox(i18n("Sync JFIF Comment section"), parent); d->syncJFIFCommentCheck = new TQCheckBox(i18n("Sync JFIF Comment section"), parent);
d->syncIPTCCaptionCheck = new TQCheckBox(i18n("Sync IPTC caption (warning: limited to 2000 printable " d->syncIPTCCaptionCheck = new TQCheckBox(i18n("Sync IPTC caption (warning: limited to 2000 printable "

@ -106,7 +106,7 @@ EXIFDateTime::EXIFDateTime(TQWidget* parent)
d->dateCreatedSubSecEdit = new KIntSpinBox(0, 999, 1, 0, 10, parent); d->dateCreatedSubSecEdit = new KIntSpinBox(0, 999, 1, 0, 10, parent);
d->dateCreatedSel->setDateTime(TQDateTime::currentDateTime()); d->dateCreatedSel->setDateTime(TQDateTime::currentDateTime());
d->syncHOSTDateCheck = new TQCheckBox(i18n("Sync creation date entered through %1") d->syncHOSTDateCheck = new TQCheckBox(i18n("Sync creation date entered through %1")
.arg(KApplication::kApplication()->aboutData()->appName()), .arg(TDEApplication::kApplication()->aboutData()->appName()),
parent); parent);
d->syncIPTCDateCheck = new TQCheckBox(i18n("Sync IPTC creation date"), parent); d->syncIPTCDateCheck = new TQCheckBox(i18n("Sync IPTC creation date"), parent);
KSeparator *line = new KSeparator(Horizontal, parent); KSeparator *line = new KSeparator(Horizontal, parent);

@ -211,7 +211,7 @@ EXIFEditDialog::~EXIFEditDialog()
void EXIFEditDialog::slotHelp() void EXIFEditDialog::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("metadataedit", "kipi-plugins"); TDEApplication::kApplication()->invokeHelp("metadataedit", "kipi-plugins");
} }
void EXIFEditDialog::closeEvent(TQCloseEvent *e) void EXIFEditDialog::closeEvent(TQCloseEvent *e)

@ -103,7 +103,7 @@ IPTCCaption::IPTCCaption(TQWidget* parent)
d->captionEdit = new KTextEdit(parent); d->captionEdit = new KTextEdit(parent);
d->syncJFIFCommentCheck = new TQCheckBox(i18n("Sync JFIF Comment section"), parent); d->syncJFIFCommentCheck = new TQCheckBox(i18n("Sync JFIF Comment section"), parent);
d->syncHOSTCommentCheck = new TQCheckBox(i18n("Sync caption entered through %1") d->syncHOSTCommentCheck = new TQCheckBox(i18n("Sync caption entered through %1")
.arg(KApplication::kApplication()->aboutData()->appName()), .arg(TDEApplication::kApplication()->aboutData()->appName()),
parent); parent);
d->syncEXIFCommentCheck = new TQCheckBox(i18n("Sync EXIF Comment"), parent); d->syncEXIFCommentCheck = new TQCheckBox(i18n("Sync EXIF Comment"), parent);
KSeparator *line = new KSeparator(Horizontal, parent); KSeparator *line = new KSeparator(Horizontal, parent);

@ -114,7 +114,7 @@ IPTCDateTime::IPTCDateTime(TQWidget* parent)
d->dateCreatedSel = new KDateWidget(parent); d->dateCreatedSel = new KDateWidget(parent);
d->timeCreatedSel = new KTimeWidget(parent); d->timeCreatedSel = new KTimeWidget(parent);
d->syncHOSTDateCheck = new TQCheckBox(i18n("Sync creation date entered through %1") d->syncHOSTDateCheck = new TQCheckBox(i18n("Sync creation date entered through %1")
.arg(KApplication::kApplication()->aboutData()->appName()), .arg(TDEApplication::kApplication()->aboutData()->appName()),
parent); parent);
d->syncEXIFDateCheck = new TQCheckBox(i18n("Sync EXIF creation date"), parent); d->syncEXIFDateCheck = new TQCheckBox(i18n("Sync EXIF creation date"), parent);
KSeparator *line = new KSeparator(Horizontal, parent); KSeparator *line = new KSeparator(Horizontal, parent);

@ -233,7 +233,7 @@ IPTCEditDialog::~IPTCEditDialog()
void IPTCEditDialog::slotHelp() void IPTCEditDialog::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("metadataedit", "kipi-plugins"); TDEApplication::kApplication()->invokeHelp("metadataedit", "kipi-plugins");
} }
void IPTCEditDialog::closeEvent(TQCloseEvent *e) void IPTCEditDialog::closeEvent(TQCloseEvent *e)

@ -769,7 +769,7 @@ void KImg2mpgData::slotOptionDlgOkClicked( void )
void KImg2mpgData::slotHelp() void KImg2mpgData::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("mpegencoder", TDEApplication::kApplication()->invokeHelp("mpegencoder",
"kipi-plugins"); "kipi-plugins");
} }

@ -49,7 +49,7 @@ namespace KIPIPicasawebExportPlugin
MPForm::MPForm() MPForm::MPForm()
{ {
m_boundary = "----------"; m_boundary = "----------";
m_boundary += KApplication::randomString(42 + 13).ascii(); m_boundary += TDEApplication::randomString(42 + 13).ascii();
} }
MPForm::~MPForm() MPForm::~MPForm()

@ -307,7 +307,7 @@ void PicasawebWindow::getToken(TQString& username, TQString& password)
void PicasawebWindow::slotHelp() void PicasawebWindow::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("picasawebexport", "kipi-plugins"); TDEApplication::kApplication()->invokeHelp("picasawebexport", "kipi-plugins");
} }
void PicasawebWindow::slotGetAlbumsListSucceeded() void PicasawebWindow::slotGetAlbumsListSucceeded()

@ -207,7 +207,7 @@ FrmPrintWizard::~FrmPrintWizard()
void FrmPrintWizard::slotHelp() void FrmPrintWizard::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("printwizard","kipi-plugins"); TDEApplication::kApplication()->invokeHelp("printwizard","kipi-plugins");
} }
void FrmPrintWizard::print( KURL::List fileList, TQString tempPath) void FrmPrintWizard::print( KURL::List fileList, TQString tempPath)
@ -1178,7 +1178,7 @@ void FrmPrintWizard::printPhotos(TQPtrList<TPhoto> photos, TQPtrList<TQRect> lay
PrgPrintProgress->setProgress(0); PrgPrintProgress->setProgress(0);
PrgPrintProgress->setTotalSteps(photos.count()); PrgPrintProgress->setTotalSteps(photos.count());
this->finishButton()->setEnabled(false); this->finishButton()->setEnabled(false);
KApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
TQPainter p; TQPainter p;
p.begin(&printer); p.begin(&printer);
@ -1192,7 +1192,7 @@ void FrmPrintWizard::printPhotos(TQPtrList<TPhoto> photos, TQPtrList<TQRect> lay
if (printing) if (printing)
printer.newPage(); printer.newPage();
PrgPrintProgress->setProgress(current); PrgPrintProgress->setProgress(current);
KApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
if (m_cancelPrinting) if (m_cancelPrinting)
{ {
printer.abort(); printer.abort();
@ -1217,7 +1217,7 @@ TQStringList FrmPrintWizard::printPhotosToFile(TQPtrList<TPhoto> photos, TQStrin
PrgPrintProgress->setProgress(0); PrgPrintProgress->setProgress(0);
PrgPrintProgress->setTotalSteps(photos.count()); PrgPrintProgress->setTotalSteps(photos.count());
this->finishButton()->setEnabled(false); this->finishButton()->setEnabled(false);
KApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
unsigned int current = 0; unsigned int current = 0;
int pageCount = 1; int pageCount = 1;
@ -1269,7 +1269,7 @@ TQStringList FrmPrintWizard::printPhotosToFile(TQPtrList<TPhoto> photos, TQStrin
pageCount++; pageCount++;
PrgPrintProgress->setProgress(current); PrgPrintProgress->setProgress(current);
KApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
if (m_cancelPrinting) if (m_cancelPrinting)
break; break;
} }

@ -287,7 +287,7 @@ void BatchDialog::saveSettings()
void BatchDialog::slotHelp() void BatchDialog::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("rawconverter", "kipi-plugins"); TDEApplication::kApplication()->invokeHelp("rawconverter", "kipi-plugins");
} }
void BatchDialog::slotUser1() void BatchDialog::slotUser1()

@ -276,7 +276,7 @@ void SingleDialog::saveSettings()
void SingleDialog::slotHelp() void SingleDialog::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("rawconverter", "kipi-plugins"); TDEApplication::kApplication()->invokeHelp("rawconverter", "kipi-plugins");
} }
// 'Preview' dialog button. // 'Preview' dialog button.

@ -459,7 +459,7 @@ bool SendImages::invokeMailAgent(void)
tqDebug("number of elements in m_filelist %d", (int)m_filesSendList.size()); tqDebug("number of elements in m_filelist %d", (int)m_filesSendList.size());
if ( m_sendImagesDialog->m_mailAgentName->currentText() == "Default" ) if ( m_sendImagesDialog->m_mailAgentName->currentText() == "Default" )
{ {
KApplication::kApplication()->invokeMailer( TDEApplication::kApplication()->invokeMailer(
TQString(), // Destination address. TQString(), // Destination address.
TQString(), // Carbon Copy address. TQString(), // Carbon Copy address.
TQString(), // Blind Carbon Copy address TQString(), // Blind Carbon Copy address

@ -553,7 +553,7 @@ void SendImagesDialog::setupEmailOptions(void)
void SendImagesDialog::slotHelp() void SendImagesDialog::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("sendimages", "kipi-plugins"); TDEApplication::kApplication()->invokeHelp("sendimages", "kipi-plugins");
} }
void SendImagesDialog::slotMailAgentChanged(int) void SendImagesDialog::slotMailAgentChanged(int)

@ -139,12 +139,12 @@ FirstRunDlg::~FirstRunDlg()
void FirstRunDlg::slotHelp() void FirstRunDlg::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("simpleviewerexport", "kipi-plugins"); TDEApplication::kApplication()->invokeHelp("simpleviewerexport", "kipi-plugins");
} }
void FirstRunDlg::slotDownload(const TQString &url) void FirstRunDlg::slotDownload(const TQString &url)
{ {
KApplication::kApplication()->invokeBrowser(url); TDEApplication::kApplication()->invokeBrowser(url);
} }
void FirstRunDlg::slotURLSelected(const TQString &url) void FirstRunDlg::slotURLSelected(const TQString &url)

@ -112,7 +112,7 @@ SimpleViewerExport::SimpleViewerExport(KIPI::Interface* interface, TQObject *par
m_simpleViewerFiles.append(viewer); m_simpleViewerFiles.append(viewer);
m_simpleViewerFiles.append("swfobject.js"); m_simpleViewerFiles.append("swfobject.js");
const KAboutData *data = KApplication::kApplication()->aboutData(); const KAboutData *data = TDEApplication::kApplication()->aboutData();
m_hostName = TQString( data->appName() ); m_hostName = TQString( data->appName() );
m_hostURL = data->homepage(); m_hostURL = data->homepage();

@ -117,7 +117,7 @@ SVEDialog::~SVEDialog()
void SVEDialog::slotHelp() void SVEDialog::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("simpleviewerexport", "kipi-plugins"); TDEApplication::kApplication()->invokeHelp("simpleviewerexport", "kipi-plugins");
} }
void SVEDialog::readConfig() void SVEDialog::readConfig()

@ -778,7 +778,7 @@ void SlideShowConfig::slotStartClicked()
void SlideShowConfig::slotHelp() void SlideShowConfig::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("slideshow", TDEApplication::kApplication()->invokeHelp("slideshow",
"kipi-plugins"); "kipi-plugins");
} }

@ -177,7 +177,7 @@ GalleryWindow::~GalleryWindow()
void GalleryWindow::slotHelp() void GalleryWindow::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("galleryexport", "kipi-plugins"); TDEApplication::kApplication()->invokeHelp("galleryexport", "kipi-plugins");
} }
void GalleryWindow::slotDoLogin() void GalleryWindow::slotDoLogin()
@ -267,7 +267,7 @@ void GalleryWindow::slotAlbums( const TQValueList<GAlbum>& albumList )
m_photoView->write( "<html></html>" ); m_photoView->write( "<html></html>" );
m_photoView->end(); m_photoView->end();
KIconLoader* iconLoader = KApplication::kApplication()->iconLoader(); KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
TQPixmap pix = iconLoader->loadIcon( "folder", KIcon::NoGroup, 32 ); TQPixmap pix = iconLoader->loadIcon( "folder", KIcon::NoGroup, 32 );
typedef TQValueList<GAlbum> GAlbumList; typedef TQValueList<GAlbum> GAlbumList;

@ -39,7 +39,7 @@ GalleryForm::GalleryForm(GalleryVersion version, TQString authToken)
: mVersion(version) : mVersion(version)
{ {
mBoundary = "----------"; mBoundary = "----------";
mBoundary += KApplication::randomString( 42 + 13 ).ascii(); mBoundary += TDEApplication::randomString( 42 + 13 ).ascii();
if (Gallery2 == mVersion) if (Gallery2 == mVersion)
{ {

@ -296,7 +296,7 @@ TimeAdjustDialog::~TimeAdjustDialog()
void TimeAdjustDialog::slotHelp() void TimeAdjustDialog::slotHelp()
{ {
KApplication::kApplication()->invokeHelp("timeadjust", "kipi-plugins"); TDEApplication::kApplication()->invokeHelp("timeadjust", "kipi-plugins");
} }
void TimeAdjustDialog::slotResetDateToCurrent() void TimeAdjustDialog::slotResetDateToCurrent()

Loading…
Cancel
Save