diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index 9d9c574e..cab78590 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -133,9 +133,9 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, // start knotifyclient if not already started. makes it work for people who doesn't use full kde, according to kmail devels KNotifyClient::startDaemon(); - m_standardFeedList = KGlobal::dirs()->saveLocation("data", "akregator/data") + "/feeds.opml"; + m_standardFeedList = TDEGlobal::dirs()->saveLocation("data", "akregator/data") + "/feeds.opml"; - m_tagSetPath = KGlobal::dirs()->saveLocation("data", "akregator/data") + "/tagset.xml"; + m_tagSetPath = TDEGlobal::dirs()->saveLocation("data", "akregator/data") + "/tagset.xml"; Backend::StorageFactoryDummyImpl* dummyFactory = new Backend::StorageFactoryDummyImpl(); Backend::StorageFactoryRegistry::self()->registerFactory(dummyFactory, dummyFactory->key()); @@ -832,10 +832,10 @@ void Part::initFonts() TQStringList fonts = Settings::fonts(); if (fonts.isEmpty()) { - fonts.append(KGlobalSettings::generalFont().family()); - fonts.append(KGlobalSettings::fixedFont().family()); - fonts.append(KGlobalSettings::generalFont().family()); - fonts.append(KGlobalSettings::generalFont().family()); + fonts.append(TDEGlobalSettings::generalFont().family()); + fonts.append(TDEGlobalSettings::fixedFont().family()); + fonts.append(TDEGlobalSettings::generalFont().family()); + fonts.append(TDEGlobalSettings::generalFont().family()); fonts.append("0"); } Settings::setFonts(fonts); @@ -860,7 +860,7 @@ void Part::initFonts() if (konq.hasKey("MinimumFontSize")) minfs = konq.readNumEntry("MinimumFontSize"); else - minfs = KGlobalSettings::generalFont().pointSize(); + minfs = TDEGlobalSettings::generalFont().pointSize(); kdDebug() << "Part::initFonts(): set MinimumFontSize to " << minfs << endl; Settings::setMinimumFontSize(minfs); } @@ -871,7 +871,7 @@ void Part::initFonts() if (konq.hasKey("MediumFontSize")) medfs = konq.readNumEntry("MediumFontSize"); else - medfs = KGlobalSettings::generalFont().pointSize(); + medfs = TDEGlobalSettings::generalFont().pointSize(); kdDebug() << "Part::initFonts(): set MediumFontSize to " << medfs << endl; Settings::setMediumFontSize(medfs); } diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp index 7a14c289..605ae738 100644 --- a/akregator/src/akregator_view.cpp +++ b/akregator/src/akregator_view.cpp @@ -247,7 +247,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons m_listTabWidget->setViewMode(ListTabWidget::single); m_feedListView = new NodeListView( this, "feedtree" ); - m_listTabWidget->addView(m_feedListView, i18n("Feeds"), KGlobal::iconLoader()->loadIcon("folder", KIcon::Small)); + m_listTabWidget->addView(m_feedListView, i18n("Feeds"), TDEGlobal::iconLoader()->loadIcon("folder", KIcon::Small)); connect(m_feedListView, TQT_SIGNAL(signalContextMenu(KListView*, TreeNode*, const TQPoint&)), this, TQT_SLOT(slotFeedTreeContextMenu(KListView*, TreeNode*, const TQPoint&))); @@ -256,7 +256,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons TreeNode*, Folder*))); m_tagNodeListView = new NodeListView(this); - m_listTabWidget->addView(m_tagNodeListView, i18n("Tags"), KGlobal::iconLoader()->loadIcon("rss_tag", KIcon::Small)); + m_listTabWidget->addView(m_tagNodeListView, i18n("Tags"), TDEGlobal::iconLoader()->loadIcon("rss_tag", KIcon::Small)); connect(m_tagNodeListView, TQT_SIGNAL(signalContextMenu(KListView*, TreeNode*, const TQPoint&)), this, TQT_SLOT(slotFeedTreeContextMenu(KListView*, TreeNode*, const TQPoint&))); diff --git a/akregator/src/articlelistview.cpp b/akregator/src/articlelistview.cpp index 3449ee9c..aad2dd05 100644 --- a/akregator/src/articlelistview.cpp +++ b/akregator/src/articlelistview.cpp @@ -156,7 +156,7 @@ class ArticleListView::ArticleItem : public KListViewItem // FIXME: Remove resolveEntities for KDE 4.0, it's now done in the parser ArticleListView::ArticleItem::ArticleItem( TQListView *parent, const Article& a) - : KListViewItem( parent, KCharsets::resolveEntities(a.title()), a.feed()->title(), KGlobal::locale()->formatDateTime(a.pubDate(), true, false) ), m_article(a), m_pubDate(a.pubDate().toTime_t()) + : KListViewItem( parent, KCharsets::resolveEntities(a.title()), a.feed()->title(), TDEGlobal::locale()->formatDateTime(a.pubDate(), true, false) ), m_article(a), m_pubDate(a.pubDate().toTime_t()) { if (a.keep()) setPixmap(0, keepFlag()); @@ -197,7 +197,7 @@ void ArticleListView::ArticleItem::updateItem(const Article& article) setPixmap(0, m_article.keep() ? keepFlag() : TQPixmap()); setText(0, KCharsets::resolveEntities(m_article.title())); setText(1, m_article.feed()->title()); - setText(2, KGlobal::locale()->formatDateTime(m_article.pubDate(), true, false)); + setText(2, TDEGlobal::locale()->formatDateTime(m_article.pubDate(), true, false)); } int ArticleListView::ArticleItem::compare(TQListViewItem *i, int col, bool ascending) const { diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp index f5fd8a5e..b9dee41a 100644 --- a/akregator/src/articleviewer.cpp +++ b/akregator/src/articleviewer.cpp @@ -177,7 +177,7 @@ ArticleViewer::ArticleViewer(TQWidget *parent, const char *name) connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), this, TQT_SLOT(slotPaletteOrFontChanged()) ); connect(kapp, TQT_SIGNAL(kdisplayFontChanged()), this, TQT_SLOT(slotPaletteOrFontChanged()) ); - m_imageDir.setPath(KGlobal::dirs()->saveLocation("cache", "akregator/Media/")); + m_imageDir.setPath(TDEGlobal::dirs()->saveLocation("cache", "akregator/Media/")); m_htmlFooter = ""; } @@ -420,7 +420,7 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic text += TQString("").arg(directionOf(i18n("Date"))); text += TQString ("%1:").arg(i18n("Date")); text += ""; - text += KGlobal::locale()->formatDateTime(article.pubDate(), false, false)+"\n"; // TODO: might need RTL? + text += TDEGlobal::locale()->formatDateTime(article.pubDate(), false, false)+"\n"; // TODO: might need RTL? } TQString author = article.author(); if (!author.isEmpty()) @@ -515,7 +515,7 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art text += TQString("").arg(directionOf(i18n("Date"))); text += TQString ("%1:").arg(i18n("Date")); text += ""; - text += KGlobal::locale()->formatDateTime(article.pubDate(), false, false)+"\n"; // TODO: might need RTL? + text += TDEGlobal::locale()->formatDateTime(article.pubDate(), false, false)+"\n"; // TODO: might need RTL? } TQString author = article.author(); diff --git a/akregator/src/feed.cpp b/akregator/src/feed.cpp index cb62b53a..a68aedbb 100644 --- a/akregator/src/feed.cpp +++ b/akregator/src/feed.cpp @@ -208,7 +208,7 @@ TQValueList
Feed::articles(const TQString& tag) void Feed::loadImage() { - TQString imageFileName = KGlobal::dirs()->saveLocation("cache", "akregator/Media/") + TQString imageFileName = TDEGlobal::dirs()->saveLocation("cache", "akregator/Media/") + Utils::fileNameForUrl(d->xmlUrl) + ".png"; d->imagePixmap.load(imageFileName, "PNG"); @@ -589,7 +589,7 @@ void Feed::slotImageFetched(const TQPixmap& image) if (image.isNull()) return; d->imagePixmap=image; - d->imagePixmap.save(KGlobal::dirs()->saveLocation("cache", "akregator/Media/") + d->imagePixmap.save(TDEGlobal::dirs()->saveLocation("cache", "akregator/Media/") + Utils::fileNameForUrl(d->xmlUrl) + ".png","PNG"); nodeModified(); diff --git a/akregator/src/feediconmanager.cpp b/akregator/src/feediconmanager.cpp index f1e8140b..b4d600d4 100644 --- a/akregator/src/feediconmanager.cpp +++ b/akregator/src/feediconmanager.cpp @@ -140,7 +140,7 @@ void FeedIconManager::slotFeedDestroyed(TreeNode* node) void FeedIconManager::slotIconChanged(bool /*isHost*/, const TQString& hostOrURL, const TQString& iconName) { - TQString iconFile = KGlobal::dirs()->findResource("cache", + TQString iconFile = TDEGlobal::dirs()->findResource("cache", iconName+".png"); Feed* f; TQPixmap p = TQPixmap(iconFile); diff --git a/akregator/src/feeditem.cpp b/akregator/src/feeditem.cpp index 03d0f077..f9d1b3d1 100644 --- a/akregator/src/feeditem.cpp +++ b/akregator/src/feeditem.cpp @@ -84,12 +84,12 @@ void FeedItem::nodeChanged() TQPixmap FeedItem::errorPixmap() { - return KGlobal::iconLoader()->loadIcon("error", KIcon::Small); + return TDEGlobal::iconLoader()->loadIcon("error", KIcon::Small); } TQPixmap FeedItem::defaultPixmap() { - return KGlobal::iconLoader()->loadIcon("txt", KIcon::Small); + return TDEGlobal::iconLoader()->loadIcon("txt", KIcon::Small); } void FeedItem::initialize(Feed* node) diff --git a/akregator/src/folderitem.cpp b/akregator/src/folderitem.cpp index c9866c19..af01736b 100644 --- a/akregator/src/folderitem.cpp +++ b/akregator/src/folderitem.cpp @@ -56,7 +56,7 @@ FolderItem::FolderItem(KListView* parent, TreeNodeItem* after, Folder* node) : T void FolderItem::initialize(Folder* node) { setOpen(node->isOpen()); - setPixmap ( 0, KGlobal::iconLoader()->loadIcon("folder", KIcon::Small) ); + setPixmap ( 0, TDEGlobal::iconLoader()->loadIcon("folder", KIcon::Small) ); if (node) setText(0, node->title()); } diff --git a/akregator/src/librss/loader.cpp b/akregator/src/librss/loader.cpp index 5fad1409..95f75e60 100644 --- a/akregator/src/librss/loader.cpp +++ b/akregator/src/librss/loader.cpp @@ -207,12 +207,12 @@ void OutputRetriever::retrieveData(const KURL &url) d->buffer->open(IO_WriteOnly); d->process = new KShellProcess(); - connect(d->process, TQT_SIGNAL(processExited(KProcess *)), - TQT_SLOT(slotExited(KProcess *))); - connect(d->process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - TQT_SLOT(slotOutput(KProcess *, char *, int))); + connect(d->process, TQT_SIGNAL(processExited(TDEProcess *)), + TQT_SLOT(slotExited(TDEProcess *))); + connect(d->process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + TQT_SLOT(slotOutput(TDEProcess *, char *, int))); *d->process << url.path(); - d->process->start(KProcess::NotifyOnExit, KProcess::Stdout); + d->process->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); } int OutputRetriever::errorCode() const @@ -220,12 +220,12 @@ int OutputRetriever::errorCode() const return d->lastError; } -void OutputRetriever::slotOutput(KProcess *, char *data, int length) +void OutputRetriever::slotOutput(TDEProcess *, char *data, int length) { d->buffer->writeBlock(data, length); } -void OutputRetriever::slotExited(KProcess *p) +void OutputRetriever::slotExited(TDEProcess *p) { if (!p->normalExit()) d->lastError = p->exitStatus(); diff --git a/akregator/src/librss/loader.h b/akregator/src/librss/loader.h index dab47f17..0f463d77 100644 --- a/akregator/src/librss/loader.h +++ b/akregator/src/librss/loader.h @@ -21,7 +21,7 @@ namespace KIO { class Job; } -class KProcess; +class TDEProcess; namespace RSS { @@ -194,8 +194,8 @@ namespace RSS virtual void abort() {} private slots: - void slotOutput(KProcess *process, char *data, int length); - void slotExited(KProcess *process); + void slotOutput(TDEProcess *process, char *data, int length); + void slotExited(TDEProcess *process); private: OutputRetriever(const OutputRetriever &other); diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp index 01b479ba..275a7a91 100644 --- a/akregator/src/mainwindow.cpp +++ b/akregator/src/mainwindow.cpp @@ -199,7 +199,7 @@ void MainWindow::optionsConfigureKeys() void MainWindow::optionsConfigureToolbars() { - saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); + saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); // use the standard toolbar editor KEditToolbar dlg(factory()); @@ -212,7 +212,7 @@ void MainWindow::optionsConfigureToolbars() void MainWindow::applyNewToolbarConfig() { - applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); + applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); } diff --git a/akregator/src/mk4storage/feedstoragemk4impl.cpp b/akregator/src/mk4storage/feedstoragemk4impl.cpp index 3b567933..58d5e31f 100644 --- a/akregator/src/mk4storage/feedstoragemk4impl.cpp +++ b/akregator/src/mk4storage/feedstoragemk4impl.cpp @@ -148,7 +148,7 @@ FeedStorageMK4Impl::FeedStorageMK4Impl(const TQString& url, StorageMK4Impl* main TQString t = url2; TQString t2 = url2; TQString filePath = main->archivePath() +"/"+ t.replace("/", "_").replace(":", "_"); - d->oldArchivePath = KGlobal::dirs()->saveLocation("data", "akregator/Archive/") + t2.replace("/", "_").replace(":", "_") + ".xml"; + d->oldArchivePath = TDEGlobal::dirs()->saveLocation("data", "akregator/Archive/") + t2.replace("/", "_").replace(":", "_") + ".xml"; d->convert = !TQFile::exists(filePath + ".mk4") && TQFile::exists(d->oldArchivePath); d->storage = new c4_Storage((filePath + ".mk4").local8Bit(), true); diff --git a/akregator/src/mk4storage/storagemk4impl.cpp b/akregator/src/mk4storage/storagemk4impl.cpp index becbd518..1e104bd3 100644 --- a/akregator/src/mk4storage/storagemk4impl.cpp +++ b/akregator/src/mk4storage/storagemk4impl.cpp @@ -90,7 +90,7 @@ StorageMK4Impl::StorageMK4Impl() : d(new StorageMK4ImplPrivate) TQString StorageMK4Impl::defaultArchivePath() { - return KGlobal::dirs()->saveLocation("data", "akregator")+"Archive"; + return TDEGlobal::dirs()->saveLocation("data", "akregator")+"Archive"; } StorageMK4Impl::~StorageMK4Impl() diff --git a/akregator/src/mk4storage/storagemk4impl.h b/akregator/src/mk4storage/storagemk4impl.h index 182807a8..d6c4a59c 100644 --- a/akregator/src/mk4storage/storagemk4impl.h +++ b/akregator/src/mk4storage/storagemk4impl.h @@ -46,7 +46,7 @@ class StorageMK4Impl : public Storage virtual ~StorageMK4Impl(); - /** KGlobal::dirs()->saveLocation("data", "akregator")+"/Archive" */ + /** TDEGlobal::dirs()->saveLocation("data", "akregator")+"/Archive" */ static TQString defaultArchivePath(); /** sets the directory where the metakit files will be stored. diff --git a/akregator/src/notificationmanager.cpp b/akregator/src/notificationmanager.cpp index 0ab3a4e8..60066c5f 100644 --- a/akregator/src/notificationmanager.cpp +++ b/akregator/src/notificationmanager.cpp @@ -55,7 +55,7 @@ NotificationManager::~NotificationManager() void NotificationManager::setWidget(TQWidget* widget, TDEInstance* inst) { m_widget = widget; - m_instance = inst != NULL ? inst : KGlobal::instance(); + m_instance = inst != NULL ? inst : TDEGlobal::instance(); } void NotificationManager::slotNotifyArticle(const Article& article) diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp index d7238d90..4baef48c 100644 --- a/akregator/src/pageviewer.cpp +++ b/akregator/src/pageviewer.cpp @@ -99,7 +99,7 @@ PageViewer::PageViewer(TQWidget *parent, const char *name) : Viewer(parent, name), d(new PageViewerPrivate) { // this hack is necessary since the part looks for []HTML Settings] in - // KGlobal::config() by default, which is wrong when running in Kontact + // TDEGlobal::config() by default, which is wrong when running in Kontact KHTMLSettings* s = const_cast (settings()); s->init(Settings::self()->config()); @@ -260,7 +260,7 @@ bool PageViewer::openURL(const KURL& url) TQString favicon = FeedIconManager::self()->iconLocation(url); if (!favicon.isEmpty()) - emit setTabIcon(TQPixmap(KGlobal::dirs()->findResource("cache", favicon+".png"))); + emit setTabIcon(TQPixmap(TDEGlobal::dirs()->findResource("cache", favicon+".png"))); else emit setTabIcon(SmallIcon("html")); @@ -398,7 +398,7 @@ void PageViewer::slotPaletteOrFontChanged() obj->tqt_invoke(id, o); // this hack is necessary since the part looks for []HTML Settings] in - // KGlobal::config() by default, which is wrong when running in Kontact + // TDEGlobal::config() by default, which is wrong when running in Kontact // NOTE: when running in Kontact, immediate updating doesn't work KHTMLSettings* s = const_cast (settings()); s->init(Settings::self()->config()); diff --git a/akregator/src/searchbar.cpp b/akregator/src/searchbar.cpp index e40b50b2..58f6c2f7 100644 --- a/akregator/src/searchbar.cpp +++ b/akregator/src/searchbar.cpp @@ -84,7 +84,7 @@ SearchBar::SearchBar(TQWidget* parent, const char* name) : TQHBox(parent, name), statusLabel->setText( i18n("Status:") ); d->searchCombo = new KComboBox(this, "searchcombo"); - TQPixmap iconAll = KGlobal::iconLoader()->loadIcon("exec", KIcon::Small); + TQPixmap iconAll = TDEGlobal::iconLoader()->loadIcon("exec", KIcon::Small); TQPixmap iconNew(locate("data", "akregator/pics/kmmsgnew.png")); TQPixmap iconUnread(locate("data", "akregator/pics/kmmsgunseen.png")); TQPixmap iconKeep(locate("data", "akregator/pics/kmmsgflag.png")); diff --git a/akregator/src/tagnodeitem.cpp b/akregator/src/tagnodeitem.cpp index 90e05ba2..2c2e7f34 100644 --- a/akregator/src/tagnodeitem.cpp +++ b/akregator/src/tagnodeitem.cpp @@ -62,13 +62,13 @@ void TagNodeItem::initialize(TagNode* node) if (node) { setText(0, node->title()); - setPixmap ( 0, KGlobal::iconLoader()->loadIcon(node->icon(), KIcon::Small) ); + setPixmap ( 0, TDEGlobal::iconLoader()->loadIcon(node->icon(), KIcon::Small) ); } } void TagNodeItem::nodeChanged() { - setPixmap ( 0, KGlobal::iconLoader()->loadIcon(node()->icon(), KIcon::Small)); + setPixmap ( 0, TDEGlobal::iconLoader()->loadIcon(node()->icon(), KIcon::Small)); TreeNodeItem::nodeChanged(); } diff --git a/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp index 0ba92b09..441f1baf 100644 --- a/akregator/src/trayicon.cpp +++ b/akregator/src/trayicon.cpp @@ -144,7 +144,7 @@ void TrayIcon::slotSetUnread(int unread) int oldH = pixmap()->size().height(); TQString uStr=TQString::number( unread ); - TQFont f=KGlobalSettings::generalFont(); + TQFont f=TDEGlobalSettings::generalFont(); f.setBold(true); float pointSize=f.pointSizeFloat(); TQFontMetrics fm(f); diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp index 8555d509..153fb8ae 100644 --- a/akregator/src/viewer.cpp +++ b/akregator/src/viewer.cpp @@ -113,10 +113,10 @@ void Viewer::displayInExternalBrowser(const KURL &url, const TQString &mimetype) TQString cmd = Settings::externalBrowserCustomCommand(); TQString urlStr = url.url(); cmd.replace(TQRegExp("%u"), urlStr); - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; TQStringList cmdAndArgs = KShell::splitArgs(cmd); *proc << cmdAndArgs; - proc->start(KProcess::DontCare); + proc->start(TDEProcess::DontCare); delete proc; } } diff --git a/certmanager/certificateinfowidgetimpl.cpp b/certmanager/certificateinfowidgetimpl.cpp index 74b476c8..c6add951 100644 --- a/certmanager/certificateinfowidgetimpl.cpp +++ b/certmanager/certificateinfowidgetimpl.cpp @@ -96,7 +96,7 @@ CertificateInfoWidgetImpl::CertificateInfoWidgetImpl( const GpgME::Key & key, bo connect( importButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotImportCertificate() ) ); - dumpView->setFont( KGlobalSettings::fixedFont() ); + dumpView->setFont( TDEGlobalSettings::fixedFont() ); if ( !key.isNull() ) setKey( key ); @@ -253,36 +253,36 @@ void CertificateInfoWidgetImpl::startCertificateChainListing() { } void CertificateInfoWidgetImpl::startCertificateDump() { - KProcess* proc = new KProcess( TQT_TQOBJECT(this) ); + TDEProcess* proc = new TDEProcess( TQT_TQOBJECT(this) ); (*proc) << "gpgsm"; // must be in the PATH (*proc) << "--dump-keys"; (*proc) << mChain.front().primaryFingerprint(); - TQObject::connect( proc, TQT_SIGNAL( receivedStdout(KProcess *, char *, int) ), - this, TQT_SLOT( slotCollectStdout(KProcess *, char *, int) ) ); - TQObject::connect( proc, TQT_SIGNAL( receivedStderr(KProcess *, char *, int) ), - this, TQT_SLOT( slotCollectStderr(KProcess *, char *, int) ) ); - TQObject::connect( proc, TQT_SIGNAL( processExited(KProcess*) ), - this, TQT_SLOT( slotDumpProcessExited(KProcess*) ) ); + TQObject::connect( proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int) ), + this, TQT_SLOT( slotCollectStdout(TDEProcess *, char *, int) ) ); + TQObject::connect( proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int) ), + this, TQT_SLOT( slotCollectStderr(TDEProcess *, char *, int) ) ); + TQObject::connect( proc, TQT_SIGNAL( processExited(TDEProcess*) ), + this, TQT_SLOT( slotDumpProcessExited(TDEProcess*) ) ); - if ( !proc->start( KProcess::NotifyOnExit, (KProcess::Communication)(KProcess::Stdout | KProcess::Stderr) ) ) { + if ( !proc->start( TDEProcess::NotifyOnExit, (TDEProcess::Communication)(TDEProcess::Stdout | TDEProcess::Stderr) ) ) { TQString wmsg = i18n("Failed to execute gpgsm:\n%1").arg( i18n( "program not found" ) ); dumpView->setText( TQStyleSheet::escape( wmsg ) ); delete proc; } } -void CertificateInfoWidgetImpl::slotCollectStdout(KProcess *, char *buffer, int buflen) +void CertificateInfoWidgetImpl::slotCollectStdout(TDEProcess *, char *buffer, int buflen) { mDumpOutput += TQCString(buffer, buflen+1); // like KProcIO does } -void CertificateInfoWidgetImpl::slotCollectStderr(KProcess *, char *buffer, int buflen) +void CertificateInfoWidgetImpl::slotCollectStderr(TDEProcess *, char *buffer, int buflen) { mDumpError += TQCString(buffer, buflen+1); // like KProcIO does } -void CertificateInfoWidgetImpl::slotDumpProcessExited(KProcess* proc) { +void CertificateInfoWidgetImpl::slotDumpProcessExited(TDEProcess* proc) { int rc = ( proc->normalExit() ) ? proc->exitStatus() : -1 ; if ( rc == 0 ) { diff --git a/certmanager/certificateinfowidgetimpl.h b/certmanager/certificateinfowidgetimpl.h index fef55335..9536ddb3 100644 --- a/certmanager/certificateinfowidgetimpl.h +++ b/certmanager/certificateinfowidgetimpl.h @@ -39,7 +39,7 @@ #include -class KProcess; +class TDEProcess; class TQListViewItem; namespace GpgME { @@ -66,9 +66,9 @@ private slots: void slotNextKey( const GpgME::Key & key ); void slotKeyExistanceCheckNextCandidate( const GpgME::Key & key ); void slotKeyExistanceCheckFinished(); - void slotCollectStdout(KProcess *, char *, int); - void slotCollectStderr(KProcess *, char *, int); - void slotDumpProcessExited(KProcess*); + void slotCollectStdout(TDEProcess *, char *, int); + void slotCollectStderr(TDEProcess *, char *, int); + void slotDumpProcessExited(TDEProcess*); private: void startCertificateChainListing(); diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp index c8aab315..789f24b0 100644 --- a/certmanager/certificatewizardimpl.cpp +++ b/certmanager/certificatewizardimpl.cpp @@ -129,7 +129,7 @@ CertificateWizardImpl::CertificateWizardImpl( TQWidget* parent, const char* nam connect( storeUR, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( slotURLSelected( const TQString& ) ) ); - const KConfigGroup config( KGlobal::config(), "CertificateCreationWizard" ); + const KConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" ); caEmailED->setText( config.readEntry( "CAEmailAddress" ) ); connect( this, TQT_SIGNAL( helpClicked() ), @@ -337,7 +337,7 @@ void CertificateWizardImpl::createPersonalDataPage() TQGridLayout* grid = new TQGridLayout( edContainer, 2, 1, KDialog::marginHint(), KDialog::spacingHint() ); - KConfigGroup config( KGlobal::config(), "CertificateCreationWizard" ); + KConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" ); TQStringList attrOrder = config.readListEntry( "DNAttributeOrder" ); if ( attrOrder.empty() ) attrOrder << "CN!" << "L" << "OU" << "O!" << "C!" << "EMAIL!"; diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp index 2fd144d4..66f53fe1 100644 --- a/certmanager/certmanager.cpp +++ b/certmanager/certmanager.cpp @@ -930,10 +930,10 @@ bool CertManager::connectAndStartDirmngr( const char * slot, const char * proces assert( processname ); assert( mDirmngrProc ); mErrorbuffer = TQString(); - connect( mDirmngrProc, TQT_SIGNAL(processExited(KProcess*)), slot ); - connect( mDirmngrProc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int) ), - this, TQT_SLOT(slotStderr(KProcess*,char*,int)) ); - if( !mDirmngrProc->start( KProcess::NotifyOnExit, KProcess::Stderr ) ) { + connect( mDirmngrProc, TQT_SIGNAL(processExited(TDEProcess*)), slot ); + connect( mDirmngrProc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int) ), + this, TQT_SLOT(slotStderr(TDEProcess*,char*,int)) ); + if( !mDirmngrProc->start( TDEProcess::NotifyOnExit, TDEProcess::Stderr ) ) { delete mDirmngrProc; mDirmngrProc = 0; KMessageBox::error( this, i18n( "Unable to start %1 process. Please check your installation." ).arg( processname ), i18n( "Certificate Manager Error" ) ); return false; @@ -945,7 +945,7 @@ void CertManager::startImportCRL( const TQString& filename, bool isTempFile ) { assert( !mDirmngrProc ); mImportCRLTempFile = isTempFile ? filename : TQString(); - mDirmngrProc = new KProcess(); + mDirmngrProc = new TDEProcess(); *mDirmngrProc << "gpgsm" << "--call-dirmngr" << "loadcrl" << filename; if ( !connectAndStartDirmngr( TQT_SLOT(slotDirmngrExited()), "gpgsm" ) ) { updateImportActions( true ); @@ -956,13 +956,13 @@ void CertManager::startImportCRL( const TQString& filename, bool isTempFile ) void CertManager::startClearCRLs() { assert( !mDirmngrProc ); - mDirmngrProc = new KProcess(); + mDirmngrProc = new TDEProcess(); *mDirmngrProc << "dirmngr" << "--flush"; //*mDirmngrProc << "gpgsm" << "--call-dimngr" << "flush"; // use this once it's implemented! connectAndStartDirmngr( TQT_SLOT(slotClearCRLsResult()), "dirmngr" ); } -void CertManager::slotStderr( KProcess*, char* buf, int len ) { +void CertManager::slotStderr( TDEProcess*, char* buf, int len ) { mErrorbuffer += TQString::fromLocal8Bit( buf, len ); } @@ -1423,10 +1423,10 @@ void CertManager::importNextURLOrRedisplay() void CertManager::slotStartWatchGnuPG() { - KProcess certManagerProc; + TDEProcess certManagerProc; certManagerProc << "kwatchgnupg"; - if( !certManagerProc.start( KProcess::DontCare ) ) + if( !certManagerProc.start( TDEProcess::DontCare ) ) KMessageBox::error( this, i18n( "Could not start GnuPG LogViewer (kwatchgnupg). " "Please check your installation!" ), i18n( "Kleopatra Error" ) ); diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h index 8f992a00..835f408c 100644 --- a/certmanager/certmanager.h +++ b/certmanager/certmanager.h @@ -54,7 +54,7 @@ namespace Kleo { namespace KIO { class Job; } -class KProcess; +class TDEProcess; class KToolBar; class KAction; @@ -118,7 +118,7 @@ private slots: void slotImportCRLJobFinished( KIO::Job * ); void slotDirmngrExited(); - void slotStderr( KProcess*, char*, int ); + void slotStderr( TDEProcess*, char*, int ); void slotToggleRemote(int idx); void slotToggleHierarchicalView( bool ); @@ -182,7 +182,7 @@ private: Kleo::ProgressBar * mProgressBar; TQLabel * mStatusLabel; - KProcess * mDirmngrProc; + TDEProcess * mDirmngrProc; TQString mErrorbuffer; TQPtrList mItemsToDelete; KURL::List mURLsToImport; diff --git a/certmanager/conf/configuredialog.cpp b/certmanager/conf/configuredialog.cpp index db9c7739..57ed0ee4 100644 --- a/certmanager/conf/configuredialog.cpp +++ b/certmanager/conf/configuredialog.cpp @@ -52,7 +52,7 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal // the KCMultiDialog starts with the size of the first kcm, not // the largest one. This way at least after the first showing of // the largest kcm the size is kept. - const KConfigGroup geometry( KGlobal::config(), "Geometry" ); + const KConfigGroup geometry( TDEGlobal::config(), "Geometry" ); const int width = geometry.readNumEntry( "ConfigureDialogWidth" ); const int height = geometry.readNumEntry( "ConfigureDialogHeight" ); if ( width != 0 && height != 0 ) { @@ -62,7 +62,7 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal } void ConfigureDialog::hideEvent( TQHideEvent * ) { - KConfigGroup geometry( KGlobal::config(), "Geometry" ); + KConfigGroup geometry( TDEGlobal::config(), "Geometry" ); geometry.writeEntry( "ConfigureDialogWidth", width() ); geometry.writeEntry( "ConfigureDialogHeight",height() ); } diff --git a/certmanager/crlview.cpp b/certmanager/crlview.cpp index 3318f8dd..49c27d3e 100644 --- a/certmanager/crlview.cpp +++ b/certmanager/crlview.cpp @@ -57,7 +57,7 @@ CRLView::CRLView( TQWidget* parent, const char* name, bool modal ) topLayout->addWidget( new TQLabel( i18n("CRL cache dump:"), this ) ); _textView = new TQTextEdit( this ); - _textView->setFont( KGlobalSettings::fixedFont() ); + _textView->setFont( TDEGlobalSettings::fixedFont() ); _textView->setTextFormat( TQTextEdit::LogText ); topLayout->addWidget( _textView ); @@ -99,22 +99,22 @@ void CRLView::slotUpdateView() _textView->clear(); _buffer = TQString(); if( _process == 0 ) { - _process = new KProcess(); + _process = new TDEProcess(); *_process << "gpgsm" << "--call-dirmngr" << "listcrls"; - connect( _process, TQT_SIGNAL( receivedStdout( KProcess*, char*, int) ), - this, TQT_SLOT( slotReadStdout( KProcess*, char*, int ) ) ); - connect( _process, TQT_SIGNAL( processExited( KProcess* ) ), + connect( _process, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int) ), + this, TQT_SLOT( slotReadStdout( TDEProcess*, char*, int ) ) ); + connect( _process, TQT_SIGNAL( processExited( TDEProcess* ) ), this, TQT_SLOT( slotProcessExited() ) ); } if( _process->isRunning() ) _process->kill(); - if( !_process->start( KProcess::NotifyOnExit, KProcess::Stdout ) ) { + if( !_process->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ) ) { KMessageBox::error( this, i18n( "Unable to start gpgsm process. Please check your installation." ), i18n( "Certificate Manager Error" ) ); slotProcessExited(); } _timer->start( 1000 ); } -void CRLView::slotReadStdout( KProcess*, char* buf, int len) +void CRLView::slotReadStdout( TDEProcess*, char* buf, int len) { _buffer.append( TQString::fromUtf8( buf, len ) ); } diff --git a/certmanager/crlview.h b/certmanager/crlview.h index 3de715e2..eef97deb 100644 --- a/certmanager/crlview.h +++ b/certmanager/crlview.h @@ -38,7 +38,7 @@ class TQTextEdit; class TQPushButton; -class KProcess; +class TDEProcess; class TQTimer; class CRLView : public TQDialog { @@ -51,7 +51,7 @@ public slots: void slotUpdateView(); protected slots: - void slotReadStdout( KProcess*, char* buf, int len); + void slotReadStdout( TDEProcess*, char* buf, int len); void slotProcessExited(); void slotAppendBuffer(); @@ -62,7 +62,7 @@ private: TQTextEdit* _textView; TQPushButton* _updateButton; TQPushButton* _closeButton; - KProcess* _process; + TDEProcess* _process; TQTimer* _timer; TQString _buffer; }; diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp index c50796b4..24264319 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp +++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp @@ -69,7 +69,7 @@ KWatchGnuPGMainWindow::KWatchGnuPGMainWindow( TQWidget* parent, const char* name setCentralWidget( mCentralWidget ); mWatcher = new KProcIO( TQTextCodec::codecForMib( 106 /*utf-8*/ ) ); - connect( mWatcher, TQT_SIGNAL( processExited(KProcess*) ), + connect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ), this, TQT_SLOT( slotWatcherExited() ) ); connect( mWatcher, TQT_SIGNAL( readReady(KProcIO*) ), this, TQT_SLOT( slotReadStdout() ) ); @@ -127,7 +127,7 @@ void KWatchGnuPGMainWindow::slotConfigureToolbars() void KWatchGnuPGMainWindow::startWatcher() { - disconnect( mWatcher, TQT_SIGNAL( processExited(KProcess*) ), + disconnect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ), this, TQT_SLOT( slotWatcherExited() ) ); if( mWatcher->isRunning() ) { mWatcher->kill(); @@ -150,7 +150,7 @@ void KWatchGnuPGMainWindow::startWatcher() mCentralWidget->append( tqtr("[%1] Log started") .arg( TQDateTime::currentDateTime().toString(Qt::ISODate) ) ); } - connect( mWatcher, TQT_SIGNAL( processExited(KProcess*) ), + connect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ), this, TQT_SLOT( slotWatcherExited() ) ); } @@ -251,7 +251,7 @@ void KWatchGnuPGMainWindow::slotSaveAs() void KWatchGnuPGMainWindow::slotQuit() { - disconnect( mWatcher, TQT_SIGNAL( processExited(KProcess*) ), + disconnect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ), this, TQT_SLOT( slotWatcherExited() ) ); mWatcher->kill(); kapp->quit(); diff --git a/certmanager/kwatchgnupg/tray.cpp b/certmanager/kwatchgnupg/tray.cpp index f7740b2f..a8d2f587 100644 --- a/certmanager/kwatchgnupg/tray.cpp +++ b/certmanager/kwatchgnupg/tray.cpp @@ -44,7 +44,7 @@ KWatchGnuPGTray::KWatchGnuPGTray( KWatchGnuPGMainWindow* mainwin ) { kdDebug() << "KWatchGnuPGTray::KWatchGnuPGTray" << endl; - KGlobal::iconLoader()->addAppDir( "kwatchgnupg" ); + TDEGlobal::iconLoader()->addAppDir( "kwatchgnupg" ); mNormalPix = loadIcon("kwatchgnupg"); mAttentionPix = loadIcon("kwatchgnupg2"); diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp index edfe9be5..2154f7aa 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp @@ -110,8 +110,8 @@ GpgME::Error Kleo::ChiasmusJob::start() { if ( const GpgME::Error err = setup() ) return mError = err; - connect( mSymCryptRun, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(slotProcessExited(KProcess*)) ); + connect( mSymCryptRun, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); if ( !mSymCryptRun->launch( mInput ) ) return mError = gpg_error( GPG_ERR_ENOENT ); // what else? @@ -120,7 +120,7 @@ GpgME::Error Kleo::ChiasmusJob::start() { return mError = 0; } -GpgME::Error Kleo::ChiasmusJob::slotProcessExited( KProcess * proc ) { +GpgME::Error Kleo::ChiasmusJob::slotProcessExited( TDEProcess * proc ) { if ( proc != mSymCryptRun ) mError = gpg_error( GPG_ERR_INTERNAL ); else if ( mCanceled ) @@ -172,7 +172,7 @@ GpgME::Error Kleo::ChiasmusJob::exec() { if ( const GpgME::Error err = setup() ) return mError = err; - if ( !mSymCryptRun->launch( mInput, KProcess::Block ) ) { + if ( !mSymCryptRun->launch( mInput, TDEProcess::Block ) ) { delete mSymCryptRun; mSymCryptRun = 0; return mError = gpg_error( GPG_ERR_ENOENT ); // what else? } diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.h b/certmanager/lib/backends/chiasmus/chiasmusjob.h index a9e26a04..1ca6ba19 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusjob.h +++ b/certmanager/lib/backends/chiasmus/chiasmusjob.h @@ -40,7 +40,7 @@ #include -class KProcess; +class TDEProcess; namespace Kleo { @@ -91,7 +91,7 @@ namespace Kleo { void slotCancel(); private slots: - GpgME::Error slotProcessExited( KProcess * ); + GpgME::Error slotProcessExited( TDEProcess * ); void slotTimeout(); private: diff --git a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp index 231cf6ad..ec396537 100644 --- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp +++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp @@ -45,7 +45,7 @@ Kleo::SymCryptRunProcessBase::SymCryptRunProcessBase( const TQString & class_, c const TQString & keyFile, const TQString & options, Operation mode, TQObject * parent, const char * name ) - : KProcess( parent, name ), + : TDEProcess( parent, name ), mOperation( mode ), mOptions( options ) { *this << "symcryptrun" @@ -58,10 +58,10 @@ Kleo::SymCryptRunProcessBase::SymCryptRunProcessBase( const TQString & class_, c Kleo::SymCryptRunProcessBase::~SymCryptRunProcessBase() {} bool Kleo::SymCryptRunProcessBase::launch( const TQByteArray & input, RunMode rm ) { - connect( this, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), - this, TQT_SLOT(slotReceivedStdout(KProcess*,char*,int)) ); - connect( this, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), - this, TQT_SLOT(slotReceivedStderr(KProcess*,char*,int)) ); + connect( this, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)) ); + connect( this, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int)) ); if ( rm == Block ) { KTempFile tempfile; tempfile.setAutoDelete( true ); @@ -72,15 +72,15 @@ bool Kleo::SymCryptRunProcessBase::launch( const TQByteArray & input, RunMode rm tempfile.close(); *this << "--input" << tempfile.name(); addOptions(); - return KProcess::start( Block, All ); + return TDEProcess::start( Block, All ); } else { addOptions(); - const bool ok = KProcess::start( rm, All ); + const bool ok = TDEProcess::start( rm, All ); if ( !ok ) return ok; mInput = input.copy(); writeStdin( mInput.begin(), mInput.size() ); - connect( this, TQT_SIGNAL(wroteStdin(KProcess*)), this, TQT_SLOT(closeStdin()) ); + connect( this, TQT_SIGNAL(wroteStdin(TDEProcess*)), this, TQT_SLOT(closeStdin()) ); return true; } } @@ -93,14 +93,14 @@ void Kleo::SymCryptRunProcessBase::addOptions() { } } -void Kleo::SymCryptRunProcessBase::slotReceivedStdout( KProcess * proc, char * buf, int len ) { +void Kleo::SymCryptRunProcessBase::slotReceivedStdout( TDEProcess * proc, char * buf, int len ) { Q_ASSERT( proc == this ); const int oldsize = mOutput.size(); mOutput.resize( oldsize + len ); memcpy( mOutput.data() + oldsize, buf, len ); } -void Kleo::SymCryptRunProcessBase::slotReceivedStderr( KProcess * proc, char * buf, int len ) { +void Kleo::SymCryptRunProcessBase::slotReceivedStderr( TDEProcess * proc, char * buf, int len ) { Q_ASSERT( proc == this ); if ( len > 0 ) mStderr += TQString::fromLocal8Bit( buf, len ); diff --git a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h index 281b8553..36866e13 100644 --- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h +++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h @@ -41,7 +41,7 @@ class TQString; namespace Kleo { -class SymCryptRunProcessBase : public KProcess { +class SymCryptRunProcessBase : public TDEProcess { Q_OBJECT public: @@ -61,11 +61,11 @@ public: public slots: /*! upgraded to slot */ - void closeStdin() { KProcess::closeStdin(); } + void closeStdin() { TDEProcess::closeStdin(); } private slots: - void slotReceivedStdout( KProcess *, char *, int ); - void slotReceivedStderr( KProcess *, char *, int ); + void slotReceivedStdout( TDEProcess *, char *, int ); + void slotReceivedStderr( TDEProcess *, char *, int ); private: void addOptions(); diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp index 53142fad..bfd00ac9 100644 --- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp +++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp @@ -57,7 +57,7 @@ struct Kleo::GnuPGProcessBase::Private { Kleo::GnuPGProcessBase::GnuPGProcessBase( TQObject * parent, const char * name ) - : KProcess( parent, name ) + : TDEProcess( parent, name ) { d = new Private(); } @@ -76,7 +76,7 @@ bool Kleo::GnuPGProcessBase::start( RunMode runmode, Communication comm ) { // set up the status-fd. This should be in setupCommunication(), // but then it's too late: we need the fd of the pipe to pass it // as argument to the --status-fd option: - // PENDING(marc) find out why KProcess uses both pipe() and socketpair()... + // PENDING(marc) find out why TDEProcess uses both pipe() and socketpair()... if ( ::pipe( d->statusFD ) < 0 ) { kdDebug( 5150 ) << "Kleo::GnuPGProcessBase::start: pipe(2) failed: " << perror << endl; return false; @@ -94,11 +94,11 @@ bool Kleo::GnuPGProcessBase::start( RunMode runmode, Communication comm ) { //arguments.insert( it, "--enable-progress-filter" ); // gpgsm doesn't know this } } - return KProcess::start( runmode, comm ); + return TDEProcess::start( runmode, comm ); } int Kleo::GnuPGProcessBase::setupCommunication( Communication comm ) { - if ( int ok = KProcess::setupCommunication( comm ) ) + if ( int ok = TDEProcess::setupCommunication( comm ) ) return ok; if ( d->usetStatusFD ) { // base class impl returned error, so close our fd's, too @@ -115,13 +115,13 @@ int Kleo::GnuPGProcessBase::commSetupDoneP() { d->statnot = new TQSocketNotifier( d->statusFD[0], TQSocketNotifier::Read, this ); connect( d->statnot, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChildStatus(int)) ); } - return KProcess::commSetupDoneP(); + return TDEProcess::commSetupDoneP(); } int Kleo::GnuPGProcessBase::commSetupDoneC() { if ( d->usetStatusFD ) ::fcntl( d->statusFD[1], F_SETFD, 0 ); - return KProcess::commSetupDoneC(); + return TDEProcess::commSetupDoneC(); } void Kleo::GnuPGProcessBase::slotChildStatus( int fd ) { @@ -192,7 +192,7 @@ void Kleo::GnuPGProcessBase::parsetStatusOutput() { } void Kleo::GnuPGProcessBase::virtual_hook( int id, void * data ) { - KProcess::virtual_hook( id, data ); + TDEProcess::virtual_hook( id, data ); } #include "gnupgprocessbase.moc" diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h index 4f6dc4ad..528179a2 100644 --- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h +++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h @@ -40,12 +40,12 @@ namespace Kleo { /** * @short a base class for GPG and GPGSM processes. * - * This KProcess subclass implements the status-fd handling common + * This TDEProcess subclass implements the status-fd handling common * to GPG and GPGSM. * * @author Marc Mutz */ - class GnuPGProcessBase : public KProcess { + class GnuPGProcessBase : public TDEProcess { Q_OBJECT public: diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp index 053a8b92..191ff427 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp @@ -80,7 +80,7 @@ void QGpgMECryptoConfig::runGpgConf( bool showErrors ) // run the process: int rc = 0; - if ( !proc.start( KProcess::Block ) ) + if ( !proc.start( TDEProcess::Block ) ) rc = -1; else rc = ( proc.normalExit() ) ? proc.exitStatus() : -2 ; @@ -179,7 +179,7 @@ void QGpgMECryptoConfigComponent::runGpgConf() // run the process: int rc = 0; - if ( !proc.start( KProcess::Block ) ) + if ( !proc.start( TDEProcess::Block ) ) rc = -1; else rc = ( proc.normalExit() ) ? proc.exitStatus() : -1 ; @@ -280,20 +280,20 @@ void QGpgMECryptoConfigComponent::sync( bool runtime ) if ( runtime ) commandLine += " --runtime"; commandLine += " --change-options "; - commandLine += KProcess::quote( mName ); + commandLine += TDEProcess::quote( mName ); commandLine += " < "; - commandLine += KProcess::quote( tmpFile.name() ); + commandLine += TDEProcess::quote( tmpFile.name() ); //kdDebug(5150) << commandLine << endl; //system( TQCString( "cat " ) + tmpFile.name().latin1() ); // DEBUG - KProcess proc; + TDEProcess proc; proc.setUseShell( true ); proc << commandLine; // run the process: int rc = 0; - if ( !proc.start( KProcess::Block ) ) + if ( !proc.start( TDEProcess::Block ) ) rc = -1; else rc = ( proc.normalExit() ) ? proc.exitStatus() : -1 ; diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp index 16846b59..6d05e1ec 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp @@ -107,14 +107,14 @@ GpgME::Error Kleo::QGpgMERefreshKeysJob::startAProcess() { mProcess->setUsetStatusFD( true ); - connect( mProcess, TQT_SIGNAL(processExited(KProcess*)), - TQT_SLOT(slotProcessExited(KProcess*)) ); - connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), - TQT_SLOT(slotStderr(KProcess*,char*,int)) ); + connect( mProcess, TQT_SIGNAL(processExited(TDEProcess*)), + TQT_SLOT(slotProcessExited(TDEProcess*)) ); + connect( mProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + TQT_SLOT(slotStderr(TDEProcess*,char*,int)) ); connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); - if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::Stderr ) ) { + if ( !mProcess->start( TDEProcess::NotifyOnExit, TDEProcess::Stderr ) ) { mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else? deleteLater(); return mError; @@ -182,11 +182,11 @@ void Kleo::QGpgMERefreshKeysJob::slotStatus( GnuPGProcessBase * proc, const TQSt } } -void Kleo::QGpgMERefreshKeysJob::slotStderr( KProcess *, char *, int ) { +void Kleo::QGpgMERefreshKeysJob::slotStderr( TDEProcess *, char *, int ) { // implement? or not? } -void Kleo::QGpgMERefreshKeysJob::slotProcessExited( KProcess * proc ) { +void Kleo::QGpgMERefreshKeysJob::slotProcessExited( TDEProcess * proc ) { if ( proc != mProcess ) return; diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h index ebe871ce..ac160036 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h @@ -45,7 +45,7 @@ namespace GpgME { class Error; } -class KProcess; +class TDEProcess; namespace Kleo { @@ -64,8 +64,8 @@ namespace Kleo { void slotCancel(); void slotStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & ); - void slotStderr( KProcess *, char *, int ); - void slotProcessExited( KProcess * ); + void slotStderr( TDEProcess *, char *, int ); + void slotProcessExited( TDEProcess * ); private: GpgME::Error startAProcess(); diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp index f409df73..f553c703 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp @@ -88,16 +88,16 @@ GpgME::Error Kleo::QGpgMESecretKeyExportJob::start( const TQStringList & pattern mProcess->setUsetStatusFD( true ); - connect( mProcess, TQT_SIGNAL(processExited(KProcess*)), - TQT_SLOT(slotProcessExited(KProcess*)) ); - connect( mProcess, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), - TQT_SLOT(slotStdout(KProcess*,char*,int)) ); - connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), - TQT_SLOT(slotStderr(KProcess*,char*,int)) ); + connect( mProcess, TQT_SIGNAL(processExited(TDEProcess*)), + TQT_SLOT(slotProcessExited(TDEProcess*)) ); + connect( mProcess, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + TQT_SLOT(slotStdout(TDEProcess*,char*,int)) ); + connect( mProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + TQT_SLOT(slotStderr(TDEProcess*,char*,int)) ); connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); - if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { + if ( !mProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else? deleteLater(); return mError; @@ -165,7 +165,7 @@ void Kleo::QGpgMESecretKeyExportJob::slotStatus( GnuPGProcessBase * proc, const } } -void Kleo::QGpgMESecretKeyExportJob::slotStdout( KProcess * proc, char * buf, int buflen ) { +void Kleo::QGpgMESecretKeyExportJob::slotStdout( TDEProcess * proc, char * buf, int buflen ) { if ( proc != mProcess ) return; if ( buflen <= 0 ) @@ -177,11 +177,11 @@ void Kleo::QGpgMESecretKeyExportJob::slotStdout( KProcess * proc, char * buf, in memcpy( mKeyData.data() + oldlen, buf, buflen ); } -void Kleo::QGpgMESecretKeyExportJob::slotStderr( KProcess *, char *, int ) { +void Kleo::QGpgMESecretKeyExportJob::slotStderr( TDEProcess *, char *, int ) { // implement? or not? } -void Kleo::QGpgMESecretKeyExportJob::slotProcessExited( KProcess * proc ) { +void Kleo::QGpgMESecretKeyExportJob::slotProcessExited( TDEProcess * proc ) { if ( proc != mProcess ) return; diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h index 4c3c8b82..335fd770 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h @@ -50,7 +50,7 @@ namespace QGpgME { class TQByteArrayDataProvider; } -class KProcess; +class TDEProcess; namespace Kleo { @@ -69,9 +69,9 @@ namespace Kleo { void slotCancel(); void slotStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & ); - void slotStdout( KProcess *, char *, int ); - void slotStderr( KProcess *, char *, int ); - void slotProcessExited( KProcess * ); + void slotStdout( TDEProcess *, char *, int ); + void slotStderr( TDEProcess *, char *, int ); + void slotProcessExited( TDEProcess * ); private: GnuPGProcessBase * mProcess; diff --git a/certmanager/lib/tests/gnupgviewer.h b/certmanager/lib/tests/gnupgviewer.h index f5277473..9a310d49 100644 --- a/certmanager/lib/tests/gnupgviewer.h +++ b/certmanager/lib/tests/gnupgviewer.h @@ -39,7 +39,7 @@ namespace Kleo { class GnuPGProcessBase; } -class KProcess; +class TDEProcess; class TQStringList; class GnuPGViewer : public TQTextEdit { @@ -52,10 +52,10 @@ public: void setProcess( Kleo::GnuPGProcessBase * process ); private slots: - void slotStdout( KProcess *, char *, int ); - void slotStderr( KProcess *, char *, int ); + void slotStdout( TDEProcess *, char *, int ); + void slotStderr( TDEProcess *, char *, int ); void slotStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & ); - void slotProcessExited( KProcess * ); + void slotProcessExited( TDEProcess * ); private: Kleo::GnuPGProcessBase * mProcess; diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp index dd94b8d6..33267350 100644 --- a/certmanager/lib/tests/test_gnupgprocessbase.cpp +++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp @@ -62,12 +62,12 @@ void GnuPGViewer::setProcess( Kleo::GnuPGProcessBase * process ) { if ( !process ) return; mProcess = process; - connect( mProcess, TQT_SIGNAL(processExited(KProcess*)), - TQT_SLOT(slotProcessExited(KProcess*)) ); - connect( mProcess, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), - TQT_SLOT(slotStdout(KProcess*,char*,int)) ); - connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), - TQT_SLOT(slotStderr(KProcess*,char*,int)) ); + connect( mProcess, TQT_SIGNAL(processExited(TDEProcess*)), + TQT_SLOT(slotProcessExited(TDEProcess*)) ); + connect( mProcess, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + TQT_SLOT(slotStdout(TDEProcess*,char*,int)) ); + connect( mProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + TQT_SLOT(slotStderr(TDEProcess*,char*,int)) ); connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); } @@ -91,13 +91,13 @@ static TQString escape( TQString str ) { return str.replace( '&', "&" ).replace( '<', "<" ).replace( '>', ">" ); } -void GnuPGViewer::slotStdout( KProcess *, char * buffer, int buflen ) { +void GnuPGViewer::slotStdout( TDEProcess *, char * buffer, int buflen ) { const TQStringList l = split( buffer, buflen, mLastStdout ); for ( TQStringList::const_iterator it = l.begin() ; it != l.end() ; ++it ) append( "stdout: " + escape( *it ) ); } -void GnuPGViewer::slotStderr( KProcess *, char * buffer, int buflen ) { +void GnuPGViewer::slotStderr( TDEProcess *, char * buffer, int buflen ) { const TQStringList l = split( buffer, buflen, mLastStderr ); for ( TQStringList::const_iterator it = l.begin() ; it != l.end() ; ++it ) append( "stderr: " + escape( *it ) + "" ); @@ -105,7 +105,7 @@ void GnuPGViewer::slotStderr( KProcess *, char * buffer, int buflen ) { void GnuPGViewer::slotStatus( Kleo::GnuPGProcessBase *, const TQString & type, const TQStringList & args ) { append( "status: " + escape( type + ' ' + args.join( " " ) ) + "" ); } -void GnuPGViewer::slotProcessExited( KProcess * proc ) { +void GnuPGViewer::slotProcessExited( TDEProcess * proc ) { if ( !proc ) return; if ( proc->normalExit() ) @@ -135,7 +135,7 @@ int main( int argc, char** argv ) { app.setMainWidget( gv ); gv->show(); - gpg.start( KProcess::NotifyOnExit, KProcess::AllOutput ); + gpg.start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ); return app.exec(); } diff --git a/certmanager/lib/tests/test_keyselectiondialog.cpp b/certmanager/lib/tests/test_keyselectiondialog.cpp index e74c18d8..763a1637 100644 --- a/certmanager/lib/tests/test_keyselectiondialog.cpp +++ b/certmanager/lib/tests/test_keyselectiondialog.cpp @@ -48,7 +48,7 @@ int main( int argc, char ** argv ) { TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication app; - KGlobal::iconLoader()->addAppDir( "libkleopatra" ); + TDEGlobal::iconLoader()->addAppDir( "libkleopatra" ); Kleo::KeySelectionDialog dlg( "Kleo::KeySelectionDialog Test", "Please select a key:", diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp index 1fdbc9e0..cb6e37a8 100644 --- a/certmanager/lib/ui/cryptoconfigmodule.cpp +++ b/certmanager/lib/ui/cryptoconfigmodule.cpp @@ -58,7 +58,7 @@ using namespace Kleo; static inline TQPixmap loadIcon( TQString s ) { - return KGlobal::instance()->iconLoader() + return TDEGlobal::instance()->iconLoader() ->loadIcon( s.replace( TQRegExp( "[^a-zA-Z0-9_]" ), "_" ), KIcon::NoGroup, KIcon::SizeMedium ); } diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp index 3933b0a5..434699d0 100644 --- a/certmanager/lib/ui/keyapprovaldialog.cpp +++ b/certmanager/lib/ui/keyapprovaldialog.cpp @@ -189,7 +189,7 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector & recipients + 2; // don't make the dialog too large - const TQRect desk = KGlobalSettings::desktopGeometry( this ); + const TQRect desk = TDEGlobalSettings::desktopGeometry( this ); setInitialSize( TQSize( kMin( dialogWidth, 3 * desk.width() / 4 ), kMin( dialogHeight, 7 * desk.height() / 8 ) ) ); } diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp index 5bd858ff..35a97611 100644 --- a/certmanager/lib/ui/keyselectiondialog.cpp +++ b/certmanager/lib/ui/keyselectiondialog.cpp @@ -395,7 +395,7 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection TQLineEdit * le = new TQLineEdit( page ); le->setText( initialQuery ); TQToolButton *clearButton = new TQToolButton( page ); - clearButton->setIconSet( KGlobal::iconLoader()->loadIconSet( + clearButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet( TDEApplication::reverseLayout() ? "clear_left":"locationbar_erase", KIcon::Small, 0 ) ); hlay->addWidget( clearButton ); hlay->addWidget( new TQLabel( le, i18n("&Search for:"), page ) ); @@ -449,14 +449,14 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() ); TQSize dialogSize( 500, 400 ); - KConfigGroup dialogConfig( KGlobal::config(), "Key Selection Dialog" ); + KConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" ); dialogSize = dialogConfig.readSizeEntry( "Dialog size", &dialogSize ); resize( dialogSize ); } } Kleo::KeySelectionDialog::~KeySelectionDialog() { - KConfigGroup dialogConfig( KGlobal::config(), "Key Selection Dialog" ); + KConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" ); dialogConfig.writeEntry( "Dialog size", size() ); dialogConfig.sync(); } @@ -548,12 +548,12 @@ void Kleo::KeySelectionDialog::slotHelp() void Kleo::KeySelectionDialog::slotStartCertificateManager( const TQString &query ) { - KProcess certManagerProc; + TDEProcess certManagerProc; certManagerProc << "kleopatra"; if ( !query.isEmpty() ) certManagerProc << "--external" << "--query" << KURL::decode_string( query ); - if( !certManagerProc.start( KProcess::DontCare ) ) + if( !certManagerProc.start( TDEProcess::DontCare ) ) KMessageBox::error( this, i18n( "Could not start certificate manager; " "please check your installation." ), i18n( "Certificate Manager Error" ) ); diff --git a/certmanager/main.cpp b/certmanager/main.cpp index def899b7..f962e4ec 100644 --- a/certmanager/main.cpp +++ b/certmanager/main.cpp @@ -63,8 +63,8 @@ int main( int argc, char** argv ) TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); - KGlobal::locale()->insertCatalogue( "libkleopatra" ); - KGlobal::iconLoader()->addAppDir( "libkleopatra" ); + TDEGlobal::locale()->insertCatalogue( "libkleopatra" ); + TDEGlobal::iconLoader()->addAppDir( "libkleopatra" ); if( !Kleo::CryptoBackendFactory::instance()->smime() ) { KMessageBox::error(0, diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp index 3924f901..4e4b6e61 100644 --- a/kaddressbook/addresseditwidget.cpp +++ b/kaddressbook/addresseditwidget.cpp @@ -469,7 +469,7 @@ void AddressEditDialog::updateAddressEdits() mPreferredCheckBox->setChecked( a.type() & KABC::Address::Pref ); if ( a.isEmpty() ) - mCountryCombo->setCurrentText( KGlobal::locale()->twoAlphaToCountryName( KGlobal::locale()->country() ) ); + mCountryCombo->setCurrentText( TDEGlobal::locale()->twoAlphaToCountryName( TDEGlobal::locale()->country() ) ); mStreetTextEdit->setFocus(); diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index cceba545..b875c99a 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp @@ -157,7 +157,7 @@ void AddresseeEditorWidget::setupTab1() // Person icon label = new TQLabel( tab1 ); - label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, + label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, KIcon::SizeMedium ) ); layout->addMultiCellWidget( label, 0, 1, 0, 0 ); @@ -212,7 +212,7 @@ void AddresseeEditorWidget::setupTab1() ////////////////////////////////////// // Phone numbers (upper right) label = new TQLabel( tab1 ); - label->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", + label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop, KIcon::SizeMedium ) ); layout->addMultiCellWidget( label, 0, 1, 3, 3 ); @@ -226,7 +226,7 @@ void AddresseeEditorWidget::setupTab1() ////////////////////////////////////// // Addresses (lower left) label = new TQLabel( tab1 ); - label->setPixmap( KGlobal::iconLoader()->loadIcon( "kfm_home", KIcon::Desktop, + label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "kfm_home", KIcon::Desktop, KIcon::SizeMedium ) ); layout->addMultiCellWidget( label, 5, 6, 0, 0 ); @@ -237,7 +237,7 @@ void AddresseeEditorWidget::setupTab1() ////////////////////////////////////// // Email / Web (lower right) label = new TQLabel( tab1 ); - label->setPixmap( KGlobal::iconLoader()->loadIcon( "email", KIcon::Desktop, + label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "email", KIcon::Desktop, KIcon::SizeMedium ) ); layout->addMultiCellWidget( label, 5, 6, 3, 3 ); @@ -252,7 +252,7 @@ void AddresseeEditorWidget::setupTab1() TQHBoxLayout *homePageLayout = new TQHBoxLayout( 0, 11, 7 ); label = new TQLabel( tab1 ); - label->setPixmap( KGlobal::iconLoader()->loadIcon( "homepage", KIcon::Desktop, + label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "homepage", KIcon::Desktop, KIcon::SizeMedium ) ); homePageLayout->addWidget( label ); @@ -325,7 +325,7 @@ void AddresseeEditorWidget::setupTab2() // Department label = new TQLabel( tab2 ); - label->setPixmap( KGlobal::iconLoader()->loadIcon( "folder", KIcon::Desktop, + label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "folder", KIcon::Desktop, KIcon::SizeMedium ) ); layout->addMultiCellWidget( label, 0, 1, 0, 0 ); @@ -384,7 +384,7 @@ void AddresseeEditorWidget::setupTab2() // Personal info label = new TQLabel( tab2 ); - label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, + label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, KIcon::SizeMedium ) ); layout->addMultiCellWidget( label, 4, 5, 0, 0 ); @@ -484,7 +484,7 @@ void AddresseeEditorWidget::setupCustomFieldsTabs() { TQStringList activePages = KABPrefs::instance()->advancedCustomFields(); - const TQStringList list = KGlobal::dirs()->findAllResources( "data", "kaddressbook/contacteditorpages/*.ui", true, true ); + const TQStringList list = TDEGlobal::dirs()->findAllResources( "data", "kaddressbook/contacteditorpages/*.ui", true, true ); for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) { if ( activePages.find( (*it).mid( (*it).findRev('/') + 1 ) ) == activePages.end() ) continue; diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp index 2fbda71c..e1f23e66 100644 --- a/kaddressbook/common/locationmap.cpp +++ b/kaddressbook/common/locationmap.cpp @@ -72,7 +72,7 @@ TQString LocationMap::createUrl( const KABC::Address &addr ) %c country (in ISO format) */ - TQString urlTemplate = KABPrefs::instance()->locationMapURL().arg( KGlobal::locale()->country() ); + TQString urlTemplate = KABPrefs::instance()->locationMapURL().arg( TDEGlobal::locale()->country() ); if ( urlTemplate.isEmpty() ) { KMessageBox::error( 0, i18n( "No service provider available for map lookup!\nPlease add one in the configuration dialog." ) ); return TQString(); diff --git a/kaddressbook/distributionlistentryview.cpp b/kaddressbook/distributionlistentryview.cpp index 9d927a5d..3fc16142 100644 --- a/kaddressbook/distributionlistentryview.cpp +++ b/kaddressbook/distributionlistentryview.cpp @@ -105,7 +105,7 @@ void KAB::DistributionListEntryView::setEntry( const KPIM::DistributionList& lis TQPixmap pixmap; pixmap.convertFromImage( m_entry.addressee.photo().data() ); - m_imageLabel->setPixmap( pixmap.isNull() ? KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop ) : pixmap ); + m_imageLabel->setPixmap( pixmap.isNull() ? TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop ) : pixmap ); m_addresseeLabel->setText( i18n( "Formatted name, role, organization", "

%1

%2
%3

" ).arg( m_entry.addressee.formattedName(), m_entry.addressee.role(), m_entry.addressee.organization() ) ); m_distListLabel->setURL( m_list.name() ); m_distListLabel->setText( m_list.name() ); diff --git a/kaddressbook/editors/cryptowidget.cpp b/kaddressbook/editors/cryptowidget.cpp index 89d41ab3..f89a068e 100644 --- a/kaddressbook/editors/cryptowidget.cpp +++ b/kaddressbook/editors/cryptowidget.cpp @@ -54,8 +54,8 @@ extern "C" { CryptoWidgetFactory::CryptoWidgetFactory() { - KGlobal::locale()->insertCatalogue( "libkleopatra" ); - KGlobal::iconLoader()->addAppDir( "libkleopatra" ); + TDEGlobal::locale()->insertCatalogue( "libkleopatra" ); + TDEGlobal::iconLoader()->addAppDir( "libkleopatra" ); } TQString CryptoWidgetFactory::pageTitle() const diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp index d279cc01..c49deee6 100644 --- a/kaddressbook/features/distributionlistwidget.cpp +++ b/kaddressbook/features/distributionlistwidget.cpp @@ -221,7 +221,7 @@ DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *paren installEventFilter( catcher ); mContactView->installEventFilter( catcher ); - mContactView->restoreLayout( KGlobal::config(), "DistributionListViewColumns" ); + mContactView->restoreLayout( TDEGlobal::config(), "DistributionListViewColumns" ); KAcceleratorManager::manage( this ); } @@ -232,7 +232,7 @@ DistributionListWidget::~DistributionListWidget() delete mManager; #endif - mContactView->saveLayout( KGlobal::config(), "DistributionListViewColumns" ); + mContactView->saveLayout( TDEGlobal::config(), "DistributionListViewColumns" ); } void DistributionListWidget::save() diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp index 4972fd45..03e7f1f4 100644 --- a/kaddressbook/features/resourceselection.cpp +++ b/kaddressbook/features/resourceselection.cpp @@ -64,7 +64,7 @@ class ResourceItem : public TQCheckListItem mResourceIdentifier() { setOn( resource->isActive() ); - setPixmap( 0, KGlobal::iconLoader()->loadIcon( "contents", KIcon::Small ) ); + setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "contents", KIcon::Small ) ); mChecked = isOn(); } @@ -77,7 +77,7 @@ class ResourceItem : public TQCheckListItem { KPIM::ResourceABC* res = dynamic_cast( mResource ); setOn( res->subresourceActive( mResourceIdentifier ) ); - setPixmap( 0, KGlobal::iconLoader()->loadIcon( "contents", KIcon::Small ) ); + setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "contents", KIcon::Small ) ); mChecked = isOn(); } diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp index 000cc41d..8a275125 100644 --- a/kaddressbook/geowidget.cpp +++ b/kaddressbook/geowidget.cpp @@ -54,7 +54,7 @@ GeoWidget::GeoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name topLayout->setSpacing( KDialog::spacingHint() ); label = new TQLabel( this ); - label->setPixmap( KGlobal::iconLoader()->loadIcon( "package_network", + label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "package_network", KIcon::Desktop, KIcon::SizeMedium ) ); label->setAlignment( TQt::AlignTop ); topLayout->addMultiCellWidget( label, 0, 3, 0, 0 ); diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp index dd844499..bb206488 100644 --- a/kaddressbook/imagewidget.cpp +++ b/kaddressbook/imagewidget.cpp @@ -144,7 +144,7 @@ void ImageButton::startDrag() void ImageButton::updateGUI() { if ( mPicture.data().isNull() ) - setPixmap( KGlobal::iconLoader()->iconPath( "personal", KIcon::Desktop ) ); + setPixmap( TDEGlobal::iconLoader()->iconPath( "personal", KIcon::Desktop ) ); else setPixmap( mPicture.data() ); } @@ -208,7 +208,7 @@ void ImageButton::mouseMoveEvent( TQMouseEvent *event ) { if ( (event->state() & Qt::LeftButton) && (event->pos() - mDragStartPos).manhattanLength() > - KGlobalSettings::dndEventDelay() ) { + TDEGlobalSettings::dndEventDelay() ) { startDrag(); } } diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h index 021275d5..f3eddebb 100644 --- a/kaddressbook/interfaces/xxport.h +++ b/kaddressbook/interfaces/xxport.h @@ -47,7 +47,7 @@ class TDEApplication; class KDE_NO_EXPORT localXXPortFactory : public KAB::XXPortFactory { \ KAB::XXPort *xxportObject( KABC::AddressBook *ab, TQWidget *parent, const char *name ) \ { const char *cat = catalog; \ - if (cat) KGlobal::locale()->insertCatalogue(cat); \ + if (cat) TDEGlobal::locale()->insertCatalogue(cat); \ return new XXPortClass( ab, parent, name ); \ } \ }; \ diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp index 9ffe7375..88f55d31 100644 --- a/kaddressbook/kaddressbook_part.cpp +++ b/kaddressbook/kaddressbook_part.cpp @@ -56,7 +56,7 @@ KAddressbookPart::KAddressbookPart( TQWidget *parentWidget, const char *widgetNa TQVBoxLayout *topLayout = new TQVBoxLayout( canvas ); - KGlobal::iconLoader()->addAppDir( "kaddressbook" ); + TDEGlobal::iconLoader()->addAppDir( "kaddressbook" ); mCore = new KABCore( this, true, canvas ); mCore->restoreSettings(); diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp index a3dc9d99..081ab2a5 100644 --- a/kaddressbook/kaddressbookmain.cpp +++ b/kaddressbook/kaddressbookmain.cpp @@ -174,7 +174,7 @@ void KAddressBookMain::saveToProfile( const TQString& ) const void KAddressBookMain::configureToolbars() { - saveMainWindowSettings( KGlobal::config(), "MainWindow" ); + saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); KEditToolbar edit( factory() ); connect( &edit, TQT_SIGNAL( newToolbarConfig() ), @@ -186,7 +186,7 @@ void KAddressBookMain::configureToolbars() void KAddressBookMain::newToolbarConfig() { createGUI( "kaddressbookui.rc", false ); - applyMainWindowSettings( KGlobal::config(), "MainWindow" ); + applyMainWindowSettings( TDEGlobal::config(), "MainWindow" ); } #include "kaddressbookmain.moc" diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index bbed600e..e4c6e23d 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp @@ -171,7 +171,7 @@ void KABConfigWidget::restoreSettings() mFaxHook->setText( KABPrefs::instance()->faxHookApplication() ); mAddresseeWidget->restoreSettings(); mEditorCombo->setCurrentItem( KABPrefs::instance()->editorType() ); - mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().arg( KGlobal::locale()->country() ) ); + mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().arg( TDEGlobal::locale()->country() ) ); mLocationMapURL->lineEdit()->setCursorPosition( 0 ); KConfig config( "kabcrc", false, false ); diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp index 8cc428aa..0a76b6d2 100644 --- a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp +++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp @@ -72,6 +72,6 @@ TQString KCMKabCustomFields::applicationName() TQString KCMKabCustomFields::kabLocalDir() { TQStringList kabdirs = locateLocal("data", "kaddressbook/"); - return kabdirs.grep( TQRegExp( "^"+KGlobal::dirs()->localtdedir() ) ).first(); + return kabdirs.grep( TQRegExp( "^"+TDEGlobal::dirs()->localtdedir() ) ).first(); } diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp index 5a171e53..cf7b1d5f 100644 --- a/kaddressbook/ldapsearchdialog.cpp +++ b/kaddressbook/ldapsearchdialog.cpp @@ -573,7 +573,7 @@ KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQV if ( existing.isEmpty() ) { addr.setUid( TDEApplication::randomString( 10 ) ); - addr.setNote( i18n( "arguments are host name, datetime", "Imported from LDAP directory %1 on %2" ).arg( d->itemToServer[cli], KGlobal::locale()->formatDateTime( now ) ) ); + addr.setNote( i18n( "arguments are host name, datetime", "Imported from LDAP directory %1 on %2" ).arg( d->itemToServer[cli], TDEGlobal::locale()->formatDateTime( now ) ) ); addr.setResource( resource ); mCore->addressBook()->insertAddressee( addr ); TQString displayString; diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp index 0ff8da8c..805a20cc 100644 --- a/kaddressbook/main.cpp +++ b/kaddressbook/main.cpp @@ -121,7 +121,7 @@ int main( int argc, char *argv[] ) return 0; KAddressBookApp app; - KGlobal::locale()->insertCatalogue( "libtdepim" ); + TDEGlobal::locale()->insertCatalogue( "libtdepim" ); bool ret = app.exec(); while (KMainWindow::memberList->first()) diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp index a9c0b8d3..37766973 100644 --- a/kaddressbook/printing/detailledstyle.cpp +++ b/kaddressbook/printing/detailledstyle.cpp @@ -72,8 +72,8 @@ DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *parent, const char *na KConfig *config; TQFont font; bool kdeFonts; - TQFont standard = KGlobalSettings::generalFont(); - TQFont fixed = KGlobalSettings::fixedFont(); + TQFont standard = TDEGlobalSettings::generalFont(); + TQFont fixed = TDEGlobalSettings::fixedFont(); setPreview( "detailed-style.png" ); @@ -163,11 +163,11 @@ void DetailledPrintStyle::print( const KABC::Addressee::List &contacts, PrintPro } if ( mPageAppearance->cbStandardFonts->isChecked() ) { - TQFont standard = KGlobalSettings::generalFont(); + TQFont standard = TDEGlobalSettings::generalFont(); header = standard; headlines = standard; body = standard; - fixed = KGlobalSettings::fixedFont(); + fixed = TDEGlobalSettings::fixedFont(); comment = standard; } else { header.setFamily( mPageAppearance->kfcHeaderFont->currentText() ); diff --git a/kaddressbook/printing/kabentrypainter.cpp b/kaddressbook/printing/kabentrypainter.cpp index d7be5bd5..0bf45386 100644 --- a/kaddressbook/printing/kabentrypainter.cpp +++ b/kaddressbook/printing/kabentrypainter.cpp @@ -208,7 +208,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, // paint the birthday to the right: TQDateTime dt = addr.birthday(); if ( dt.isValid() ) { - line1 = KGlobal::locale()->formatDate( dt.date(), true ); + line1 = TDEGlobal::locale()->formatDate( dt.date(), true ); if ( !fake ) { // create a little (1/8) space on top of the letters: float ypos = y + ( (float)rect.height() ) * 0.125; diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp index 62f89d55..99ead813 100644 --- a/kaddressbook/printing/mikesstyle.cpp +++ b/kaddressbook/printing/mikesstyle.cpp @@ -205,7 +205,7 @@ void MikesStyle::paintTagLine( TQPainter &p, const TQFont &font ) TQFontMetrics fm( font ); TQString text = i18n( "Printed on %1 by KAddressBook (http://www.kde.org)" ) - .arg( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); + .arg( TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); p.setPen( TQt::black ); p.drawText( 0, fm.height(), text ); diff --git a/kaddressbook/soundwidget.cpp b/kaddressbook/soundwidget.cpp index d661a14e..ec412aa3 100644 --- a/kaddressbook/soundwidget.cpp +++ b/kaddressbook/soundwidget.cpp @@ -46,7 +46,7 @@ SoundWidget::SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *n KDialog::spacingHint() ); TQLabel *label = new TQLabel( this ); - label->setPixmap( KGlobal::iconLoader()->loadIcon( "multimedia", + label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "multimedia", KIcon::Desktop, KIcon::SizeMedium ) ); label->setAlignment( TQt::AlignTop ); topLayout->addMultiCellWidget( label, 0, 1, 0, 0 ); diff --git a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp index 3216ea73..7460ad80 100644 --- a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp +++ b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp @@ -48,7 +48,7 @@ extern "C" { ThumbCreator *new_creator() { - KGlobal::locale()->insertCatalogue( "kaddressbook" ); + TDEGlobal::locale()->insertCatalogue( "kaddressbook" ); return new VCard_LDIFCreator; } } @@ -238,7 +238,7 @@ bool VCard_LDIFCreator::createImageSmall() bool VCard_LDIFCreator::createImageBig() { - TQFont normalFont( KGlobalSettings::generalFont() ); + TQFont normalFont( TDEGlobalSettings::generalFont() ); TQFont titleFont( normalFont ); titleFont.setBold(true); // titleFont.setUnderline(true); diff --git a/kaddressbook/viewconfigurewidget.cpp b/kaddressbook/viewconfigurewidget.cpp index efefbd81..8278b2f1 100644 --- a/kaddressbook/viewconfigurewidget.cpp +++ b/kaddressbook/viewconfigurewidget.cpp @@ -48,7 +48,7 @@ ViewConfigureWidget::ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *paren // Add the first page, the attributes TQVBox *page = addPage( i18n( "Fields" ), TQString(), - KGlobal::iconLoader()->loadIcon( "view_detailed", + TDEGlobal::iconLoader()->loadIcon( "view_detailed", KIcon::Panel ) ); // Add the select fields page @@ -56,7 +56,7 @@ ViewConfigureWidget::ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *paren // Add the second page, the filter selection page = addPage( i18n( "Default Filter" ), TQString(), - KGlobal::iconLoader()->loadIcon( "filter", + TDEGlobal::iconLoader()->loadIcon( "filter", KIcon::Panel ) ); mFilterPage = new ViewConfigureFilterPage( page ); diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index aca8113f..3938c14a 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp @@ -497,7 +497,7 @@ void ViewManager::startDrag() } } - drag->setPixmap( KGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop ) ); + drag->setPixmap( TDEGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop ) ); drag->dragCopy(); } diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp index 9675cdc8..2979ee5d 100644 --- a/kaddressbook/views/cardview.cpp +++ b/kaddressbook/views/cardview.cpp @@ -1129,7 +1129,7 @@ void CardView::contentsMouseReleaseEvent( TQMouseEvent *e ) // Get the item at this position CardViewItem *item = itemAt( e->pos() ); - if ( item && KGlobalSettings::singleClick() ) + if ( item && TDEGlobalSettings::singleClick() ) emit executed( item ); } @@ -1142,7 +1142,7 @@ void CardView::contentsMouseDoubleClickEvent( TQMouseEvent *e ) if ( item ) d->mCurrentItem = item; - if ( item && !KGlobalSettings::singleClick() ) + if ( item && !TDEGlobalSettings::singleClick() ) emit executed(item); emit doubleClicked( item ); diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp index 2c815150..0ffc5e5d 100644 --- a/kaddressbook/views/configurecardviewdialog.cpp +++ b/kaddressbook/views/configurecardviewdialog.cpp @@ -91,7 +91,7 @@ void CardViewLookNFeelPage::restoreSettings( KConfig *config ) // colors cbEnableCustomColors->setChecked( config->readBoolEntry( "EnableCustomColors", false ) ); TQColor c; - c = KGlobalSettings::baseColor(); + c = TDEGlobalSettings::baseColor(); lbColors->insertItem( new ColorListItem( i18n("Background Color"), config->readColorEntry( "BackgroundColor", &c ) ) ); c = colorGroup().foreground(); diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp index ae9d6155..a8359884 100644 --- a/kaddressbook/views/configuretableviewdialog.cpp +++ b/kaddressbook/views/configuretableviewdialog.cpp @@ -46,7 +46,7 @@ ConfigureTableViewWidget::ConfigureTableViewWidget( KABC::AddressBook *ab, : ViewConfigureWidget( ab, parent, name ) { TQWidget *page = addPage( i18n( "Look & Feel" ), TQString(), - KGlobal::iconLoader()->loadIcon( "looknfeel", + TDEGlobal::iconLoader()->loadIcon( "looknfeel", KIcon::Panel ) ); mPage = new LookAndFeelPage( page ); diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index c59c47ee..fbd98f02 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/kaddressbook/views/contactlistview.cpp @@ -240,7 +240,7 @@ void ContactListViewItem::refresh() if ( (*it)->label() == KABC::Addressee::birthdayLabel() ) { TQDate date = mAddressee.birthday().date(); if ( date.isValid() ) - setText( i++, KGlobal::locale()->formatDate( date, true ) ); + setText( i++, TDEGlobal::locale()->formatDate( date, true ) ); else setText( i++, "" ); } else @@ -268,7 +268,7 @@ ContactListView::ContactListView(KAddressBookTableView *view, mSingleLine = false; mToolTips = true; mShowIM = true; - mAlternateColor = KGlobalSettings::alternateBackgroundColor(); + mAlternateColor = TDEGlobalSettings::alternateBackgroundColor(); setAlternateBackgroundEnabled(mABackground); setAcceptDrops( true ); diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp index d9c3aa2f..42e315c5 100644 --- a/kaddressbook/views/kaddressbookiconview.cpp +++ b/kaddressbook/views/kaddressbookiconview.cpp @@ -112,7 +112,7 @@ class AddresseeIconViewItem : public KIconViewItem setText( mAddressee.givenName() + " " + mAddressee.familyName() ); TQPixmap icon; - TQPixmap defaultIcon( KGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop ) ); + TQPixmap defaultIcon( TDEGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop ) ); KABC::Picture pic = mAddressee.photo(); if ( pic.data().isNull() ) pic = mAddressee.logo(); diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp index 78cdbf56..72882301 100644 --- a/kaddressbook/xxport/csvimportdialog.cpp +++ b/kaddressbook/xxport/csvimportdialog.cpp @@ -792,7 +792,7 @@ void CSVImportDialog::applyTemplate() TQStringList templates; // load all template files - TQStringList list = KGlobal::dirs()->findAllResources( "data" , TQString( kapp->name() ) + + TQStringList list = TDEGlobal::dirs()->findAllResources( "data" , TQString( kapp->name() ) + "/csv-templates/*.desktop", true, true ); for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it ) diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp index 309bb9b5..f5abefde 100644 --- a/kaddressbook/xxport/kde2_xxport.cpp +++ b/kaddressbook/xxport/kde2_xxport.cpp @@ -59,7 +59,7 @@ KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const if ( !result ) return KABC::AddresseeList(); - KProcess proc; + TDEProcess proc; if ( result == KMessageBox::Yes ) { proc << "kab2kabc"; @@ -70,7 +70,7 @@ KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const kdDebug(5720) << "KAddressBook::importKDE2(): Unknow return value." << endl; return KABC::AddresseeList(); } - proc.start( KProcess::Block ); + proc.start( TDEProcess::Block ); addressBook()->load(); diff --git a/kalarm/alarmlistview.cpp b/kalarm/alarmlistview.cpp index ed509816..bf90dd86 100644 --- a/kalarm/alarmlistview.cpp +++ b/kalarm/alarmlistview.cpp @@ -493,7 +493,7 @@ TQString AlarmListViewItem::alarmText(const KAEvent& event) const */ TQString AlarmListViewItem::alarmTimeText(const DateTime& dateTime) const { - KLocale* locale = KGlobal::locale(); + KLocale* locale = TDEGlobal::locale(); TQString dateTimeText = locale->formatDate(dateTime.date(), true); if (!dateTime.isDateOnly()) { diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp index 60430a63..b12a41cf 100644 --- a/kalarm/birthdaydlg.cpp +++ b/kalarm/birthdaydlg.cpp @@ -401,7 +401,7 @@ AddresseeItem::AddresseeItem(TQListView* parent, const TQString& name, const TQD mBirthday(birthday) { setText(NAME, name); - setText(BIRTHDAY, KGlobal::locale()->formatDate(mBirthday, true)); + setText(BIRTHDAY, TDEGlobal::locale()->formatDate(mBirthday, true)); mBirthdayOrder.sprintf("%04d%03d", mBirthday.year(), mBirthday.dayOfYear()); } diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp index e5dc5fa3..da43fdad 100644 --- a/kalarm/functions.cpp +++ b/kalarm/functions.cpp @@ -745,7 +745,7 @@ bool runProgram(const TQCString& program, const TQCString& windowName, TQCString */ bool readConfigWindowSize(const char* window, TQSize& result) { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup(TQString::fromLatin1(window)); TQWidget* desktop = TQT_TQWIDGET(TDEApplication::desktop()); TQSize s = TQSize(config->readNumEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), 0), @@ -762,7 +762,7 @@ bool readConfigWindowSize(const char* window, TQSize& result) */ void writeConfigWindowSize(const char* window, const TQSize& size) { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup(TQString::fromLatin1(window)); TQWidget* desktop = TQT_TQWIDGET(TDEApplication::desktop()); config->writeEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), size.width()); @@ -894,7 +894,7 @@ int localeFirstDayOfWeek() { static int firstDay = 0; if (!firstDay) - firstDay = KGlobal::locale()->weekStartDay(); + firstDay = TDEGlobal::locale()->weekStartDay(); return firstDay; } diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp index 3792a580..1d315e34 100644 --- a/kalarm/kalarmapp.cpp +++ b/kalarm/kalarmapp.cpp @@ -1697,7 +1697,7 @@ void* KAlarmApp::execAlarm(KAEvent& event, const KAAlarm& alarm, bool reschedule ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent& event, const KAAlarm* alarm, int flags) { kdDebug(5950) << "KAlarmApp::doShellCommand(" << command << ", " << event.id() << ")" << endl; - KProcess::Communication comms = KProcess::NoCommunication; + TDEProcess::Communication comms = TDEProcess::NoCommunication; TQString cmd; TQString tmpXtermFile; if (flags & ProcData::EXEC_IN_XTERM) @@ -1748,26 +1748,26 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent& else { cmd = command; - comms = KProcess::AllOutput; + comms = TDEProcess::AllOutput; } ShellProcess* proc = new ShellProcess(cmd); connect(proc, TQT_SIGNAL(shellExited(ShellProcess*)), TQT_SLOT(slotCommandExited(ShellProcess*))); TQGuardedPtr logproc = 0; - if (comms == KProcess::AllOutput && !event.logFile().isEmpty()) + if (comms == TDEProcess::AllOutput && !event.logFile().isEmpty()) { // Output is to be appended to a log file. // Set up a logging process to write the command's output to. - connect(proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), TQT_SLOT(slotCommandOutput(KProcess*,char*,int))); - connect(proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotCommandOutput(KProcess*,char*,int))); + connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotCommandOutput(TDEProcess*,char*,int))); + connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotCommandOutput(TDEProcess*,char*,int))); logproc = new ShellProcess(TQString::fromLatin1("cat >>%1").arg(event.logFile())); connect(logproc, TQT_SIGNAL(shellExited(ShellProcess*)), TQT_SLOT(slotLogProcExited(ShellProcess*))); - logproc->start(KProcess::Stdin); + logproc->start(TDEProcess::Stdin); TQCString heading; if (alarm && alarm->dateTime().isValid()) { TQString dateTime = alarm->dateTime().isDateOnly() - ? KGlobal::locale()->formatDate(alarm->dateTime().date(), true) - : KGlobal::locale()->formatDateTime(alarm->dateTime().dateTime()); + ? TDEGlobal::locale()->formatDate(alarm->dateTime().date(), true) + : TDEGlobal::locale()->formatDateTime(alarm->dateTime().dateTime()); heading.sprintf("\n******* KAlarm %s *******\n", dateTime.latin1()); } else @@ -1822,7 +1822,7 @@ TQString KAlarmApp::createTempScriptFile(const TQString& command, bool insertShe /****************************************************************************** * Called when an executing command alarm sends output to stdout or stderr. */ -void KAlarmApp::slotCommandOutput(KProcess* proc, char* buffer, int bufflen) +void KAlarmApp::slotCommandOutput(TDEProcess* proc, char* buffer, int bufflen) { //kdDebug(5950) << "KAlarmApp::slotCommandOutput(): '" << TQCString(buffer, bufflen+1) << "'\n"; // Find this command in the command list diff --git a/kalarm/kalarmapp.h b/kalarm/kalarmapp.h index 22e51324..852143ed 100644 --- a/kalarm/kalarmapp.h +++ b/kalarm/kalarmapp.h @@ -29,7 +29,7 @@ class TQDateTime; #include #include -class KProcess; +class TDEProcess; namespace KCal { class Event; } #include "alarmevent.h" @@ -99,7 +99,7 @@ class KAlarmApp : public KUniqueApplication private slots: void quitFatal(); void slotPreferencesChanged(); - void slotCommandOutput(KProcess*, char* buffer, int bufflen); + void slotCommandOutput(TDEProcess*, char* buffer, int bufflen); void slotLogProcExited(ShellProcess*); void slotCommandExited(ShellProcess*); void slotSystemTrayTimer(); diff --git a/kalarm/kalarmd/adconfigdata.cpp b/kalarm/kalarmd/adconfigdata.cpp index 06ee4597..e6211076 100644 --- a/kalarm/kalarmd/adconfigdata.cpp +++ b/kalarm/kalarmd/adconfigdata.cpp @@ -48,7 +48,7 @@ void ADConfigData::readConfig() { kdDebug(5900) << "ADConfigData::readConfig()" << endl; ClientInfo::clear(); - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); TQStringList clients = config->groupList().grep(CLIENT_GROUP_SEARCH); for (TQStringList::Iterator cl = clients.begin(); cl != clients.end(); ++cl) { @@ -101,7 +101,7 @@ void ADConfigData::readConfig() */ void ADConfigData::writeClient(const TQCString& appName, const ClientInfo* cinfo) { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup(CLIENT_GROUP + TQString::fromLocal8Bit(appName)); config->writeEntry(TITLE_KEY, cinfo->title()); config->writeEntry(DCOP_OBJECT_KEY, TQString(TQString::fromLocal8Bit(cinfo->dcopObject()))); @@ -115,7 +115,7 @@ void ADConfigData::writeClient(const TQCString& appName, const ClientInfo* cinfo */ void ADConfigData::removeClient(const TQCString& appName) { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->deleteGroup(CLIENT_GROUP + TQString::fromLocal8Bit(appName)); config->sync(); } @@ -125,7 +125,7 @@ void ADConfigData::removeClient(const TQCString& appName) */ void ADConfigData::setCalendar(const TQCString& appName, ADCalendar* cal) { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup(CLIENT_GROUP + TQString::fromLocal8Bit(appName)); config->writePathEntry(CALENDAR_KEY, cal->urlString()); config->sync(); @@ -137,7 +137,7 @@ void ADConfigData::setCalendar(const TQCString& appName, ADCalendar* cal) void ADConfigData::enableAutoStart(bool on) { kdDebug(5900) << "ADConfigData::enableAutoStart(" << on << ")\n"; - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->reparseConfiguration(); config->setGroup(TQString::fromLatin1(DAEMON_AUTOSTART_SECTION)); config->writeEntry(TQString::fromLatin1(DAEMON_AUTOSTART_KEY), on); diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp index e1bbe0bb..8fd34b11 100644 --- a/kalarm/kalarmd/alarmdaemon.cpp +++ b/kalarm/kalarmd/alarmdaemon.cpp @@ -503,7 +503,7 @@ bool AlarmDaemon::notifyEvent(ADCalendar* calendar, const TQString& eventID) } // Start KAlarm, using the command line to specify the alarm - KProcess p; + TDEProcess p; TQString cmd = locate("exe", appname); if (cmd.isEmpty()) { @@ -512,7 +512,7 @@ bool AlarmDaemon::notifyEvent(ADCalendar* calendar, const TQString& eventID) } p << cmd; p << "--handleEvent" << id << "--calendarURL" << calendar->urlString(); - p.start(KProcess::DontCare); + p.start(TDEProcess::DontCare); kdDebug(5900) << "AlarmDaemon::notifyEvent(): used command line" << endl; return true; } diff --git a/kalarm/lib/dateedit.cpp b/kalarm/lib/dateedit.cpp index 2fef25de..09712bed 100644 --- a/kalarm/lib/dateedit.cpp +++ b/kalarm/lib/dateedit.cpp @@ -80,7 +80,7 @@ void DateEdit::pastLimitMessage(const TQDate& limit, const TQString& error, cons if (limit == TQDate::currentDate()) errString = i18n("today"); else - errString = KGlobal::locale()->formatDate(limit, true); + errString = TDEGlobal::locale()->formatDate(limit, true); errString = defaultError.arg(errString); } KMessageBox::sorry(this, errString); diff --git a/kalarm/lib/datetime.cpp b/kalarm/lib/datetime.cpp index e9dae414..bc6e6439 100644 --- a/kalarm/lib/datetime.cpp +++ b/kalarm/lib/datetime.cpp @@ -39,9 +39,9 @@ TQDateTime DateTime::dateTime() const TQString DateTime::formatLocale(bool shortFormat) const { if (mDateOnly) - return KGlobal::locale()->formatDate(mDateTime.date(), shortFormat); + return TDEGlobal::locale()->formatDate(mDateTime.date(), shortFormat); else if (mTimeValid) - return KGlobal::locale()->formatDateTime(mDateTime, shortFormat); + return TDEGlobal::locale()->formatDateTime(mDateTime, shortFormat); else return TQString(); } diff --git a/kalarm/lib/lineedit.cpp b/kalarm/lib/lineedit.cpp index 6b5787eb..1db384d3 100644 --- a/kalarm/lib/lineedit.cpp +++ b/kalarm/lib/lineedit.cpp @@ -61,14 +61,14 @@ void LineEdit::init() { if (mType == Url) { - setCompletionMode(KGlobalSettings::CompletionShell); + setCompletionMode(TDEGlobalSettings::CompletionShell); KURLCompletion* comp = new KURLCompletion(KURLCompletion::FileCompletion); comp->setReplaceHome(true); setCompletionObject(comp); setAutoDeleteCompletionObject(true); } else - setCompletionMode(KGlobalSettings::CompletionNone); + setCompletionMode(TDEGlobalSettings::CompletionNone); } /****************************************************************************** diff --git a/kalarm/lib/messagebox.cpp b/kalarm/lib/messagebox.cpp index 48c18f1c..c58287be 100644 --- a/kalarm/lib/messagebox.cpp +++ b/kalarm/lib/messagebox.cpp @@ -108,7 +108,7 @@ bool MessageBox::setDefaultShouldBeShownContinue(const TQString& dontShowAgainNa if (dontShowAgainName.isEmpty()) return false; // First check whether there is an existing setting - KConfig* config = mConfig ? mConfig : KGlobal::config(); + KConfig* config = mConfig ? mConfig : TDEGlobal::config(); config->setGroup(TQString::fromLatin1("Notification Messages")); if (config->hasKey(dontShowAgainName)) return false; @@ -167,7 +167,7 @@ void MessageBox::saveDontShowAgain(const TQString& dontShowAgainName, bool yesno { if (dontShowAgainName.isEmpty()) return; - KConfig* config = mConfig ? mConfig : KGlobal::config(); + KConfig* config = mConfig ? mConfig : TDEGlobal::config(); config->setGroup(TQString::fromLatin1("Notification Messages")); bool global = (dontShowAgainName[0] == ':'); if (yesno) diff --git a/kalarm/lib/shellprocess.cpp b/kalarm/lib/shellprocess.cpp index b3df822e..94666d53 100644 --- a/kalarm/lib/shellprocess.cpp +++ b/kalarm/lib/shellprocess.cpp @@ -56,9 +56,9 @@ bool ShellProcess::start(Communication comm) return false; } KShellProcess::operator<<(mCommand); - connect(this, TQT_SIGNAL(wroteStdin(KProcess*)), TQT_SLOT(writtenStdin(KProcess*))); - connect(this, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotExited(KProcess*))); - if (!KShellProcess::start(KProcess::NotifyOnExit, comm)) + connect(this, TQT_SIGNAL(wroteStdin(TDEProcess*)), TQT_SLOT(writtenStdin(TDEProcess*))); + connect(this, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotExited(TDEProcess*))); + if (!KShellProcess::start(TDEProcess::NotifyOnExit, comm)) { mStatus = START_FAIL; return false; @@ -72,7 +72,7 @@ bool ShellProcess::start(Communication comm) * Interprets the exit status according to which shell was called, and emits * a shellExited() signal. */ -void ShellProcess::slotExited(KProcess* proc) +void ShellProcess::slotExited(TDEProcess* proc) { kdDebug(5950) << "ShellProcess::slotExited()\n"; mStdinQueue.clear(); @@ -105,7 +105,7 @@ void ShellProcess::writeStdin(const char* buffer, int bufflen) bool write = mStdinQueue.isEmpty(); mStdinQueue.append(scopy); if (write) - KProcess::writeStdin(mStdinQueue.first(), mStdinQueue.first().length()); + TDEProcess::writeStdin(mStdinQueue.first(), mStdinQueue.first().length()); } /****************************************************************************** @@ -114,7 +114,7 @@ void ShellProcess::writeStdin(const char* buffer, int bufflen) * Note that buffers written to STDIN must not be freed until the writtenStdin() * signal has been processed. */ -void ShellProcess::writtenStdin(KProcess* proc) +void ShellProcess::writtenStdin(TDEProcess* proc) { mStdinQueue.pop_front(); // free the buffer which has now been written if (!mStdinQueue.isEmpty()) diff --git a/kalarm/lib/shellprocess.h b/kalarm/lib/shellprocess.h index 8c577d85..3b198028 100644 --- a/kalarm/lib/shellprocess.h +++ b/kalarm/lib/shellprocess.h @@ -116,8 +116,8 @@ class ShellProcess : public KShellProcess void shellExited(ShellProcess*); private slots: - void writtenStdin(KProcess*); - void slotExited(KProcess*); + void writtenStdin(TDEProcess*); + void slotExited(TDEProcess*); private: // Prohibit the following inherited methods diff --git a/kalarm/lib/timeedit.cpp b/kalarm/lib/timeedit.cpp index 01152fce..67a846d7 100644 --- a/kalarm/lib/timeedit.cpp +++ b/kalarm/lib/timeedit.cpp @@ -35,7 +35,7 @@ TimeEdit::TimeEdit(TQWidget* parent, const char* name) mPmIndex(-1), mReadOnly(false) { - bool use12hour = KGlobal::locale()->use12Clock(); + bool use12hour = TDEGlobal::locale()->use12Clock(); mSpinBox = new TimeSpinBox(!use12hour, this); mSpinBox->setFixedSize(mSpinBox->sizeHint()); connect(mSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int))); @@ -174,7 +174,7 @@ void TimeEdit::setAmPmCombo(int am, int pm) { // Insert "am" mAmIndex = 0; - mAmPm->insertItem(KGlobal::locale()->translate("am"), mAmIndex); + mAmPm->insertItem(TDEGlobal::locale()->translate("am"), mAmIndex); if (mPmIndex >= 0) mPmIndex = 1; mAmPm->setCurrentItem(mPmIndex >= 0 ? mPmIndex : mAmIndex); @@ -193,7 +193,7 @@ void TimeEdit::setAmPmCombo(int am, int pm) { // Insert "pm" mPmIndex = mAmIndex + 1; - mAmPm->insertItem(KGlobal::locale()->translate("pm"), mPmIndex); + mAmPm->insertItem(TDEGlobal::locale()->translate("pm"), mPmIndex); if (mAmIndex < 0) mAmPm->setCurrentItem(mPmIndex); } diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp index e9445d43..e4462db5 100644 --- a/kalarm/mainwindow.cpp +++ b/kalarm/mainwindow.cpp @@ -125,7 +125,7 @@ MainWindow::MainWindow(bool restored) kdDebug(5950) << "MainWindow::MainWindow()\n"; setAutoSaveSettings(TQString::fromLatin1(WINDOW_NAME)); // save window sizes etc. setPlainCaption(kapp->aboutData()->programName()); - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup(VIEW_GROUP); mShowExpired = config->readBoolEntry(SHOW_ARCHIVED_KEY, false); mShowTime = config->readBoolEntry(SHOW_TIME_KEY, true); @@ -190,8 +190,8 @@ MainWindow::~MainWindow() KAlarm::writeConfigWindowSize(WINDOW_NAME, main->size()); KToolBar* tb = toolBar(); if (tb) - tb->saveSettings(KGlobal::config(), "Toolbars"); - KGlobal::config()->sync(); // save any new window size to disc + tb->saveSettings(TDEGlobal::config(), "Toolbars"); + TDEGlobal::config()->sync(); // save any new window size to disc theApp()->quitIf(); } @@ -314,7 +314,7 @@ void MainWindow::hideEvent(TQHideEvent* he) */ void MainWindow::columnsReordered() { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup(TQString::fromLatin1(WINDOW_NAME)); config->writeEntry(TQString::fromLatin1("ColumnOrder"), mListView->columnOrder()); config->sync(); @@ -412,7 +412,7 @@ void MainWindow::initActions() KToolBar* tb = toolBar(); if (tb) - tb->applySettings(KGlobal::config(), "Toolbars"); + tb->applySettings(TDEGlobal::config(), "Toolbars"); Undo::emitChanged(); // set the Undo/Redo menu texts Daemon::checkStatus(); @@ -792,7 +792,7 @@ void MainWindow::slotShowTime() else { mListView->selectTimeColumns(mShowTime, mShowTimeTo); - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup(VIEW_GROUP); config->writeEntry(SHOW_TIME_KEY, mShowTime); config->writeEntry(SHOW_TIME_TO_KEY, mShowTimeTo); @@ -811,7 +811,7 @@ void MainWindow::slotShowTimeTo() else { mListView->selectTimeColumns(mShowTime, mShowTimeTo); - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup(VIEW_GROUP); config->writeEntry(SHOW_TIME_KEY, mShowTime); config->writeEntry(SHOW_TIME_TO_KEY, mShowTimeTo); @@ -829,7 +829,7 @@ void MainWindow::slotShowExpired() mActionShowExpired->setToolTip(mShowExpired ? i18n_HideExpiredAlarms() : i18n_ShowExpiredAlarms()); mListView->showExpired(mShowExpired); mListView->refresh(); - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup(VIEW_GROUP); config->writeEntry(SHOW_ARCHIVED_KEY, mShowExpired); } @@ -1086,7 +1086,7 @@ void MainWindow::slotConfigureKeys() */ void MainWindow::slotConfigureToolbar() { - saveMainWindowSettings(KGlobal::config(), WINDOW_NAME); + saveMainWindowSettings(TDEGlobal::config(), WINDOW_NAME); KEditToolbar dlg(factory()); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_TQOBJECT(this), TQT_SLOT(slotNewToolbarConfig())); dlg.exec(); @@ -1099,7 +1099,7 @@ void MainWindow::slotConfigureToolbar() void MainWindow::slotNewToolbarConfig() { createGUI(UI_FILE); - applyMainWindowSettings(KGlobal::config(), WINDOW_NAME); + applyMainWindowSettings(TDEGlobal::config(), WINDOW_NAME); } /****************************************************************************** @@ -1258,7 +1258,7 @@ void MainWindow::executeDropEvent(MainWindow* win, TQDropEvent* e) dt.setTime_t(summary.date()); TQString body = KAMail::getMailBody(summary.serialNumber()); alarmText.setEmail(summary.to(), summary.from(), TQString(), - KGlobal::locale()->formatDateTime(dt), summary.subject(), + TDEGlobal::locale()->formatDateTime(dt), summary.subject(), body, summary.serialNumber()); } else if (KCal::ICalDrag::decode(e, &calendar)) diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp index 2c9ac63e..3e63853e 100644 --- a/kalarm/messagewin.cpp +++ b/kalarm/messagewin.cpp @@ -310,8 +310,8 @@ void MessageWin::initView() // Alarm date/time TQLabel* label = new TQLabel(frame ? frame : topWidget); label->setText(mDateTime.isDateOnly() - ? KGlobal::locale()->formatDate(mDateTime.date(), true) - : KGlobal::locale()->formatDateTime(mDateTime.dateTime())); + ? TDEGlobal::locale()->formatDate(mDateTime.date(), true) + : TDEGlobal::locale()->formatDateTime(mDateTime.dateTime())); if (!frame) label->setFrameStyle(TQFrame::Box | TQFrame::Raised); label->setFixedSize(label->sizeHint()); diff --git a/kalarm/preferences.cpp b/kalarm/preferences.cpp index 3daf433f..c77c72f1 100644 --- a/kalarm/preferences.cpp +++ b/kalarm/preferences.cpp @@ -214,7 +214,7 @@ void Preferences::initialise() { // Initialise static variables here to avoid static initialisation // sequencing errors. - mDefault_messageFont = TQFont(KGlobalSettings::generalFont().family(), 16, TQFont::Bold); + mDefault_messageFont = TQFont(TDEGlobalSettings::generalFont().family(), 16, TQFont::Bold); mInstance = new Preferences; @@ -252,7 +252,7 @@ void Preferences::read() { initialise(); - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup(GENERAL_SECTION); TQStringList cols = config->readListEntry(MESSAGE_COLOURS); if (!cols.count()) @@ -358,7 +358,7 @@ void Preferences::read() */ void Preferences::save(bool syncToDisc) { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup(GENERAL_SECTION); config->writeEntry(VERSION_NUM, KALARM_VERSION); TQStringList colours; @@ -428,12 +428,12 @@ void Preferences::save(bool syncToDisc) void Preferences::syncToDisc() { - KGlobal::config()->sync(); + TDEGlobal::config()->sync(); } void Preferences::updateStartOfDayCheck() { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup(GENERAL_SECTION); config->writeEntry(START_OF_DAY_CHECK, startOfDayCheck()); config->sync(); @@ -549,7 +549,7 @@ bool Preferences::notifying(const TQString& messageID) */ void Preferences::convertOldPrefs() { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup(GENERAL_SECTION); int version = KAlarm::getVersionNumber(config->readEntry(VERSION_NUM)); if (version >= KAlarm::Version(1,4,22)) diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp index 216c1f47..cfda8fc2 100644 --- a/kalarm/recurrenceedit.cpp +++ b/kalarm/recurrenceedit.cpp @@ -563,7 +563,7 @@ void RecurrenceEdit::addException() if (insert) { mExceptionDates.insert(it, date); - mExceptionDateList->insertItem(KGlobal::locale()->formatDate(date), index); + mExceptionDateList->insertItem(TDEGlobal::locale()->formatDate(date), index); } mExceptionDateList->setCurrentItem(index); enableExceptionButtons(); @@ -856,7 +856,7 @@ void RecurrenceEdit::set(const KAEvent& event, bool keepDuration) qHeapSort(mExceptionDates); mExceptionDateList->clear(); for (DateList::ConstIterator it = mExceptionDates.begin(); it != mExceptionDates.end(); ++it) - mExceptionDateList->insertItem(KGlobal::locale()->formatDate(*it)); + mExceptionDateList->insertItem(TDEGlobal::locale()->formatDate(*it)); enableExceptionButtons(); // Get repetition within recurrence @@ -1124,7 +1124,7 @@ DayWeekRule::DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis // Save the first day of the week, just in case it changes while the dialog is open. TQWidget* box = new TQWidget(this); // this is to control the TQWhatsThis text display area TQGridLayout* dgrid = new TQGridLayout(box, 4, 2, 0, KDialog::spacingHint()); - const KCalendarSystem* calendar = KGlobal::locale()->calendar(); + const KCalendarSystem* calendar = TDEGlobal::locale()->calendar(); for (int i = 0; i < 7; ++i) { int day = KAlarm::localeDayInWeek_to_weekDay(i); @@ -1314,7 +1314,7 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats mPosButton->setFocusWidget(mWeekCombo); mDayOfWeekCombo = new ComboBox(false, box); - const KCalendarSystem* calendar = KGlobal::locale()->calendar(); + const KCalendarSystem* calendar = TDEGlobal::locale()->calendar(); for (int i = 0; i < 7; ++i) { int day = KAlarm::localeDayInWeek_to_weekDay(i); @@ -1465,7 +1465,7 @@ YearlyRule::YearlyRule(bool readOnly, TQWidget* parent, const char* name) TQWidget* w = new TQWidget(this); // this is to control the TQWhatsThis text display area hlayout->addWidget(w, 1, TQt::AlignAuto); TQGridLayout* grid = new TQGridLayout(w, 4, 3, 0, KDialog::spacingHint()); - const KCalendarSystem* calendar = KGlobal::locale()->calendar(); + const KCalendarSystem* calendar = TDEGlobal::locale()->calendar(); int year = TQDate::currentDate().year(); for (int i = 0; i < 12; ++i) { diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp index b02e9fc2..bb89711a 100644 --- a/kalarm/sounddlg.cpp +++ b/kalarm/sounddlg.cpp @@ -413,7 +413,7 @@ bool SoundDlg::checkFile() { // It's a relative path. // Find the first sound resource that contains files. - TQStringList soundDirs = KGlobal::dirs()->resourceDirs("sound"); + TQStringList soundDirs = TDEGlobal::dirs()->resourceDirs("sound"); if (!soundDirs.isEmpty()) { TQDir dir; diff --git a/kalarm/soundpicker.cpp b/kalarm/soundpicker.cpp index 3a3d1760..00f31893 100644 --- a/kalarm/soundpicker.cpp +++ b/kalarm/soundpicker.cpp @@ -279,7 +279,7 @@ TQString SoundPicker::browseFile(TQString& defaultDir, const TQString& initialFi if (defaultDir.isEmpty()) { if (kdeSoundDir.isNull()) - kdeSoundDir = KGlobal::dirs()->findResourceDir("sound", "KDE_Notify.wav"); + kdeSoundDir = TDEGlobal::dirs()->findResourceDir("sound", "KDE_Notify.wav"); defaultDir = kdeSoundDir; } #ifdef WITHOUT_ARTS diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp index 62c93f6e..58e8232c 100644 --- a/kalarm/traywindow.cpp +++ b/kalarm/traywindow.cpp @@ -253,7 +253,7 @@ void TrayWindow::tooltipAlarmText(TQString& text) const bool space = false; if (Preferences::showTooltipAlarmTime()) { - item.text += KGlobal::locale()->formatTime(item.dateTime.time()); + item.text += TDEGlobal::locale()->formatTime(item.dateTime.time()); item.text += ' '; space = true; } diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp index 512f1550..6fb5fc2a 100644 --- a/kandy/src/kandy.cpp +++ b/kandy/src/kandy.cpp @@ -88,7 +88,7 @@ Kandy::Kandy(CommandScheduler *scheduler) connect(mView,TQT_SIGNAL(modifiedChanged(bool)),TQT_SLOT(setTitle())); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("General"); TQString currentProfile = config->readEntry("CurrentProfile", locate("appdata","default.kandy")); @@ -250,7 +250,7 @@ void Kandy::optionsConfigureKeys() void Kandy::optionsConfigureToolbars() { // use the standard toolbar editor - saveMainWindowSettings( KGlobal::config(), autoSaveGroup() ); + saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() ); KEditToolbar dlg(actionCollection()); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(newToolbarConfig())); dlg.exec(); @@ -261,7 +261,7 @@ void Kandy::newToolbarConfig() // this slot is called when user clicks "Ok" or "Apply" in the toolbar editor. // recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.) createGUI(); - applyMainWindowSettings( KGlobal::config(), autoSaveGroup() ); + applyMainWindowSettings( TDEGlobal::config(), autoSaveGroup() ); } void Kandy::optionsPreferences() diff --git a/kandy/src/kandyview.cpp b/kandy/src/kandyview.cpp index 3791e893..662802f5 100644 --- a/kandy/src/kandyview.cpp +++ b/kandy/src/kandyview.cpp @@ -283,7 +283,7 @@ bool KandyView::loadFile(const TQString& filename) new CommandItem(mCommandList,cmds->at(i)); } - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("General"); config->writeEntry("CurrentProfile",filename); @@ -296,7 +296,7 @@ bool KandyView::saveFile(const TQString& filename) { if (!mScheduler->saveProfile(filename)) return false; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("General"); config->writeEntry("CurrentProfile",filename); diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp index 945ff7c4..9a800306 100644 --- a/kandy/src/mobilemain.cpp +++ b/kandy/src/mobilemain.cpp @@ -128,7 +128,7 @@ void MobileMain::optionsConfigureKeys() void MobileMain::optionsConfigureToolbars() { // use the standard toolbar editor - saveMainWindowSettings( KGlobal::config(), autoSaveGroup() ); + saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() ); KEditToolbar dlg(actionCollection()); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(newToolbarConfig())); dlg.exec(); @@ -138,7 +138,7 @@ void MobileMain::newToolbarConfig() { // recreate our GUI createGUI("kandymobileui.rc"); - applyMainWindowSettings( KGlobal::config(), autoSaveGroup() ); + applyMainWindowSettings( TDEGlobal::config(), autoSaveGroup() ); } void MobileMain::optionsPreferences() diff --git a/karm/csvexportdialog.cpp b/karm/csvexportdialog.cpp index f1e0fce6..2bf6d9e2 100644 --- a/karm/csvexportdialog.cpp +++ b/karm/csvexportdialog.cpp @@ -55,7 +55,7 @@ CSVExportDialog::CSVExportDialog( ReportCriteria::REPORTTYPE rt, // If decimal symbol is a comma, then default field seperator to semi-colon. // In France and Germany, one-and-a-half is written as 1,5 not 1.5 - TQString d = KGlobal::locale()->decimalSymbol(); + TQString d = TDEGlobal::locale()->decimalSymbol(); if ( "," == d ) CSVExportDialogBase::radioSemicolon->setChecked(true); else CSVExportDialogBase::radioComma->setChecked(true); diff --git a/karm/idletimedetector.cpp b/karm/idletimedetector.cpp index 03aba921..911d1b2f 100644 --- a/karm/idletimedetector.cpp +++ b/karm/idletimedetector.cpp @@ -68,7 +68,7 @@ void IdleTimeDetector::informOverrun(int idleSeconds) _timer->stop(); TQDateTime idleStart = TQDateTime::currentDateTime().addSecs(-idleSeconds); - TQString idleStartTQString = KGlobal::locale()->formatTime(idleStart.time()); + TQString idleStartTQString = TDEGlobal::locale()->formatTime(idleStart.time()); int id = TQMessageBox::warning( 0, i18n("Idle Detection"), i18n("Desktop has been idle since %1." @@ -83,7 +83,7 @@ void IdleTimeDetector::informOverrun(int idleSeconds) { // Revert And Stop kdDebug(5970) << "Now it is " << TQDateTime::currentDateTime() << endl; - kdDebug(5970) << "Reverting timer to " << KGlobal::locale()->formatTime(idleStart.time()).ascii() << endl; + kdDebug(5970) << "Reverting timer to " << TDEGlobal::locale()->formatTime(idleStart.time()).ascii() << endl; emit(extractTime(idleSeconds/60+diff)); // we need to subtract the time that has been added during idleness. emit(stopAllTimersAt(idleStart)); } diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp index a8187373..b278d9f2 100644 --- a/karm/karm_part.cpp +++ b/karm/karm_part.cpp @@ -416,7 +416,7 @@ extern "C" { KDE_EXPORT void* init_libkarmpart() { - KGlobal::locale()->insertCatalogue("karm"); + TDEGlobal::locale()->insertCatalogue("karm"); return new karmPartFactory; } } diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp index 153a8f33..85c1bab4 100644 --- a/karm/karmstorage.cpp +++ b/karm/karmstorage.cpp @@ -917,11 +917,11 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, // header retval += i18n("Task History\n"); retval += i18n("From %1 to %2") - .arg(KGlobal::locale()->formatDate(from)) - .arg(KGlobal::locale()->formatDate(to)); + .arg(TDEGlobal::locale()->formatDate(from)) + .arg(TDEGlobal::locale()->formatDate(to)); retval += cr; retval += i18n("Printed on: %1") - .arg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())); + .arg(TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())); retval += cr; day=from; diff --git a/karm/karmutility.cpp b/karm/karmutility.cpp index 8a2de530..39b1865a 100644 --- a/karm/karmutility.cpp +++ b/karm/karmutility.cpp @@ -12,10 +12,10 @@ TQString formatTime( long minutes, bool decimal ) TQString time; if ( decimal ) { time.sprintf("%.2f", minutes / 60.0); - time.replace( '.', KGlobal::locale()->decimalSymbol() ); + time.replace( '.', TDEGlobal::locale()->decimalSymbol() ); } else time.sprintf("%s%ld:%02ld", - (minutes < 0) ? KGlobal::locale()->negativeSign().utf8().data() : "", + (minutes < 0) ? TDEGlobal::locale()->negativeSign().utf8().data() : "", labs(minutes / 60), labs(minutes % 60)); return time; } diff --git a/karm/ktimewidget.cpp b/karm/ktimewidget.cpp index 879386ad..112812b2 100644 --- a/karm/ktimewidget.cpp +++ b/karm/ktimewidget.cpp @@ -106,7 +106,7 @@ void KArmTimeWidget::setTime( long minutes ) dummy.setNum( hourpart ); if (minutes < 0) - dummy = KGlobal::locale()->negativeSign() + dummy; + dummy = TDEGlobal::locale()->negativeSign() + dummy; _hourLE->setText( dummy ); dummy.setNum( minutepart ); @@ -123,7 +123,7 @@ long KArmTimeWidget::time() const h = abs(_hourLE->text().toInt( &ok )); m = _minuteLE->text().toInt( &ok ); - isNegative = _hourLE->text().startsWith(KGlobal::locale()->negativeSign()); + isNegative = _hourLE->text().startsWith(TDEGlobal::locale()->negativeSign()); return (h * 60 + m) * ((isNegative) ? -1 : 1); } diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp index eb6bd4fa..73892442 100644 --- a/karm/mainwindow.cpp +++ b/karm/mainwindow.cpp @@ -454,7 +454,7 @@ void MainWindow::loadGeometry() void MainWindow::saveGeometry() { - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); config.setGroup( TQString::fromLatin1("Main Window Geometry")); config.writeEntry( TQString::fromLatin1("Width"), width()); config.writeEntry( TQString::fromLatin1("Height"), height()); diff --git a/karm/preferences.cpp b/karm/preferences.cpp index c242fa6a..6544931a 100644 --- a/karm/preferences.cpp +++ b/karm/preferences.cpp @@ -286,7 +286,7 @@ void Preferences::load() void Preferences::save() { - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); config.setGroup( TQString::fromLatin1("Idle detection")); config.writeEntry( TQString::fromLatin1("enabled"), _doIdleDetectionV); @@ -314,20 +314,20 @@ void Preferences::save() // HACK: this entire config dialog should be upgraded to KConfigXT bool Preferences::readBoolEntry( const TQString& key ) { - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); return config.readBoolEntry ( key, true ); } void Preferences::writeEntry( const TQString &key, bool value) { - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); config.writeEntry( key, value ); config.sync(); } void Preferences::deleteEntry( const TQString &key ) { - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); config.deleteEntry( key ); config.sync(); } diff --git a/karm/print.cpp b/karm/print.cpp index 53688368..c540663b 100644 --- a/karm/print.cpp +++ b/karm/print.cpp @@ -75,7 +75,7 @@ void MyPrinter::print() painter.setFont(newFont); int height = metrics.height(); - TQString now = KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); + TQString now = TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); painter.drawText(xMargin, yoff, pageWidth, height, TQPainter::AlignCenter, diff --git a/karm/timekard.cpp b/karm/timekard.cpp index 984baf74..1be72b96 100644 --- a/karm/timekard.cpp +++ b/karm/timekard.cpp @@ -59,7 +59,7 @@ TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime // header retval += i18n("Task Totals") + cr; - retval += KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); + retval += TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); retval += cr + cr; retval += TQString(TQString::fromLatin1("%1 %2")) .arg(i18n("Time"), timeWidth) @@ -313,11 +313,11 @@ TQString TimeKard::historyAsText(TaskView* taskview, const TQDate& from, retval += totalsOnly ? i18n("Task Totals") : i18n("Task History"); retval += cr; retval += i18n("From %1 to %2") - .arg(KGlobal::locale()->formatDate(from)) - .arg(KGlobal::locale()->formatDate(to)); + .arg(TDEGlobal::locale()->formatDate(from)) + .arg(TDEGlobal::locale()->formatDate(to)); retval += cr; retval += i18n("Printed on: %1") - .arg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())); + .arg(TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())); if ( perWeek ) { @@ -353,7 +353,7 @@ TQDate Week::end() const TQString Week::name() const { - return i18n("Week of %1").arg(KGlobal::locale()->formatDate(start())); + return i18n("Week of %1").arg(TDEGlobal::locale()->formatDate(start())); } TQValueList Week::weeksFromDateRange(const TQDate& from, const TQDate& to) @@ -372,7 +372,7 @@ TQValueList Week::weeksFromDateRange(const TQDate& from, const TQDate& to) // even if from and to are the same date. The week starts on the day // that is set in the locale settings. start = from.addDays( - -((7 - KGlobal::locale()->weekStartDay() + from.dayOfWeek()) % 7)); + -((7 - TDEGlobal::locale()->weekStartDay() + from.dayOfWeek()) % 7)); for (TQDate d = start; d <= to; d = d.addDays(7)) weeks.append(Week(d)); diff --git a/karm/tray.cpp b/karm/tray.cpp index ac820abb..2933b8ae 100644 --- a/karm/tray.cpp +++ b/karm/tray.cpp @@ -138,7 +138,7 @@ void KarmTray::updateToolTip(TQPtrList activeTasks) TQFontMetrics fm( TQToolTip::font() ); const TQString continued = i18n( ", ..." ); const int buffer = fm.boundingRect( continued ).width(); - const int desktopWidth = KGlobalSettings::desktopGeometry(this).width(); + const int desktopWidth = TDEGlobalSettings::desktopGeometry(this).width(); const int maxWidth = desktopWidth - buffer; TQString qTip; diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp index e22e49c0..0abac719 100644 --- a/kdgantt/KDGanttViewSubwidgets.cpp +++ b/kdgantt/KDGanttViewSubwidgets.cpp @@ -824,7 +824,7 @@ void KDTimeHeaderWidget::preparePopupMenu() TQString KDTimeHeaderWidget::getToolTipText(TQPoint p) { - return KGlobal::locale()->formatDateTime(getDateTimeForIndex(p.x())); + return TDEGlobal::locale()->formatDateTime(getDateTimeForIndex(p.x())); } void KDTimeHeaderWidget::addTickRight( int num ) { @@ -1950,7 +1950,7 @@ TQDateTime KDTimeHeaderWidget::getEvenTimeDate(TQDateTime tempdatetime ,Scale sc break; case KDGanttView::Week: tempdate = tempdatetime.date(); - while (tempdate.dayOfWeek ()!= KGlobal::locale()->weekStartDay()) + while (tempdate.dayOfWeek ()!= TDEGlobal::locale()->weekStartDay()) tempdate = tempdate.addDays(-1); //tempdate = tempdate.addDays(-7); tempdatetime = TQDateTime (tempdate, TQTime (0,0)); @@ -2217,7 +2217,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) TQTime tempTime = myRealStart.time(); TQDateTime tempDateTime; int i; - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); switch (myRealScale) { case KDGanttView::Minute: @@ -2284,7 +2284,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) tempDate = tempDate.addDays(tempMinorScaleCount); } tempDate = myRealStart.date(); - while (tempDate.dayOfWeek() != KGlobal::locale()->weekStartDay()) + while (tempDate.dayOfWeek() != TDEGlobal::locale()->weekStartDay()) tempDate = tempDate.addDays(1); while (tempDate < myRealEnd.date()) { majorTicks.append( getCoordX(tempDate)); @@ -2304,7 +2304,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) tempDate = tempDate.addDays(7*tempMinorScaleCount); } tempDate = myRealStart.date(); - while (tempDate.day() != KGlobal::locale()->weekStartDay()) + while (tempDate.day() != TDEGlobal::locale()->weekStartDay()) tempDate = tempDate.addDays(1); while (tempDate < myRealEnd.date()) { majorTicks.append( getCoordX(tempDate)); diff --git a/kioslaves/imap4/mimeheader.cc b/kioslaves/imap4/mimeheader.cc index 8b54b98c..72e3827b 100644 --- a/kioslaves/imap4/mimeheader.cc +++ b/kioslaves/imap4/mimeheader.cc @@ -701,9 +701,9 @@ mimeHeader::iconName () fileName = KMimeType::mimeType (contentType.lower ())->icon (TQString(), false); fileName = - KGlobal::instance ()->iconLoader ()->iconPath (fileName, KIcon::Desktop); + TDEGlobal::instance ()->iconLoader ()->iconPath (fileName, KIcon::Desktop); // if (fileName.isEmpty()) -// fileName = KGlobal::instance()->iconLoader()->iconPath( "unknown", KIcon::Desktop ); +// fileName = TDEGlobal::instance()->iconLoader()->iconPath( "unknown", KIcon::Desktop ); return fileName; } diff --git a/kioslaves/mbox/mbox.cc b/kioslaves/mbox/mbox.cc index d351bdba..3d56c09f 100644 --- a/kioslaves/mbox/mbox.cc +++ b/kioslaves/mbox/mbox.cc @@ -44,7 +44,7 @@ int kdemain( int argc, char * argv[] ) { KLocale::setMainCatalogue("tdelibs"); TDEInstance instance("kio_mbox"); - (void) KGlobal::locale(); + (void) TDEGlobal::locale(); if (argc != 4) { fprintf(stderr, "Usage: kio_mbox protocol " diff --git a/kitchensync/src/aboutpage.cpp b/kitchensync/src/aboutpage.cpp index f2683996..fe252460 100644 --- a/kitchensync/src/aboutpage.cpp +++ b/kitchensync/src/aboutpage.cpp @@ -94,7 +94,7 @@ void AboutPage::handleUrl( const KURL &url ) TQString AboutPage::htmlText() const { - KIconLoader *iconloader = KGlobal::iconLoader(); + KIconLoader *iconloader = TDEGlobal::iconLoader(); int iconSize = iconloader->currentSize( KIcon::Desktop ); TQString handbook_icon_path = iconloader->iconPath( "contents2", KIcon::Desktop ); diff --git a/kitchensync/src/groupconfig.cpp b/kitchensync/src/groupconfig.cpp index cfedcbfa..4159fd1b 100644 --- a/kitchensync/src/groupconfig.cpp +++ b/kitchensync/src/groupconfig.cpp @@ -56,7 +56,7 @@ GroupConfig::GroupConfig( TQWidget *parent ) TQBoxLayout *nameLayout = new TQHBoxLayout( titleFrame ); nameLayout->setMargin( 4 ); - TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kontact_summary", + TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_summary", KIcon::Desktop ); TQLabel *iconLabel = new TQLabel( titleFrame ); @@ -92,7 +92,7 @@ GroupConfig::GroupConfig( TQWidget *parent ) buttonLayout->addStretch( 1 ); - icon = KGlobal::iconLoader()->loadIcon( "bookmark", KIcon::Desktop ); + icon = TDEGlobal::iconLoader()->loadIcon( "bookmark", KIcon::Desktop ); TQFrame *page = mMemberView->addPage( i18n("Group"), i18n("General Group Settings"), icon ); TQBoxLayout *pageLayout = new TQVBoxLayout( page ); diff --git a/kitchensync/src/groupitem.cpp b/kitchensync/src/groupitem.cpp index 08b12625..023f91a0 100644 --- a/kitchensync/src/groupitem.cpp +++ b/kitchensync/src/groupitem.cpp @@ -67,7 +67,7 @@ GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process ) static TQPixmap icon; if ( icon.isNull() ) - icon = KGlobal::iconLoader()->loadIcon( "kontact_summary", KIcon::Desktop ); + icon = TDEGlobal::iconLoader()->loadIcon( "kontact_summary", KIcon::Desktop ); mIcon = new TQLabel( hbox ); mIcon->setPixmap( icon ); @@ -123,8 +123,8 @@ GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process ) mCallbackHandler->setEngine( mSyncProcess->engine() ); - setSelectionForegroundColor( KGlobalSettings::textColor() ); - setSelectionBackgroundColor( KGlobalSettings::alternateBackgroundColor() ); + setSelectionForegroundColor( TDEGlobalSettings::textColor() ); + setSelectionBackgroundColor( TDEGlobalSettings::alternateBackgroundColor() ); update(); } @@ -143,7 +143,7 @@ void GroupItem::update() TQDateTime dateTime = mSyncProcess->group().lastSynchronization(); if ( dateTime.isValid() ) - mTime->setText( i18n( "Last synchronized on: %1" ).arg( KGlobal::locale()->formatDateTime( dateTime ) ) ); + mTime->setText( i18n( "Last synchronized on: %1" ).arg( TDEGlobal::locale()->formatDateTime( dateTime ) ) ); else mTime->setText( i18n( "Not synchronized yet" ) ); diff --git a/kitchensync/src/htmldiffalgodisplay.cpp b/kitchensync/src/htmldiffalgodisplay.cpp index 1b4c2fe1..e6f23afd 100644 --- a/kitchensync/src/htmldiffalgodisplay.cpp +++ b/kitchensync/src/htmldiffalgodisplay.cpp @@ -45,8 +45,8 @@ void HTMLDiffAlgoDisplay::begin() mText.append( "" ); mText.append( TQString( "" ) - .arg( KGlobalSettings::textColor().name() ) - .arg( KGlobalSettings::baseColor().name() ) ); + .arg( TDEGlobalSettings::textColor().name() ) + .arg( TDEGlobalSettings::baseColor().name() ) ); mText.append( "
" ); mText.append( TQString( "" ) diff --git a/kitchensync/src/kwidgetlist.cpp b/kitchensync/src/kwidgetlist.cpp index 396e144f..0990e479 100644 --- a/kitchensync/src/kwidgetlist.cpp +++ b/kitchensync/src/kwidgetlist.cpp @@ -259,10 +259,10 @@ bool KWidgetList::eventFilter( TQObject *object, TQEvent *event ) KWidgetListItem::KWidgetListItem( KWidgetList *parent, const char *name ) : TQWidget( parent, name ) { - mForegroundColor = KGlobalSettings::textColor(); - mBackgroundColor = KGlobalSettings::baseColor(); - mSelectionForegroundColor = KGlobalSettings::highlightedTextColor(); - mSelectionBackgroundColor = KGlobalSettings::highlightColor(); + mForegroundColor = TDEGlobalSettings::textColor(); + mBackgroundColor = TDEGlobalSettings::baseColor(); + mSelectionForegroundColor = TDEGlobalSettings::highlightedTextColor(); + mSelectionBackgroundColor = TDEGlobalSettings::highlightColor(); setFocusPolicy( TQ_StrongFocus ); } diff --git a/kitchensync/src/main.cpp b/kitchensync/src/main.cpp index c544326f..32232634 100644 --- a/kitchensync/src/main.cpp +++ b/kitchensync/src/main.cpp @@ -49,7 +49,7 @@ int main( int argc, char **argv ) KUniqueApplication app; - KGlobal::locale()->insertCatalogue( "libkcal" ); + TDEGlobal::locale()->insertCatalogue( "libkcal" ); MainWindow *mainWindow = new MainWindow; mainWindow->show(); diff --git a/kitchensync/src/memberinfo.cpp b/kitchensync/src/memberinfo.cpp index 69ae8986..b93721ac 100644 --- a/kitchensync/src/memberinfo.cpp +++ b/kitchensync/src/memberinfo.cpp @@ -32,12 +32,12 @@ MemberInfo::MemberInfo( const QSync::Member &member ) TQPixmap MemberInfo::smallIcon() const { - return KGlobal::iconLoader()->loadIcon( iconName(), KIcon::Small ); + return TDEGlobal::iconLoader()->loadIcon( iconName(), KIcon::Small ); } TQPixmap MemberInfo::desktopIcon() const { - return KGlobal::iconLoader()->loadIcon( iconName(), KIcon::Desktop ); + return TDEGlobal::iconLoader()->loadIcon( iconName(), KIcon::Desktop ); } TQString MemberInfo::iconName() const diff --git a/kitchensync/src/part.cpp b/kitchensync/src/part.cpp index b60e75f0..1cf4d7a6 100644 --- a/kitchensync/src/part.cpp +++ b/kitchensync/src/part.cpp @@ -48,7 +48,7 @@ KitchenSyncPart::KitchenSyncPart( TQWidget *parentWidget, const char *widgetName new MainWidget( this, canvas ); - KGlobal::iconLoader()->addAppDir( "kitchensync" ); + TDEGlobal::iconLoader()->addAppDir( "kitchensync" ); setXMLFile( "kitchensync_part.rc" ); } diff --git a/kitchensync/src/pluginpicker.cpp b/kitchensync/src/pluginpicker.cpp index d981599b..b50027f4 100644 --- a/kitchensync/src/pluginpicker.cpp +++ b/kitchensync/src/pluginpicker.cpp @@ -41,7 +41,7 @@ PluginItem::PluginItem( KWidgetList *list, const QSync::Plugin &plugin ) TQGridLayout *layout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *icon = new TQLabel( this ); - icon->setPixmap( KGlobal::iconLoader()->loadIcon( iconName, KIcon::Desktop ) ); + icon->setPixmap( TDEGlobal::iconLoader()->loadIcon( iconName, KIcon::Desktop ) ); icon->setFixedSize( icon->sizeHint() ); TQLabel *name = new TQLabel( plugin.longName(), this ); diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp index b25a1a2a..8937fb48 100644 --- a/kmail/accountdialog.cpp +++ b/kmail/accountdialog.cpp @@ -908,7 +908,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) button->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); button->setFixedSize( 22, 22 ); button->setIconSet( - KGlobal::iconLoader()->loadIconSet( "reload", KIcon::Small, 0 ) ); + TDEGlobal::iconLoader()->loadIconSet( "reload", KIcon::Small, 0 ) ); connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotReloadNamespaces()) ); TQWhatsThis::add( button, i18n("Reload the namespaces from the server. This overwrites any changes.") ); @@ -922,7 +922,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) mImap.personalNS->setReadOnly( true ); mImap.editPNS = new TQToolButton( listbox ); mImap.editPNS->setIconSet( - KGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) ); + TDEGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) ); mImap.editPNS->setAutoRaise( true ); mImap.editPNS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); mImap.editPNS->setFixedSize( 22, 22 ); @@ -934,7 +934,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) mImap.otherUsersNS->setReadOnly( true ); mImap.editONS = new TQToolButton( listbox ); mImap.editONS->setIconSet( - KGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) ); + TDEGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) ); mImap.editONS->setAutoRaise( true ); mImap.editONS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); mImap.editONS->setFixedSize( 22, 22 ); @@ -946,7 +946,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) mImap.sharedNS->setReadOnly( true ); mImap.editSNS = new TQToolButton( listbox ); mImap.editSNS->setIconSet( - KGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) ); + TDEGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) ); mImap.editSNS->setAutoRaise( true ); mImap.editSNS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); mImap.editSNS->setFixedSize( 22, 22 ); @@ -2305,7 +2305,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent, edit->setText( it.key() ); TQToolButton* button = new TQToolButton( grid ); button->setIconSet( - KGlobal::iconLoader()->loadIconSet( "editdelete", KIcon::Small, 0 ) ); + TDEGlobal::iconLoader()->loadIconSet( "editdelete", KIcon::Small, 0 ) ); button->setAutoRaise( true ); button->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); button->setFixedSize( 22, 22 ); diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp index 951a3379..2f6750f2 100644 --- a/kmail/antispamwizard.cpp +++ b/kmail/antispamwizard.cpp @@ -616,10 +616,10 @@ void AntiSpamWizard::slotBuildSummary() int AntiSpamWizard::checkForProgram( const TQString &executable ) { kdDebug(5006) << "Testing for executable:" << executable << endl; - KProcess process; + TDEProcess process; process << executable; process.setUseShell( true ); - process.start( KProcess::Block ); + process.start( TDEProcess::Block ); return process.exitStatus(); } diff --git a/kmail/archivefolderdialog.cpp b/kmail/archivefolderdialog.cpp index c8068ec4..4f58f56c 100644 --- a/kmail/archivefolderdialog.cpp +++ b/kmail/archivefolderdialog.cpp @@ -39,7 +39,7 @@ using namespace KMail; static TQString standardArchivePath( const TQString &folderName ) { - TQString currentPath = KGlobalSettings::documentPath(); + TQString currentPath = TDEGlobalSettings::documentPath(); TQDir dir( currentPath ); if( !dir.exists() ) { currentPath = TQDir::homeDirPath() + '/'; diff --git a/kmail/backupjob.h b/kmail/backupjob.h index 41aa429b..4ca6728f 100644 --- a/kmail/backupjob.h +++ b/kmail/backupjob.h @@ -27,7 +27,7 @@ class KMFolder; class KMMessage; class KArchive; -class KProcess; +class TDEProcess; class TQWidget; namespace KPIM { diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index e569eff3..4bad5bc5 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -1019,7 +1019,7 @@ void AccountsPage::SendingTab::doLoadOther() { { //### FIXME: Use the global convenience function instead of the homebrewed // solution once we can rely on HEAD tdelibs. - //str = KGlobal::hostname(); ??????? + //str = TDEGlobal::hostname(); ??????? char buffer[256]; if ( !gethostname( buffer, 255 ) ) // buffer need not be NUL-terminated if it has full length @@ -1646,8 +1646,8 @@ void AppearancePage::FontsTab::slotFontSelectorChanged( int index ) void AppearancePage::FontsTab::doLoadOther() { KConfigGroup fonts( KMKernel::config(), "Fonts" ); - mFont[0] = KGlobalSettings::generalFont(); - TQFont fixedFont = KGlobalSettings::fixedFont(); + mFont[0] = TDEGlobalSettings::generalFont(); + TQFont fixedFont = TDEGlobalSettings::fixedFont(); for ( int i = 0 ; i < numFontNames ; i++ ) mFont[i] = fonts.readFontEntry( fontNames[i].configName, (fontNames[i].onlyFixed) ? &fixedFont : &mFont[0] ); @@ -1794,13 +1794,13 @@ void AppearancePage::ColorsTab::doLoadOther() { static const TQColor defaultColor[ numColorNames ] = { kapp->palette().active().base(), // bg - KGlobalSettings::alternateBackgroundColor(), // alt bg + TDEGlobalSettings::alternateBackgroundColor(), // alt bg kapp->palette().active().text(), // fg TQColor( 0x00, 0x80, 0x00 ), // quoted l1 TQColor( 0x00, 0x70, 0x00 ), // quoted l2 TQColor( 0x00, 0x60, 0x00 ), // quoted l3 - KGlobalSettings::linkColor(), // link - KGlobalSettings::visitedLinkColor(), // visited link + TDEGlobalSettings::linkColor(), // link + TDEGlobalSettings::visitedLinkColor(), // visited link TQt::red, // misspelled words TQt::red, // new msg TQt::blue, // unread mgs @@ -2374,7 +2374,7 @@ void AppearancePage::ReaderTab::readCurrentFallbackCodec() bool found = false; for( ; it != end; ++it) { - const TQString encoding = KGlobal::charsets()->encodingForName(*it); + const TQString encoding = TDEGlobal::charsets()->encodingForName(*it); if ( encoding == "iso-8859-15" ) indexOfLatin9 = i; if( encoding == currentEncoding ) @@ -2403,7 +2403,7 @@ void AppearancePage::ReaderTab::readCurrentOverrideCodec() uint i = 0; for( ; it != end; ++it) { - if( KGlobal::charsets()->encodingForName(*it) == currentOverrideEncoding ) + if( TDEGlobal::charsets()->encodingForName(*it) == currentOverrideEncoding ) { mOverrideCharsetCombo->setCurrentItem( i ); break; @@ -2450,11 +2450,11 @@ void AppearancePage::ReaderTab::save() { GlobalSettings::self()->setCollapseQuoteLevelSpin( mCollapseQuoteLevelSpin->value() ); GlobalSettings::self()->setFallbackCharacterEncoding( - KGlobal::charsets()->encodingForName( mCharsetCombo->currentText() ) ); + TDEGlobal::charsets()->encodingForName( mCharsetCombo->currentText() ) ); GlobalSettings::self()->setOverrideCharacterEncoding( mOverrideCharsetCombo->currentItem() == 0 ? TQString() : - KGlobal::charsets()->encodingForName( mOverrideCharsetCombo->currentText() ) ); + TDEGlobal::charsets()->encodingForName( mOverrideCharsetCombo->currentText() ) ); GlobalSettings::self()->setShowCurrentTime( mShowCurrentTimeCheck->isChecked() ); } @@ -3095,7 +3095,7 @@ void ComposerPage::PhrasesTab::doLoadFromGlobalSettings() { currentNr = 0; if ( numLang == 0 ) { - slotAddNewLanguage( KGlobal::locale()->language() ); + slotAddNewLanguage( TDEGlobal::locale()->language() ); } mPhraseLanguageCombo->setCurrentItem( currentNr ); @@ -3309,7 +3309,7 @@ void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) { } bool ok = false; - TQTextCodec *codec = KGlobal::charsets()->codecForName( charset, ok ); + TQTextCodec *codec = TDEGlobal::charsets()->codecForName( charset, ok ); if ( ok && codec ) { charset = TQString::fromLatin1( codec->mimeName() ).lower(); return; diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp index 9f668ca3..daa326d2 100644 --- a/kmail/configuredialog_p.cpp +++ b/kmail/configuredialog_p.cpp @@ -202,7 +202,7 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs, hlay->addWidget( new TQLabel( mComboBox, i18n("Choose &language:"), page ) ); hlay->addWidget( mComboBox, 1 ); - TQStringList pathList = KGlobal::dirs()->findAllResources( "locale", + TQStringList pathList = TDEGlobal::dirs()->findAllResources( "locale", TQString::fromLatin1("*/entry.desktop") ); // extract a list of language tags that should not be included: TQStringList suppressedAcronyms; @@ -324,7 +324,7 @@ void ProfileDialog::setup() { mListView->clear(); // find all profiles (config files named "profile-xyz-rc"): const TQString profileFilenameFilter = TQString::fromLatin1("kmail/profile-*-rc"); - mProfileList = KGlobal::dirs()->findAllResources( "data", profileFilenameFilter ); + mProfileList = TDEGlobal::dirs()->findAllResources( "data", profileFilenameFilter ); kdDebug(5006) << "Profile manager: found " << mProfileList.count() << " profiles:" << endl; diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp index 6a0a7f4c..14bed9cf 100644 --- a/kmail/customtemplates.cpp +++ b/kmail/customtemplates.cpp @@ -57,7 +57,7 @@ CustomTemplates::CustomTemplates( TQWidget *parent, const char *name ) mCurrentItem( 0 ), mBlockChangeSignal( false ) { - TQFont f = KGlobalSettings::fixedFont(); + TQFont f = TDEGlobalSettings::fixedFont(); mEdit->setFont( f ); mAdd->setIconSet( BarIconSet( "add", KIcon::SizeSmall ) ); diff --git a/kmail/editorwatcher.cpp b/kmail/editorwatcher.cpp index 56282fed..06368967 100644 --- a/kmail/editorwatcher.cpp +++ b/kmail/editorwatcher.cpp @@ -99,9 +99,9 @@ bool EditorWatcher::start() // start the editor TQStringList params = KRun::processDesktopExec( *offer, list, false ); - mEditor = new KProcess( this ); + mEditor = new TDEProcess( this ); *mEditor << params; - connect( mEditor, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(editorExited()) ); + connect( mEditor, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(editorExited()) ); if ( !mEditor->start() ) return false; mEditorRunning = true; diff --git a/kmail/editorwatcher.h b/kmail/editorwatcher.h index fc08c4db..9a408d69 100644 --- a/kmail/editorwatcher.h +++ b/kmail/editorwatcher.h @@ -25,7 +25,7 @@ #include #include -class KProcess; +class TDEProcess; namespace KMail { @@ -63,7 +63,7 @@ class EditorWatcher : public TQObject KURL mUrl; TQString mMimeType; bool mOpenWith; - KProcess *mEditor; + TDEProcess *mEditor; TQWidget *mParentWidget; int mInotifyFd; diff --git a/kmail/encodingdetector.cpp b/kmail/encodingdetector.cpp index 06537981..d5ffd5dc 100644 --- a/kmail/encodingdetector.cpp +++ b/kmail/encodingdetector.cpp @@ -863,7 +863,7 @@ bool EncodingDetector::setEncoding(const char *_encoding, EncodingChoiceSource t if(enc=="visual") enc="iso8859-8"; bool b; - codec = KGlobal::charsets()->codecForName(enc, b); + codec = TDEGlobal::charsets()->codecForName(enc, b); if (!b) return false; } diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp index 6715f486..e1c7d6b8 100644 --- a/kmail/favoritefolderview.cpp +++ b/kmail/favoritefolderview.cpp @@ -438,7 +438,7 @@ void FavoriteFolderView::readColorConfig() KConfig* conf = KMKernel::config(); // Custom/System color support KConfigGroupSaver saver(conf, "Reader"); - TQColor c = KGlobalSettings::alternateBackgroundColor(); + TQColor c = TDEGlobalSettings::alternateBackgroundColor(); if ( !conf->readBoolEntry("defaultColors", true) ) mPaintInfo.colBack = conf->readColorEntry( "AltBackgroundColor",&c ); else diff --git a/kmail/folderrequester.cpp b/kmail/folderrequester.cpp index ca6271c8..177e8caf 100644 --- a/kmail/folderrequester.cpp +++ b/kmail/folderrequester.cpp @@ -52,7 +52,7 @@ FolderRequester::FolderRequester( TQWidget *parent, KMFolderTree *tree ) edit->setReadOnly( true ); TQToolButton* button = new TQToolButton( this ); - button->setIconSet( KGlobal::iconLoader()->loadIconSet( "folder", KIcon::Small, 0 ) ); + button->setIconSet( TDEGlobal::iconLoader()->loadIconSet( "folder", KIcon::Small, 0 ) ); connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpenDialog()) ); setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, diff --git a/kmail/headeritem.cpp b/kmail/headeritem.cpp index 7decd39f..c63a1ba1 100644 --- a/kmail/headeritem.cpp +++ b/kmail/headeritem.cpp @@ -424,7 +424,7 @@ void HeaderItem::paintCell( TQPainter * p, const TQColorGroup & cg, font = headers->dateFont(); } - TQColor cdisabled = KGlobalSettings::inactiveTextColor(); + TQColor cdisabled = TDEGlobalSettings::inactiveTextColor(); if ( headers->isMessageCut( msgSerNum() ) ) { font.setItalic( true ); color = &cdisabled; diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp index 019c20b2..c3a5b8b2 100644 --- a/kmail/headerstyle.cpp +++ b/kmail/headerstyle.cpp @@ -144,7 +144,7 @@ namespace KMail { TQString dateString; if( printing ) { TQDateTime dateTime; - KLocale * locale = KGlobal::locale(); + KLocale * locale = TDEGlobal::locale(); dateTime.setTime_t( message->date() ); dateString = locale->formatDateTime( dateTime ); } else { @@ -243,7 +243,7 @@ namespace KMail { TQString dateString; if( printing ) { TQDateTime dateTime; - KLocale* locale = KGlobal::locale(); + KLocale* locale = TDEGlobal::locale(); dateTime.setTime_t( message->date() ); dateString = locale->formatDateTime( dateTime ); } @@ -448,7 +448,7 @@ namespace KMail { TQString dateString; if( printing ) { TQDateTime dateTime; - KLocale* locale = KGlobal::locale(); + KLocale* locale = TDEGlobal::locale(); dateTime.setTime_t( message->date() ); dateString = locale->formatDateTime( dateTime ); } @@ -695,7 +695,7 @@ namespace KMail { } TQString tformat; - if ( KGlobal::locale()->use12Clock() ) { + if ( TDEGlobal::locale()->use12Clock() ) { tformat = "h:mm AP"; } else { @@ -914,7 +914,7 @@ namespace KMail { TQString dateString; if( printing ) { TQDateTime dateTime; - KLocale * locale = KGlobal::locale(); + KLocale * locale = TDEGlobal::locale(); dateTime.setTime_t( message->date() ); dateString = locale->formatDateTime( dateTime ); } else { diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp index 25e5eb78..6380251e 100644 --- a/kmail/imapaccountbase.cpp +++ b/kmail/imapaccountbase.cpp @@ -288,7 +288,7 @@ namespace KMail { // "keep password" checkbox. Then, we set [Passwords]Keep to // storePasswd(), so that the checkbox in the dialog will be // init'ed correctly: - KConfigGroup passwords( KGlobal::config(), "Passwords" ); + KConfigGroup passwords( TDEGlobal::config(), "Passwords" ); passwords.writeEntry( "Keep", storePasswd() ); TQString msg = i18n("You need to supply a username and a password to " "access this mailbox."); diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp index 1ece4c51..e7d88410 100644 --- a/kmail/kmaccount.cpp +++ b/kmail/kmaccount.cpp @@ -51,8 +51,8 @@ KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *parent) mPrecommandProcess.setUseShell(true); mPrecommandProcess << precommand; - connect(&mPrecommandProcess, TQT_SIGNAL(processExited(KProcess *)), - TQT_SLOT(precommandExited(KProcess *))); + connect(&mPrecommandProcess, TQT_SIGNAL(processExited(TDEProcess *)), + TQT_SLOT(precommandExited(TDEProcess *))); } //----------------------------------------------------------------------------- @@ -64,7 +64,7 @@ KMPrecommand::~KMPrecommand() //----------------------------------------------------------------------------- bool KMPrecommand::start() { - bool ok = mPrecommandProcess.start( KProcess::NotifyOnExit ); + bool ok = mPrecommandProcess.start( TDEProcess::NotifyOnExit ); if (!ok) KMessageBox::error(0, i18n("Could not execute precommand '%1'.") .arg(mPrecommand)); return ok; @@ -72,7 +72,7 @@ bool KMPrecommand::start() //----------------------------------------------------------------------------- -void KMPrecommand::precommandExited(KProcess *p) +void KMPrecommand::precommandExited(TDEProcess *p) { int exitCode = p->normalExit() ? p->exitStatus() : -1; if (exitCode) diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h index 618fa130..258fe9c0 100644 --- a/kmail/kmaccount.h +++ b/kmail/kmaccount.h @@ -60,13 +60,13 @@ public: bool start(); protected slots: - void precommandExited(KProcess *); + void precommandExited(TDEProcess *); signals: void finished(bool); protected: - KProcess mPrecommandProcess; + TDEProcess mPrecommandProcess; TQString mPrecommand; }; diff --git a/kmail/kmail.kcfg b/kmail/kmail.kcfg index 9ca8a5e5..91d2e51e 100644 --- a/kmail/kmail.kcfg +++ b/kmail/kmail.kcfg @@ -426,7 +426,7 @@ HDR_STANDARD - KGlobalSettings::completionMode() + TDEGlobalSettings::completionMode() true @@ -537,10 +537,10 @@ true - KGlobalSettings::generalFont() + TDEGlobalSettings::generalFont() - KGlobalSettings::fixedFont() + TDEGlobalSettings::fixedFont() diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp index 45da1cd7..1f42a82a 100644 --- a/kmail/kmail_part.cpp +++ b/kmail/kmail_part.cpp @@ -102,7 +102,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName, TQWidget *canvas = new TQWidget(parentWidget, widgetName); canvas->setFocusPolicy(TQ_ClickFocus); setWidget(canvas); - KGlobal::iconLoader()->addAppDir("kmail"); + TDEGlobal::iconLoader()->addAppDir("kmail"); #if 0 //It's also possible to make a part out of a readerWin KMReaderWin *mReaderWin = new KMReaderWin( canvas, canvas, actionCollection() ); @@ -117,7 +117,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName, mReaderWin->setFocusPolicy(TQWidget::ClickFocus); mStatusBar = new KMailStatusBarExtension(this); //new KParts::SideBarExtension( kmkernel->mainWin()-mainKMWidget()->leftFrame(), this ); - KGlobal::iconLoader()->addAppDir("kmail"); + TDEGlobal::iconLoader()->addAppDir("kmail"); setXMLFile( "kmail_part.rc" ); kmkernel->inboxFolder()->close(); #else @@ -143,7 +143,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName, connect( this, TQT_SIGNAL(textChanged(const TQString&)), ie, TQT_SIGNAL(textChanged(const TQString&)) ); connect( this, TQT_SIGNAL(iconChanged(const TQPixmap&)), ie, TQT_SIGNAL(iconChanged(const TQPixmap&)) ); - KGlobal::iconLoader()->addAppDir( "kmail" ); + TDEGlobal::iconLoader()->addAppDir( "kmail" ); setXMLFile( "kmail_part.rc" ); #endif diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index d2d9ca37..7108fff6 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -743,7 +743,7 @@ KMCommand::Result KMShowMsgSrcCommand::execute() viewer->setCaption( i18n("Message as Plain Text") ); viewer->setText(str); if( mFixedFont ) - viewer->setFont(KGlobalSettings::fixedFont()); + viewer->setFont(TDEGlobalSettings::fixedFont()); // Well, there is no widget to be seen here, so we have to use TQCursor::pos() // Update: (GS) I'm not going to make this code behave according to Xinerama @@ -1605,10 +1605,10 @@ KMPrintCommand::KMPrintCommand( TQWidget *parent, KMMessage *msg, mUseFixedFont( useFixedFont ), mEncoding( encoding ) { if ( GlobalSettings::useDefaultFonts() ) - mOverrideFont = KGlobalSettings::generalFont(); + mOverrideFont = TDEGlobalSettings::generalFont(); else { KConfigGroup fonts( KMKernel::config(), "Fonts" ); - TQString tmp = fonts.readEntry( "print-font", KGlobalSettings::generalFont().toString() ); + TQString tmp = fonts.readEntry( "print-font", TDEGlobalSettings::generalFont().toString() ); mOverrideFont.fromString( tmp ); } } diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h index 17c5512e..698ae64b 100644 --- a/kmail/kmcommands.h +++ b/kmail/kmcommands.h @@ -21,7 +21,7 @@ class TQPopupMenu; class KMainWindow; class KAction; class KProgressDialog; -class KProcess; +class TDEProcess; class KMFilter; class KMFolder; class KMFolderImap; diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index cb9db706..31d36b4d 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -226,8 +226,8 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) mEdtReplyTo = new KMLineEdit(true,mHeadersArea, "replyToLine"); TQToolTip::add( mEdtReplyTo, i18n( "Set the \"Reply-To:\" email address for this message" ) ); - connect(mEdtReplyTo,TQT_SIGNAL(completionModeChanged(KGlobalSettings::Completion)), - TQT_SLOT(slotCompletionModeChanged(KGlobalSettings::Completion))); + connect(mEdtReplyTo,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); if ( mClassicalRecipients ) { mRecipientsEditor = 0; @@ -260,12 +260,12 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) connect(mBtnBcc,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookTo())); //connect(mBtnFrom,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookFrom())); - connect(mEdtTo,TQT_SIGNAL(completionModeChanged(KGlobalSettings::Completion)), - TQT_SLOT(slotCompletionModeChanged(KGlobalSettings::Completion))); - connect(mEdtCc,TQT_SIGNAL(completionModeChanged(KGlobalSettings::Completion)), - TQT_SLOT(slotCompletionModeChanged(KGlobalSettings::Completion))); - connect(mEdtBcc,TQT_SIGNAL(completionModeChanged(KGlobalSettings::Completion)), - TQT_SLOT(slotCompletionModeChanged(KGlobalSettings::Completion))); + connect(mEdtTo,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); + connect(mEdtCc,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); + connect(mEdtBcc,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); mEdtTo->setFocus(); } else { @@ -284,8 +284,8 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) mRecipientsEditor = new RecipientsEditor( mHeadersArea ); connect( mRecipientsEditor, - TQT_SIGNAL( completionModeChanged( KGlobalSettings::Completion ) ), - TQT_SLOT( slotCompletionModeChanged( KGlobalSettings::Completion ) ) ); + TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ), + TQT_SLOT( slotCompletionModeChanged( TDEGlobalSettings::Completion ) ) ); connect( mRecipientsEditor, TQT_SIGNAL(sizeHintChanged()), TQT_SLOT(recipientEditorSizeHintChanged()) ); mRecipientsEditor->setFocus(); @@ -447,8 +447,8 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) connect( kmkernel->identityManager(), TQT_SIGNAL(changed(uint)), TQT_SLOT(slotIdentityChanged(uint))); - connect(mEdtFrom,TQT_SIGNAL(completionModeChanged(KGlobalSettings::Completion)), - TQT_SLOT(slotCompletionModeChanged(KGlobalSettings::Completion))); + connect(mEdtFrom,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); connect(kmkernel->folderMgr(),TQT_SIGNAL(folderRemoved(KMFolder*)), TQT_SLOT(slotFolderRemoved(KMFolder*))); connect(kmkernel->imapFolderMgr(),TQT_SIGNAL(folderRemoved(KMFolder*)), @@ -692,21 +692,21 @@ void KMComposeWin::readConfig( bool reload /* = false */ ) TQStringList transportHistory = GlobalSettings::self()->transportHistory(); TQString currentTransport = GlobalSettings::self()->currentTransport(); - mEdtFrom->setCompletionMode( (KGlobalSettings::Completion)GlobalSettings::self()->completionMode() ); - mEdtReplyTo->setCompletionMode( (KGlobalSettings::Completion)GlobalSettings::self()->completionMode() ); + mEdtFrom->setCompletionMode( (TDEGlobalSettings::Completion)GlobalSettings::self()->completionMode() ); + mEdtReplyTo->setCompletionMode( (TDEGlobalSettings::Completion)GlobalSettings::self()->completionMode() ); if ( mClassicalRecipients ) { - mEdtTo->setCompletionMode( (KGlobalSettings::Completion)GlobalSettings::self()->completionMode() ); - mEdtCc->setCompletionMode( (KGlobalSettings::Completion)GlobalSettings::self()->completionMode() ); - mEdtBcc->setCompletionMode( (KGlobalSettings::Completion)GlobalSettings::self()->completionMode() ); + mEdtTo->setCompletionMode( (TDEGlobalSettings::Completion)GlobalSettings::self()->completionMode() ); + mEdtCc->setCompletionMode( (TDEGlobalSettings::Completion)GlobalSettings::self()->completionMode() ); + mEdtBcc->setCompletionMode( (TDEGlobalSettings::Completion)GlobalSettings::self()->completionMode() ); } else - mRecipientsEditor->setCompletionMode( (KGlobalSettings::Completion)GlobalSettings::self()->completionMode() ); + mRecipientsEditor->setCompletionMode( (TDEGlobalSettings::Completion)GlobalSettings::self()->completionMode() ); readColorConfig(); if ( GlobalSettings::self()->useDefaultFonts() ) { - mBodyFont = KGlobalSettings::generalFont(); - mFixedFont = KGlobalSettings::fixedFont(); + mBodyFont = TDEGlobalSettings::generalFont(); + mFixedFont = TDEGlobalSettings::fixedFont(); } else { mBodyFont = GlobalSettings::self()->composerFont(); mFixedFont = GlobalSettings::self()->fixedFont(); @@ -2701,9 +2701,9 @@ void KMComposeWin::setCharset(const TQCString& aCharset, bool forceDefault) ++it, i++ ) { if (i > 0 && ((mCharset == "us-ascii" && i == 1) || - (i != 1 && KGlobal::charsets()->codecForName( - KGlobal::charsets()->encodingForName(*it)) - == KGlobal::charsets()->codecForName(mCharset)))) + (i != 1 && TDEGlobal::charsets()->codecForName( + TDEGlobal::charsets()->encodingForName(*it)) + == TDEGlobal::charsets()->codecForName(mCharset)))) { mEncodingAction->setCurrentItem( i ); slotSetCharset(); @@ -2807,7 +2807,7 @@ void KMComposeWin::slotAttachFileResult(KIO::Job *job) { (*it).data.resize((*it).data.size() + 1); (*it).data[(*it).data.size() - 1] = '\0'; - if ( const TQTextCodec * codec = KGlobal::charsets()->codecForName((*it).encoding) ) + if ( const TQTextCodec * codec = TDEGlobal::charsets()->codecForName((*it).encoding) ) mEditor->insert( codec->toUnicode( (*it).data ) ); else mEditor->insert( TQString::fromLocal8Bit( (*it).data ) ); @@ -2821,7 +2821,7 @@ void KMComposeWin::slotAttachFileResult(KIO::Job *job) partCharset = TQCString( ( *it ).url.fileEncoding().latin1() ); } else { EncodingDetector ed; - KLocale *loc = KGlobal::locale(); + KLocale *loc = TDEGlobal::locale(); ed.setAutoDetectLanguage( EncodingDetector::scriptForLanguageCode ( loc->language() ) ); ed.analyze( (*it).data ); partCharset = ed.encoding(); @@ -2946,7 +2946,7 @@ void KMComposeWin::slotInsertFile() false, 0, 0, 0); KComboBox *combo = fdlg.toolBar()->getCombo(4711); for (int i = 0; i < combo->count(); i++) - if (KGlobal::charsets()->codecForName(KGlobal::charsets()-> + if (TDEGlobal::charsets()->codecForName(TDEGlobal::charsets()-> encodingForName(combo->text(i))) == TQTextCodec::codecForLocale()) combo->setCurrentItem(i); if (!fdlg.exec()) return; @@ -2957,7 +2957,7 @@ void KMComposeWin::slotInsertFile() { KConfig *config = KMKernel::config(); KConfigGroupSaver saver( config, "Composer" ); - TQString encoding = KGlobal::charsets()->encodingForName(combo->currentText()).latin1(); + TQString encoding = TDEGlobal::charsets()->encodingForName(combo->currentText()).latin1(); TQStringList urls = config->readListEntry( "recent-urls" ); TQStringList encodings = config->readListEntry( "recent-encodings" ); // Prevent config file from growing without bound @@ -3022,7 +3022,7 @@ void KMComposeWin::slotSetCharset() } mAutoCharset = false; - mCharset = KGlobal::charsets()->encodingForName( mEncodingAction-> + mCharset = TDEGlobal::charsets()->encodingForName( mEncodingAction-> currentText() ).latin1(); } @@ -5089,7 +5089,7 @@ void KMComposeWin::cleanupAutoSave() } } -void KMComposeWin::slotCompletionModeChanged( KGlobalSettings::Completion mode) +void KMComposeWin::slotCompletionModeChanged( TDEGlobalSettings::Completion mode) { GlobalSettings::self()->setCompletionMode( (int) mode ); diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h index 9918c5c0..02f92154 100644 --- a/kmail/kmcomposewin.h +++ b/kmail/kmcomposewin.h @@ -57,7 +57,7 @@ class KMFolderComboBox; class KMFolder; class KMMessage; class KMMessagePart; -class KProcess; +class TDEProcess; class KDirWatch; class KSelectAction; class KFontAction; @@ -848,7 +848,7 @@ private: int calcColumnWidth(int which, long allShowing, int width); private slots: - void slotCompletionModeChanged( KGlobalSettings::Completion ); + void slotCompletionModeChanged( TDEGlobalSettings::Completion ); void slotConfigChanged(); void slotComposerDone( bool ); diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp index 99382915..e4fb4689 100644 --- a/kmail/kmedit.cpp +++ b/kmail/kmedit.cpp @@ -442,7 +442,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e) mExtEditorTempFile->close(); // replace %f in the system line sysLine.replace( "%f", mExtEditorTempFile->name() ); - mExtEditorProcess = new KProcess(); + mExtEditorProcess = new TDEProcess(); mExtEditorProcess->setUseShell( true ); sysLine += " "; while (!sysLine.isEmpty()) @@ -450,8 +450,8 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e) *mExtEditorProcess << sysLine.left(sysLine.find(" ")).local8Bit(); sysLine.remove(0, sysLine.find(" ") + 1); } - connect(mExtEditorProcess, TQT_SIGNAL(processExited(KProcess*)), - TQT_SLOT(slotExternalEditorDone(KProcess*))); + connect(mExtEditorProcess, TQT_SIGNAL(processExited(TDEProcess*)), + TQT_SLOT(slotExternalEditorDone(TDEProcess*))); if (!mExtEditorProcess->start()) { KMessageBox::error( topLevelWidget(), @@ -610,7 +610,7 @@ void KMEdit::slotExternalEditorTempFileChanged( const TQString & fileName ) { repaint(); } -void KMEdit::slotExternalEditorDone( KProcess * proc ) { +void KMEdit::slotExternalEditorDone( TDEProcess * proc ) { assert(proc == mExtEditorProcess); // make sure, we update even when KDirWatcher is too slow: slotExternalEditorTempFileChanged( mExtEditorTempFile->name() ); diff --git a/kmail/kmedit.h b/kmail/kmedit.h index 2f51f435..24458cd3 100644 --- a/kmail/kmedit.h +++ b/kmail/kmedit.h @@ -18,7 +18,7 @@ class KSpellConfig; class SpellingFilter; class KTempFile; class KDirWatch; -class KProcess; +class TDEProcess; class TQPopupMenu; /** @@ -131,7 +131,7 @@ public slots: void slotSpellcheck2(KSpell*); void slotSpellResult(const TQString&); void slotSpellDone(); - void slotExternalEditorDone(KProcess*); + void slotExternalEditorDone(TDEProcess*); void slotMisspelling(const TQString &, const TQStringList &, unsigned int); void slotCorrected (const TQString &, const TQString &, unsigned int); void addSuggestion(const TQString& text, const TQStringList& lst, unsigned int ); @@ -188,7 +188,7 @@ private: SpellingFilter* mSpellingFilter; KTempFile *mExtEditorTempFile; KDirWatch *mExtEditorTempFileWatcher; - KProcess *mExtEditorProcess; + TDEProcess *mExtEditorProcess; bool mUseExtEditor; TQString mExtEditor; bool mWasModifiedBeforeSpellCheck; diff --git a/kmail/kmfawidgets.cpp b/kmail/kmfawidgets.cpp index ae363427..0183cf88 100644 --- a/kmail/kmfawidgets.cpp +++ b/kmail/kmfawidgets.cpp @@ -110,7 +110,7 @@ void KMSoundTestWidget::openSoundDialog( KURLRequester * ) << "audio/x-adpcm"; fileDialog->setMimeFilter( filters ); - TQStringList soundDirs = KGlobal::dirs()->resourceDirs( "sound" ); + TQStringList soundDirs = TDEGlobal::dirs()->resourceDirs( "sound" ); if ( !soundDirs.isEmpty() ) { KURL soundURL; diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp index 037fbb0d..06dbb56e 100644 --- a/kmail/kmfilteraction.cpp +++ b/kmail/kmfilteraction.cpp @@ -495,7 +495,7 @@ TQString KMFilterActionWithCommand::substituteCommandLineArgsFor( KMMessage *aMs TQRegExp header_rx( "%\\{([a-z0-9-]+)\\}", false ); int idx = 0; while ( ( idx = header_rx.search( result, idx ) ) != -1 ) { - TQString replacement = KProcess::quote( aMsg->headerField( TQString(header_rx.cap(1)).latin1() ) ); + TQString replacement = TDEProcess::quote( aMsg->headerField( TQString(header_rx.cap(1)).latin1() ) ); result.replace( idx, header_rx.matchedLength(), replacement ); idx += replacement.length(); } @@ -511,7 +511,7 @@ KMFilterAction::ReturnCode KMFilterActionWithCommand::genericProcess(KMMessage* if ( mParameter.isEmpty() ) return ErrorButGoOn; - // KProcess doesn't support a TQProcess::launch() equivalent, so + // TDEProcess doesn't support a TQProcess::launch() equivalent, so // we must use a temp file :-( KTempFile * inFile = new KTempFile; inFile->setAutoDelete(true); @@ -544,9 +544,9 @@ KMFilterAction::ReturnCode KMFilterActionWithCommand::genericProcess(KMMessage* shProc << commandLine; // run process: - if ( !shProc.start( KProcess::Block, - withOutput ? KProcess::Stdout - : KProcess::NoCommunication ) ) + if ( !shProc.start( TDEProcess::Block, + withOutput ? TDEProcess::Stdout + : TDEProcess::NoCommunication ) ) return ErrorButGoOn; if ( !shProc.normalExit() || shProc.exitStatus() != 0 ) { diff --git a/kmail/kmfilteraction.h b/kmail/kmfilteraction.h index 0f635bad..f0705b58 100644 --- a/kmail/kmfilteraction.h +++ b/kmail/kmfilteraction.h @@ -508,7 +508,7 @@ public: @short Abstract base class for filter actions with a command line as parameter. @author Marc Mutz , based upon work by Stefan Taferner - @see KMFilterActionWithString KMFilterAction KMFilter KProcess + @see KMFilterActionWithString KMFilterAction KMFilter TDEProcess */ class KMFilterActionWithUrl : public KMFilterAction diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp index b82c3a29..7e033523 100644 --- a/kmail/kmfoldermbox.cpp +++ b/kmail/kmfoldermbox.cpp @@ -349,9 +349,9 @@ int KMFolderMbox::lock() case procmail_lockfile: cmd_str = "lockfile -l20 -r5 "; if (!mProcmailLockFileName.isEmpty()) - cmd_str += TQFile::encodeName(KProcess::quote(mProcmailLockFileName)); + cmd_str += TQFile::encodeName(TDEProcess::quote(mProcmailLockFileName)); else - cmd_str += TQFile::encodeName(KProcess::quote(location() + ".lock")); + cmd_str += TQFile::encodeName(TDEProcess::quote(location() + ".lock")); rc = system( cmd_str.data() ); if( rc != 0 ) @@ -363,7 +363,7 @@ int KMFolderMbox::lock() } if( mIndexStream ) { - cmd_str = "lockfile -l20 -r5 " + TQFile::encodeName(KProcess::quote(indexLocation() + ".lock")); + cmd_str = "lockfile -l20 -r5 " + TQFile::encodeName(TDEProcess::quote(indexLocation() + ".lock")); rc = system( cmd_str.data() ); if( rc != 0 ) { @@ -376,7 +376,7 @@ int KMFolderMbox::lock() break; case mutt_dotlock: - cmd_str = "mutt_dotlock " + TQFile::encodeName(KProcess::quote(location())); + cmd_str = "mutt_dotlock " + TQFile::encodeName(TDEProcess::quote(location())); rc = system( cmd_str.data() ); if( rc != 0 ) { @@ -387,7 +387,7 @@ int KMFolderMbox::lock() } if( mIndexStream ) { - cmd_str = "mutt_dotlock " + TQFile::encodeName(KProcess::quote(indexLocation())); + cmd_str = "mutt_dotlock " + TQFile::encodeName(TDEProcess::quote(indexLocation())); rc = system( cmd_str.data() ); if( rc != 0 ) { @@ -400,7 +400,7 @@ int KMFolderMbox::lock() break; case mutt_dotlock_privileged: - cmd_str = "mutt_dotlock -p " + TQFile::encodeName(KProcess::quote(location())); + cmd_str = "mutt_dotlock -p " + TQFile::encodeName(TDEProcess::quote(location())); rc = system( cmd_str.data() ); if( rc != 0 ) { @@ -411,7 +411,7 @@ int KMFolderMbox::lock() } if( mIndexStream ) { - cmd_str = "mutt_dotlock -p " + TQFile::encodeName(KProcess::quote(indexLocation())); + cmd_str = "mutt_dotlock -p " + TQFile::encodeName(TDEProcess::quote(indexLocation())); rc = system( cmd_str.data() ); if( rc != 0 ) { @@ -478,34 +478,34 @@ int KMFolderMbox::unlock() case procmail_lockfile: cmd_str = "rm -f "; if (!mProcmailLockFileName.isEmpty()) - cmd_str += TQFile::encodeName(KProcess::quote(mProcmailLockFileName)); + cmd_str += TQFile::encodeName(TDEProcess::quote(mProcmailLockFileName)); else - cmd_str += TQFile::encodeName(KProcess::quote(location() + ".lock")); + cmd_str += TQFile::encodeName(TDEProcess::quote(location() + ".lock")); rc = system( cmd_str.data() ); if( mIndexStream ) { - cmd_str = "rm -f " + TQFile::encodeName(KProcess::quote(indexLocation() + ".lock")); + cmd_str = "rm -f " + TQFile::encodeName(TDEProcess::quote(indexLocation() + ".lock")); rc = system( cmd_str.data() ); } break; case mutt_dotlock: - cmd_str = "mutt_dotlock -u " + TQFile::encodeName(KProcess::quote(location())); + cmd_str = "mutt_dotlock -u " + TQFile::encodeName(TDEProcess::quote(location())); rc = system( cmd_str.data() ); if( mIndexStream ) { - cmd_str = "mutt_dotlock -u " + TQFile::encodeName(KProcess::quote(indexLocation())); + cmd_str = "mutt_dotlock -u " + TQFile::encodeName(TDEProcess::quote(indexLocation())); rc = system( cmd_str.data() ); } break; case mutt_dotlock_privileged: - cmd_str = "mutt_dotlock -p -u " + TQFile::encodeName(KProcess::quote(location())); + cmd_str = "mutt_dotlock -p -u " + TQFile::encodeName(TDEProcess::quote(location())); rc = system( cmd_str.data() ); if( mIndexStream ) { - cmd_str = "mutt_dotlock -p -u " + TQFile::encodeName(KProcess::quote(indexLocation())); + cmd_str = "mutt_dotlock -p -u " + TQFile::encodeName(TDEProcess::quote(indexLocation())); rc = system( cmd_str.data() ); } break; diff --git a/kmail/kmfolderseldlg.cpp b/kmail/kmfolderseldlg.cpp index 79df5bc1..719dce4e 100644 --- a/kmail/kmfolderseldlg.cpp +++ b/kmail/kmfolderseldlg.cpp @@ -122,7 +122,7 @@ void KMFolderSelDlg::setFlags( bool mustBeReadWrite, bool showOutbox, void KMFolderSelDlg::readConfig() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "FolderSelectionDialog" ); TQSize size = config->readSizeEntry( "Size" ); @@ -143,7 +143,7 @@ void KMFolderSelDlg::readConfig() void KMFolderSelDlg::writeConfig() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "FolderSelectionDialog" ); config->writeEntry( "Size", size() ); diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp index 63010f9b..7bec817b 100644 --- a/kmail/kmfoldertree.cpp +++ b/kmail/kmfoldertree.cpp @@ -149,7 +149,7 @@ TQPixmap KMFolderTreeItem::normalIcon(int size) const if (mFolder && mFolder->useCustomIcons() ) { icon = mFolder->normalIconPath(); } - KIconLoader * il = KGlobal::instance()->iconLoader(); + KIconLoader * il = TDEGlobal::instance()->iconLoader(); TQPixmap pm = il->loadIcon( icon, KIcon::Small, size, KIcon::DefaultState, 0, true ); if ( mFolder && pm.isNull() ) { @@ -170,7 +170,7 @@ TQPixmap KMFolderTreeItem::unreadIcon(int size) const kmkernel->folderIsDraftOrOutbox( mFolder ) ) pm = normalIcon( size ); - KIconLoader * il = KGlobal::instance()->iconLoader(); + KIconLoader * il = TDEGlobal::instance()->iconLoader(); if ( mFolder && mFolder->useCustomIcons() ) { pm = il->loadIcon( mFolder->unreadIconPath(), KIcon::Small, size, KIcon::DefaultState, 0, true ); @@ -488,11 +488,11 @@ void KMFolderTree::readConfig (void) { KConfigGroupSaver saver(conf, "Fonts"); if (!conf->readBoolEntry("defaultFonts",true)) { - TQFont folderFont( KGlobalSettings::generalFont() ); + TQFont folderFont( TDEGlobalSettings::generalFont() ); setFont(conf->readFontEntry("folder-font", &folderFont)); } else - setFont(KGlobalSettings::generalFont()); + setFont(TDEGlobalSettings::generalFont()); } // restore the layout diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp index aaa4669f..bfe87194 100644 --- a/kmail/kmheaders.cpp +++ b/kmail/kmheaders.cpp @@ -435,7 +435,7 @@ void KMHeaders::readColorConfig (void) TQColor c4=TQColor(kapp->palette().active().base()); TQColor c5=TQColor(0,0x7F,0); TQColor c6=TQColor(0,0x98,0); - TQColor c7=KGlobalSettings::alternateBackgroundColor(); + TQColor c7=TDEGlobalSettings::alternateBackgroundColor(); if (!config->readBoolEntry("defaultColors",true)) { mPaintInfo.colFore = config->readColorEntry("ForegroundColor",&c1); @@ -533,18 +533,18 @@ void KMHeaders::readConfig (void) KConfigGroupSaver saver(config, "Fonts"); if (!(config->readBoolEntry("defaultFonts",true))) { - TQFont listFont( KGlobalSettings::generalFont() ); + TQFont listFont( TDEGlobalSettings::generalFont() ); listFont = config->readFontEntry( "list-font", &listFont ); setFont( listFont ); mNewFont = config->readFontEntry( "list-new-font", &listFont ); mUnreadFont = config->readFontEntry( "list-unread-font", &listFont ); mImportantFont = config->readFontEntry( "list-important-font", &listFont ); mTodoFont = config->readFontEntry( "list-todo-font", &listFont ); - mDateFont = KGlobalSettings::fixedFont(); + mDateFont = TDEGlobalSettings::fixedFont(); mDateFont = config->readFontEntry( "list-date-font", &mDateFont ); } else { mNewFont= mUnreadFont = mImportantFont = mDateFont = mTodoFont = - KGlobalSettings::generalFont(); + TDEGlobalSettings::generalFont(); setFont( mDateFont ); } } @@ -2376,7 +2376,7 @@ void KMHeaders::contentsMouseReleaseEvent(TQMouseEvent* e) void KMHeaders::contentsMouseMoveEvent( TQMouseEvent* e ) { if (mMousePressed && - (e->pos() - mPressPos).manhattanLength() > KGlobalSettings::dndEventDelay()) { + (e->pos() - mPressPos).manhattanLength() > TDEGlobalSettings::dndEventDelay()) { mMousePressed = false; TQListViewItem *item = itemAt( contentsToViewport(mPressPos) ); if ( item ) { diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp index 2bcf6c2a..11e291ef 100644 --- a/kmail/kmkernel.cpp +++ b/kmail/kmkernel.cpp @@ -161,7 +161,7 @@ KMKernel::KMKernel (TQObject *parent, const char *name) : netCodec = TQTextCodec::codecForName("jis7"); // TQTextCodec *cdc = TQTextCodec::codecForName("jis7"); // TQTextCodec::setCodecForLocale(cdc); - // KGlobal::locale()->setEncoding(cdc->mibEnum()); + // TDEGlobal::locale()->setEncoding(cdc->mibEnum()); } else { netCodec = TQTextCodec::codecForLocale(); } diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h index 0b9aa51e..471a7740 100644 --- a/kmail/kmkernel.h +++ b/kmail/kmkernel.h @@ -57,7 +57,7 @@ namespace KPIM { class IdentityManager; } class KMKernel; -class KProcess; +class TDEProcess; class KProgressDialog; class TDEInstance; class TQTimer; diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index 33380686..622e70ad 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -555,7 +555,7 @@ void KMMainWidget::createWidgets(void) TQWidget *headerParent = 0, *mimeParent = 0, *messageParent = 0; - const bool opaqueResize = KGlobalSettings::opaqueResize(); + const bool opaqueResize = TDEGlobalSettings::opaqueResize(); if ( mLongFolderList ) { // superior splitter: folder tree vs. rest // inferior splitter: headers vs. message vs. mime tree @@ -678,7 +678,7 @@ void KMMainWidget::createWidgets(void) // create list of folders mFolderViewSplitter = new TQSplitter( Qt::Vertical, mFolderViewParent ); - mFolderViewSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() ); + mFolderViewSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); mFavoriteFolderView = new KMail::FavoriteFolderView( this, mFolderViewSplitter ); if ( mFavoritesCheckMailAction ) connect( mFavoritesCheckMailAction, TQT_SIGNAL(activated()), mFavoriteFolderView, TQT_SLOT(checkMail()) ); @@ -1762,17 +1762,17 @@ void KMMainWidget::slotDebugSieve() //----------------------------------------------------------------------------- void KMMainWidget::slotStartCertManager() { - KProcess certManagerProc; // save to create on the heap, since + TDEProcess certManagerProc; // save to create on the heap, since // there is no parent certManagerProc << "kleopatra"; - if( !certManagerProc.start( KProcess::DontCare ) ) + if( !certManagerProc.start( TDEProcess::DontCare ) ) KMessageBox::error( this, i18n( "Could not start certificate manager; " "please check your installation." ), i18n( "KMail Error" ) ); else kdDebug(5006) << "\nslotStartCertManager(): certificate manager started.\n" << endl; - // process continues to run even after the KProcess object goes + // process continues to run even after the TDEProcess object goes // out of scope here, since it is started in DontCare run mode. } @@ -1780,10 +1780,10 @@ void KMMainWidget::slotStartCertManager() //----------------------------------------------------------------------------- void KMMainWidget::slotStartWatchGnuPG() { - KProcess certManagerProc; + TDEProcess certManagerProc; certManagerProc << "kwatchgnupg"; - if( !certManagerProc.start( KProcess::DontCare ) ) + if( !certManagerProc.start( TDEProcess::DontCare ) ) KMessageBox::error( this, i18n( "Could not start GnuPG LogViewer (kwatchgnupg); " "please check your installation." ), i18n( "KMail Error" ) ); diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp index 9ad91070..6f7d2b12 100644 --- a/kmail/kmmessage.cpp +++ b/kmail/kmmessage.cpp @@ -4038,7 +4038,7 @@ void KMMessage::readConfig() { // area for config group "KMMessage #n" KConfigGroupSaver saver(config, TQString("KMMessage #%1").arg(languageNr)); - sReplyLanguage = config->readEntry("language",KGlobal::locale()->language()); + sReplyLanguage = config->readEntry("language",TDEGlobal::locale()->language()); sReplyStr = config->readEntry("phrase-reply", i18n("On %D, you wrote:")); sReplyAllStr = config->readEntry("phrase-reply-all", diff --git a/kmail/kmmsgbase.cpp b/kmail/kmmsgbase.cpp index 6a5a1057..3cd4f658 100644 --- a/kmail/kmmsgbase.cpp +++ b/kmail/kmmsgbase.cpp @@ -576,7 +576,7 @@ const TQTextCodec* KMMsgBase::codecForName(const TQCString& _str) if (_str.isEmpty()) return 0; TQCString codec = _str; KPIM::kAsciiToLower(codec.data()); - return KGlobal::charsets()->codecForName(codec); + return TDEGlobal::charsets()->codecForName(codec); } @@ -600,23 +600,23 @@ TQCString KMMsgBase::toUsAscii(const TQString& _str, bool *ok) //----------------------------------------------------------------------------- TQStringList KMMsgBase::supportedEncodings(bool usAscii) { - TQStringList encodingNames = KGlobal::charsets()->availableEncodingNames(); + TQStringList encodingNames = TDEGlobal::charsets()->availableEncodingNames(); TQStringList encodings; TQMap mimeNames; for (TQStringList::Iterator it = encodingNames.begin(); it != encodingNames.end(); it++) { - TQTextCodec *codec = KGlobal::charsets()->codecForName(*it); + TQTextCodec *codec = TDEGlobal::charsets()->codecForName(*it); TQString mimeName = (codec) ? TQString(codec->mimeName()).lower() : (*it); if (mimeNames.find(mimeName) == mimeNames.end()) { - encodings.append(KGlobal::charsets()->languageForEncoding(*it) + encodings.append(TDEGlobal::charsets()->languageForEncoding(*it) + " ( " + mimeName + " )"); mimeNames.insert(mimeName, true); } } encodings.sort(); - if (usAscii) encodings.prepend(KGlobal::charsets() + if (usAscii) encodings.prepend(TDEGlobal::charsets() ->languageForEncoding("us-ascii") + " ( us-ascii )"); return encodings; } diff --git a/kmail/kmmsgpart.cpp b/kmail/kmmsgpart.cpp index 447993db..596828e2 100644 --- a/kmail/kmmsgpart.cpp +++ b/kmail/kmmsgpart.cpp @@ -450,7 +450,7 @@ TQString KMMessagePart::iconName( int size ) const } fileName = - KGlobal::instance()->iconLoader()->iconPath( fileName, size ); + TDEGlobal::instance()->iconLoader()->iconPath( fileName, size ); return fileName; } diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index beb7c249..80d46120 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -394,7 +394,7 @@ void KMReaderWin::createWidgets() { mBox->setFrameStyle( mMimePartTree->frameStyle() ); mColorBar = new HtmlStatusBar( mBox, "mColorBar" ); mViewer = new KHTMLPart( mBox, "mViewer" ); - mSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() ); + mSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); mSplitter->setResizeMode( mMimePartTree, TQSplitter::KeepSize ); } @@ -1078,7 +1078,7 @@ void KMReaderWin::setOverrideEncoding( const TQString & encoding ) TQStringList encodings = mSelectEncodingAction->items(); uint i = 0; for ( TQStringList::const_iterator it = encodings.begin(), end = encodings.end(); it != end; ++it, ++i ) { - if ( KGlobal::charsets()->encodingForName( *it ) == encoding ) { + if ( TDEGlobal::charsets()->encodingForName( *it ) == encoding ) { mSelectEncodingAction->setCurrentItem( i ); break; } @@ -1117,7 +1117,7 @@ void KMReaderWin::slotSetEncoding() if ( mSelectEncodingAction->currentItem() == 0 ) // Auto mOverrideEncoding = TQString(); else - mOverrideEncoding = KGlobal::charsets()->encodingForName( mSelectEncodingAction->currentText() ); + mOverrideEncoding = TDEGlobal::charsets()->encodingForName( mSelectEncodingAction->currentText() ); update( true ); } @@ -2153,7 +2153,7 @@ void KMReaderWin::setMsgPart( KMMessagePart* aMsgPart, bool aHTML, iio->setFileName(aFileName); if( iio->read() ) { TQImage img = iio->image(); - TQRect desk = KGlobalSettings::desktopGeometry(mMainWindow); + TQRect desk = TDEGlobalSettings::desktopGeometry(mMainWindow); // determine a reasonable window size int width, height; if( img.width() < 50 ) @@ -2689,7 +2689,7 @@ bool KMReaderWin::eventFilter( TQObject *, TQEvent *e ) // notifications in case we started a drag ourselves slotUrlOn( linkForNode( mViewer->nodeUnderMouse() ) ); - if ( ( mLastClickPosition - me->pos() ).manhattanLength() > KGlobalSettings::dndEventDelay() ) { + if ( ( mLastClickPosition - me->pos() ).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) { if ( mCanStartDrag && ( !( mHoveredUrl.isEmpty() && mLastClickImagePath.isEmpty() ) ) ) { if ( URLHandlerManager::instance()->handleDrag( mHoveredUrl, mLastClickImagePath, this ) ) { mCanStartDrag = false; diff --git a/kmail/kmsearchpattern.cpp b/kmail/kmsearchpattern.cpp index 630c6f13..2c003e49 100644 --- a/kmail/kmsearchpattern.cpp +++ b/kmail/kmsearchpattern.cpp @@ -129,9 +129,9 @@ KMSearchRule * KMSearchRule::createInstanceFromConfig( const KConfig * config, i { const char cIdx = char( int('A') + aIdx ); - static const TQString & field = KGlobal::staticQString( "field" ); - static const TQString & func = KGlobal::staticQString( "func" ); - static const TQString & contents = KGlobal::staticQString( "contents" ); + static const TQString & field = TDEGlobal::staticQString( "field" ); + static const TQString & func = TDEGlobal::staticQString( "func" ); + static const TQString & contents = TDEGlobal::staticQString( "contents" ); const TQCString &field2 = config->readEntry( field + cIdx ).latin1(); Function func2 = configValueToFunc( config->readEntry( func + cIdx ).latin1() ); @@ -163,9 +163,9 @@ TQString KMSearchRule::functionToString( Function function ) void KMSearchRule::writeConfig( KConfig * config, int aIdx ) const { const char cIdx = char('A' + aIdx); - static const TQString & field = KGlobal::staticQString( "field" ); - static const TQString & func = KGlobal::staticQString( "func" ); - static const TQString & contents = KGlobal::staticQString( "contents" ); + static const TQString & field = TDEGlobal::staticQString( "field" ); + static const TQString & func = TDEGlobal::staticQString( "func" ); + static const TQString & contents = TDEGlobal::staticQString( "contents" ); config->writeEntry( field + cIdx, TQString(mField) ); config->writeEntry( func + cIdx, functionToString( mFunction ) ); diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp index 500cb7e7..a8953b6e 100644 --- a/kmail/kmsender.cpp +++ b/kmail/kmsender.cpp @@ -942,14 +942,14 @@ bool KMSendSendmail::doStart() { if (!mMailerProc) { - mMailerProc = new KProcess; + mMailerProc = new TDEProcess; assert(mMailerProc != 0); - connect(mMailerProc,TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(sendmailExited(KProcess*))); - connect(mMailerProc,TQT_SIGNAL(wroteStdin(KProcess*)), - this, TQT_SLOT(wroteStdin(KProcess*))); - connect(mMailerProc,TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), - this, TQT_SLOT(receivedStderr(KProcess*, char*, int))); + connect(mMailerProc,TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(sendmailExited(TDEProcess*))); + connect(mMailerProc,TQT_SIGNAL(wroteStdin(TDEProcess*)), + this, TQT_SLOT(wroteStdin(TDEProcess*))); + connect(mMailerProc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQT_SLOT(receivedStderr(TDEProcess*, char*, int))); } return true; } @@ -976,7 +976,7 @@ bool KMSendSendmail::doSend( const TQString & sender, const TQStringList & to, c mMsgStr = message; - if ( !mMailerProc->start( KProcess::NotifyOnExit, KProcess::All ) ) { + if ( !mMailerProc->start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) { KMessageBox::information( 0, i18n("Failed to execute mailer program %1") .arg( mSender->transportInfo()->host ) ); return false; @@ -989,7 +989,7 @@ bool KMSendSendmail::doSend( const TQString & sender, const TQStringList & to, c } -void KMSendSendmail::wroteStdin(KProcess *proc) +void KMSendSendmail::wroteStdin(TDEProcess *proc) { char* str; int len; @@ -1009,13 +1009,13 @@ void KMSendSendmail::wroteStdin(KProcess *proc) mMsgRest -= len; mMsgPos += len; mMailerProc->writeStdin(str,len); - // if code is added after writeStdin() KProcess probably initiates + // if code is added after writeStdin() TDEProcess probably initiates // a race condition. } } -void KMSendSendmail::receivedStderr(KProcess *proc, char *buffer, int buflen) +void KMSendSendmail::receivedStderr(TDEProcess *proc, char *buffer, int buflen) { assert(proc!=0); Q_UNUSED( proc ); @@ -1023,7 +1023,7 @@ void KMSendSendmail::receivedStderr(KProcess *proc, char *buffer, int buflen) } -void KMSendSendmail::sendmailExited(KProcess *proc) +void KMSendSendmail::sendmailExited(TDEProcess *proc) { assert(proc!=0); mSendOk = (proc->normalExit() && proc->exitStatus()==0); diff --git a/kmail/kmsender.h b/kmail/kmsender.h index e01cba08..478b941c 100644 --- a/kmail/kmsender.h +++ b/kmail/kmsender.h @@ -38,7 +38,7 @@ class KMMessage; class KMFolder; class KMFolderMgr; class KConfig; -class KProcess; +class TDEProcess; class KMSendProc; class KMSendSendmail; class KMSendSMTP; diff --git a/kmail/kmsender_p.h b/kmail/kmsender_p.h index 74520389..811eb559 100644 --- a/kmail/kmsender_p.h +++ b/kmail/kmsender_p.h @@ -12,7 +12,7 @@ #include #include -class KProcess; +class TDEProcess; namespace KIO { class Job; @@ -95,9 +95,9 @@ public: void abort(); protected slots: - void receivedStderr(KProcess*,char*,int); - void wroteStdin(KProcess*); - void sendmailExited(KProcess*); + void receivedStderr(TDEProcess*,char*,int); + void wroteStdin(TDEProcess*); + void sendmailExited(TDEProcess*); private: /** implemented from KMSendProc */ @@ -111,7 +111,7 @@ private: TQByteArray mMsgStr; char* mMsgPos; int mMsgRest; - KProcess* mMailerProc; + TDEProcess* mMailerProc; }; //----------------------------------------------------------------------------- diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp index 4069aaa7..6c041b0f 100644 --- a/kmail/kmstartup.cpp +++ b/kmail/kmstartup.cpp @@ -250,8 +250,8 @@ void insertLibraryCataloguesAndIcons() { "libkmime" }; - KLocale * l = KGlobal::locale(); - KIconLoader * il = KGlobal::iconLoader(); + KLocale * l = TDEGlobal::locale(); + KIconLoader * il = TDEGlobal::iconLoader(); for ( unsigned int i = 0 ; i < sizeof catalogues / sizeof *catalogues ; ++i ) { l->insertCatalogue( catalogues[i] ); il->addAppDir( catalogues[i] ); diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp index d36bd3e9..4c432a51 100644 --- a/kmail/kmsystemtray.cpp +++ b/kmail/kmsystemtray.cpp @@ -193,7 +193,7 @@ void KMSystemTray::updateCount() int oldPixmapHeight = pixmap()->size().height(); TQString countString = TQString::number( mCount ); - TQFont countFont = KGlobalSettings::generalFont(); + TQFont countFont = TDEGlobalSettings::generalFont(); countFont.setBold(true); // decrease the size of the font for the number of unread messages if the diff --git a/kmail/managesievescriptsdialog.cpp b/kmail/managesievescriptsdialog.cpp index 3af5d742..0c972130 100644 --- a/kmail/managesievescriptsdialog.cpp +++ b/kmail/managesievescriptsdialog.cpp @@ -320,7 +320,7 @@ KMail::SieveEditor::SieveEditor( TQWidget * parent, const char * name ) mTextEdit->setFocus(); mTextEdit->setTextFormat( TQTextEdit::PlainText ); mTextEdit->setWordWrap( TQTextEdit::NoWrap ); - mTextEdit->setFont( KGlobalSettings::fixedFont() ); + mTextEdit->setFont( TDEGlobalSettings::fixedFont() ); connect( mTextEdit, TQT_SIGNAL( textChanged () ), TQT_SLOT( slotTextChanged() ) ); resize( 3 * sizeHint() ); } diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp index 0b974a53..fe0592d5 100644 --- a/kmail/objecttreeparser.cpp +++ b/kmail/objecttreeparser.cpp @@ -733,7 +733,7 @@ namespace KMail { void ObjectTreeParser::writeDecryptionInProgressBlock() { assert( mReader ); // PENDING(marc) find an animated icon here: - //const TQString iconName = KGlobal::instance()->iconLoader()->iconPath( "decrypted", KIcon::Small ); + //const TQString iconName = TDEGlobal::instance()->iconLoader()->iconPath( "decrypted", KIcon::Small ); const TQString decryptedData = i18n("Encrypted data not shown"); PartMetaData messagePart; messagePart.isDecryptable = true; @@ -749,7 +749,7 @@ void ObjectTreeParser::writeDecryptionInProgressBlock() { void ObjectTreeParser::writeDeferredDecryptionBlock() { assert( mReader ); - const TQString iconName = KGlobal::instance()->iconLoader()->iconPath( "decrypted", KIcon::Small ); + const TQString iconName = TDEGlobal::instance()->iconLoader()->iconPath( "decrypted", KIcon::Small ); const TQString decryptedData = "
" + i18n("This message is encrypted.") + @@ -2010,7 +2010,7 @@ bool ObjectTreeParser::processApplicationMsTnefSubtype( partNode *node, ProcessR TQString href = "file:" + KURL::encode_string( dir + TQDir::separator() + att->name() ); KMimeType::Ptr mimeType = KMimeType::mimeType( att->mimeTag() ); - TQString iconName = KGlobal::instance()->iconLoader()->iconPath( mimeType->icon( TQString(), false ), KIcon::Desktop ); + TQString iconName = TDEGlobal::instance()->iconLoader()->iconPath( mimeType->icon( TQString(), false ), KIcon::Desktop ); htmlWriter()->queue( "
" + label + @@ -2563,7 +2563,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, .arg( keyWithWithoutURL ); else htmlStr += i18n( "Message was signed on %1 with key %2." ) - .arg( KGlobal::locale()->formatDateTime( created ), + .arg( TDEGlobal::locale()->formatDateTime( created ), keyWithWithoutURL ); } else { @@ -2572,7 +2572,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, .arg( keyWithWithoutURL ); else htmlStr += i18n( "Message was signed by %3 on %1 with key %2" ) - .arg( KGlobal::locale()->formatDateTime( created ), + .arg( TDEGlobal::locale()->formatDateTime( created ), keyWithWithoutURL, signer ); } @@ -2621,7 +2621,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, TQDateTime created = block.creationTime; if ( created.isValid() ) htmlStr += i18n( "Message was signed on %1 with unknown key %2." ) - .arg( KGlobal::locale()->formatDateTime( created ), + .arg( TDEGlobal::locale()->formatDateTime( created ), keyWithWithoutURL ); else htmlStr += i18n( "Message was signed with unknown key %1." ) @@ -2997,11 +2997,11 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate ) // Cache Icons if ( mCollapseIcon.isEmpty() ) { mCollapseIcon= LinkLocator::pngToDataUrl( - KGlobal::instance()->iconLoader()->iconPath( "quotecollapse",0 )); + TDEGlobal::instance()->iconLoader()->iconPath( "quotecollapse",0 )); } if ( mExpandIcon.isEmpty() ) mExpandIcon= LinkLocator::pngToDataUrl( - KGlobal::instance()->iconLoader()->iconPath( "quoteexpand",0 )); + TDEGlobal::instance()->iconLoader()->iconPath( "quoteexpand",0 )); } for (unsigned int p=0; pmEdit, TQT_SIGNAL( completionModeChanged( KGlobalSettings::Completion ) ), - TQT_SLOT( setCompletionMode( KGlobalSettings::Completion ) ) ); + connect( line->mEdit, TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ), + TQT_SLOT( setCompletionMode( TDEGlobalSettings::Completion ) ) ); if ( mLines.last() ) { if ( mLines.count() == 1 ) { @@ -586,7 +586,7 @@ Recipient::List RecipientsView::recipients() const return recipients; } -void RecipientsView::setCompletionMode ( KGlobalSettings::Completion mode ) +void RecipientsView::setCompletionMode ( TDEGlobalSettings::Completion mode ) { if ( mCompletionMode == mode ) return; @@ -847,8 +847,8 @@ RecipientsEditor::RecipientsEditor( TQWidget *parent ) topLayout->addWidget( mRecipientsView ); connect( mRecipientsView, TQT_SIGNAL( focusUp() ), TQT_SIGNAL( focusUp() ) ); connect( mRecipientsView, TQT_SIGNAL( focusDown() ), TQT_SIGNAL( focusDown() ) ); - connect( mRecipientsView, TQT_SIGNAL( completionModeChanged( KGlobalSettings::Completion ) ), - TQT_SIGNAL( completionModeChanged( KGlobalSettings::Completion ) ) ); + connect( mRecipientsView, TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ), + TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ) ); mSideWidget = new SideWidget( mRecipientsView, this ); topLayout->addWidget( mSideWidget ); @@ -993,7 +993,7 @@ void RecipientsEditor::selectRecipients() mSideWidget->pickRecipient(); } -void RecipientsEditor::setCompletionMode( KGlobalSettings::Completion mode ) +void RecipientsEditor::setCompletionMode( TDEGlobalSettings::Completion mode ) { mRecipientsView->setCompletionMode( mode ); } diff --git a/kmail/recipientseditor.h b/kmail/recipientseditor.h index aadf25bc..d02a1be5 100644 --- a/kmail/recipientseditor.h +++ b/kmail/recipientseditor.h @@ -212,7 +212,7 @@ class RecipientsView : public TQScrollView int setFirstColumnWidth( int ); public slots: - void setCompletionMode( KGlobalSettings::Completion ); + void setCompletionMode( TDEGlobalSettings::Completion ); RecipientLine *addLine(); void setFocus(); @@ -224,7 +224,7 @@ class RecipientsView : public TQScrollView void focusUp(); void focusDown(); void focusRight(); - void completionModeChanged( KGlobalSettings::Completion ); + void completionModeChanged( TDEGlobalSettings::Completion ); void sizeHintChanged(); protected: @@ -247,7 +247,7 @@ class RecipientsView : public TQScrollView int mLineHeight; int mFirstColumnWidth; bool mModified; - KGlobalSettings::Completion mCompletionMode; + TDEGlobalSettings::Completion mCompletionMode; }; class RecipientsToolTip : public TQToolTip @@ -344,7 +344,7 @@ class RecipientsEditor : public TQWidget /** * Set completion mode for all lines */ - void setCompletionMode( KGlobalSettings::Completion ); + void setCompletionMode( TDEGlobalSettings::Completion ); public slots: void setFocus(); @@ -357,7 +357,7 @@ class RecipientsEditor : public TQWidget signals: void focusUp(); void focusDown(); - void completionModeChanged( KGlobalSettings::Completion ); + void completionModeChanged( TDEGlobalSettings::Completion ); void sizeHintChanged(); protected slots: diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp index d6181a08..de577a7c 100644 --- a/kmail/recipientspicker.cpp +++ b/kmail/recipientspicker.cpp @@ -63,7 +63,7 @@ void RecipientItem::setDistributionList( KPIM::DistributionList &list ) { mDistributionList = list; - mIcon = KGlobal::iconLoader()->loadIcon( "tdmconfig", KIcon::Small ); + mIcon = TDEGlobal::iconLoader()->loadIcon( "tdmconfig", KIcon::Small ); mName = list.name(); mKey = list.name(); @@ -80,7 +80,7 @@ void RecipientItem::setDistributionList( KABC::DistributionList *list ) { mDistributionList = list; - mIcon = KGlobal::iconLoader()->loadIcon( "tdmconfig", KIcon::Small ); + mIcon = TDEGlobal::iconLoader()->loadIcon( "tdmconfig", KIcon::Small ); mName = list->name(); mKey = list->name(); @@ -105,7 +105,7 @@ void RecipientItem::setAddressee( const KABC::Addressee &a, if ( !img.isNull() ) mIcon = img.smoothScale( 20, 20, TQ_ScaleMin ); else - mIcon = KGlobal::iconLoader()->loadIcon( "personal", KIcon::Small ); + mIcon = TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Small ); mName = mAddressee.realName(); mKey = mAddressee.realName() + '|' + mEmail; @@ -372,7 +372,7 @@ RecipientsPicker::RecipientsPicker( TQWidget *parent ) TQBoxLayout *searchLayout = new TQHBoxLayout( topLayout ); TQToolButton *button = new TQToolButton( this ); - button->setIconSet( KGlobal::iconLoader()->loadIconSet( + button->setIconSet( TDEGlobal::iconLoader()->loadIconSet( TDEApplication::reverseLayout() ? "clear_left":"locationbar_erase", KIcon::Small, 0 ) ); searchLayout->addWidget( button ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( resetSearch() ) ); @@ -810,7 +810,7 @@ void RecipientsPicker::keyPressEvent( TQKeyEvent *ev ) void RecipientsPicker::readConfig() { - KConfig *cfg = KGlobal::config(); + KConfig *cfg = TDEGlobal::config(); cfg->setGroup( "RecipientsPicker" ); TQSize size = cfg->readSizeEntry( "Size" ); if ( !size.isEmpty() ) { @@ -825,7 +825,7 @@ void RecipientsPicker::readConfig() void RecipientsPicker::writeConfig() { - KConfig *cfg = KGlobal::config(); + KConfig *cfg = TDEGlobal::config(); cfg->setGroup( "RecipientsPicker" ); cfg->writeEntry( "Size", size() ); cfg->writeEntry( "CurrentCollection", mCollectionCombo->currentItem() ); diff --git a/kmail/signatureconfigurator.cpp b/kmail/signatureconfigurator.cpp index 1239e65d..3451fb48 100644 --- a/kmail/signatureconfigurator.cpp +++ b/kmail/signatureconfigurator.cpp @@ -105,7 +105,7 @@ namespace KMail { TQWhatsThis::add(mTextEdit, i18n("Use this field to enter an arbitrary static signature.")); widgetStack->addWidget( mTextEdit, pageno ); - mTextEdit->setFont( KGlobalSettings::fixedFont() ); + mTextEdit->setFont( TDEGlobalSettings::fixedFont() ); mTextEdit->setWordWrap( TQTextEdit::NoWrap ); mTextEdit->setTextFormat( TQt::PlainText ); diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp index 31046023..9f9a80cd 100644 --- a/kmail/templateparser.cpp +++ b/kmail/templateparser.cpp @@ -702,21 +702,21 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) kdDebug() << "Command: DATESHORT" << endl; i += strlen( "DATESHORT" ); TQDateTime date = TQDateTime::currentDateTime(); - TQString str = KGlobal::locale()->formatDate( date.date(), true ); + TQString str = TDEGlobal::locale()->formatDate( date.date(), true ); body.append( str ); } else if ( cmd.startsWith( "DATE" ) ) { kdDebug() << "Command: DATE" << endl; i += strlen( "DATE" ); TQDateTime date = TQDateTime::currentDateTime(); - TQString str = KGlobal::locale()->formatDate( date.date(), false ); + TQString str = TDEGlobal::locale()->formatDate( date.date(), false ); body.append( str ); } else if ( cmd.startsWith( "DOW" ) ) { kdDebug() << "Command: DOW" << endl; i += strlen( "DOW" ); TQDateTime date = TQDateTime::currentDateTime(); - TQString str = KGlobal::locale()->calendar()->weekDayName( date.date(), false ); + TQString str = TDEGlobal::locale()->calendar()->weekDayName( date.date(), false ); body.append( str ); } else if ( cmd.startsWith( "TIMELONGEN" ) ) { @@ -731,14 +731,14 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) kdDebug() << "Command: TIMELONG" << endl; i += strlen( "TIMELONG" ); TQDateTime date = TQDateTime::currentDateTime(); - TQString str = KGlobal::locale()->formatTime( date.time(), true ); + TQString str = TDEGlobal::locale()->formatTime( date.time(), true ); body.append( str ); } else if ( cmd.startsWith( "TIME" ) ) { kdDebug() << "Command: TIME" << endl; i += strlen( "TIME" ); TQDateTime date = TQDateTime::currentDateTime(); - TQString str = KGlobal::locale()->formatTime( date.time(), false ); + TQString str = TDEGlobal::locale()->formatTime( date.time(), false ); body.append( str ); } else if ( cmd.startsWith( "ODATEEN" ) ) { @@ -758,7 +758,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) if ( mOrigMsg ) { TQDateTime date; date.setTime_t( mOrigMsg->date() ); - TQString str = KGlobal::locale()->formatDate( date.date(), true ); + TQString str = TDEGlobal::locale()->formatDate( date.date(), true ); body.append( str ); } @@ -768,7 +768,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) if ( mOrigMsg ) { TQDateTime date; date.setTime_t( mOrigMsg->date() ); - TQString str = KGlobal::locale()->formatDate( date.date(), false ); + TQString str = TDEGlobal::locale()->formatDate( date.date(), false ); body.append( str ); } @@ -778,7 +778,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) if ( mOrigMsg ) { TQDateTime date; date.setTime_t( mOrigMsg->date() ); - TQString str = KGlobal::locale()->calendar()->weekDayName( date.date(), false ); + TQString str = TDEGlobal::locale()->calendar()->weekDayName( date.date(), false ); body.append( str ); } @@ -799,7 +799,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) if ( mOrigMsg ) { TQDateTime date; date.setTime_t( mOrigMsg->date() ); - TQString str = KGlobal::locale()->formatTime( date.time(), true ); + TQString str = TDEGlobal::locale()->formatTime( date.time(), true ); body.append( str ); } @@ -809,7 +809,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) if ( mOrigMsg ) { TQDateTime date; date.setTime_t( mOrigMsg->date() ); - TQString str = KGlobal::locale()->formatTime( date.time(), false ); + TQString str = TDEGlobal::locale()->formatTime( date.time(), false ); body.append( str ); } @@ -1118,21 +1118,21 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf ) mPipeErr = ""; mPipeRc = 0; - KProcess proc; + TDEProcess proc; TQCString data = buf.local8Bit(); // kdDebug() << "Command data: " << data << endl; proc << KShell::splitArgs( cmd, KShell::TildeExpand ); proc.setUseShell( true ); - connect( &proc, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ), - this, TQT_SLOT( onReceivedStdout( KProcess *, char *, int ) ) ); - connect( &proc, TQT_SIGNAL( receivedStderr( KProcess *, char *, int ) ), - this, TQT_SLOT( onReceivedStderr( KProcess *, char *, int ) ) ); - connect( &proc, TQT_SIGNAL( wroteStdin( KProcess * ) ), - this, TQT_SLOT( onWroteStdin( KProcess * ) ) ); + connect( &proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQT_SLOT( onReceivedStdout( TDEProcess *, char *, int ) ) ); + connect( &proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQT_SLOT( onReceivedStderr( TDEProcess *, char *, int ) ) ); + connect( &proc, TQT_SIGNAL( wroteStdin( TDEProcess * ) ), + this, TQT_SLOT( onWroteStdin( TDEProcess * ) ) ); - if ( proc.start( KProcess::NotifyOnExit, KProcess::All ) ) { + if ( proc.start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) { bool pipe_filled = proc.writeStdin( data, data.length() ); if ( pipe_filled ) { @@ -1208,25 +1208,25 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf ) return mPipeOut; } -void TemplateParser::onProcessExited( KProcess *proc ) +void TemplateParser::onProcessExited( TDEProcess *proc ) { Q_UNUSED( proc ); // do nothing for now } -void TemplateParser::onReceivedStdout( KProcess *proc, char *buffer, int buflen ) +void TemplateParser::onReceivedStdout( TDEProcess *proc, char *buffer, int buflen ) { Q_UNUSED( proc ); mPipeOut += TQString::fromLocal8Bit( buffer, buflen ); } -void TemplateParser::onReceivedStderr( KProcess *proc, char *buffer, int buflen ) +void TemplateParser::onReceivedStderr( TDEProcess *proc, char *buffer, int buflen ) { Q_UNUSED( proc ); mPipeErr += TQString::fromLocal8Bit( buffer, buflen ); } -void TemplateParser::onWroteStdin( KProcess *proc ) +void TemplateParser::onWroteStdin( TDEProcess *proc ) { proc->closeStdin(); } diff --git a/kmail/templateparser.h b/kmail/templateparser.h index da6a5234..c7551c0f 100644 --- a/kmail/templateparser.h +++ b/kmail/templateparser.h @@ -27,7 +27,7 @@ class KMMessage; class TQString; class KMFolder; class TQObject; -class KProcess; +class TDEProcess; /** * The TemplateParser transforms a message with a given template. @@ -163,10 +163,10 @@ class TemplateParser : public TQObject TQString "e ) const; protected slots: - void onProcessExited( KProcess *proc ); - void onReceivedStdout( KProcess *proc, char *buffer, int buflen ); - void onReceivedStderr( KProcess *proc, char *buffer, int buflen ); - void onWroteStdin( KProcess *proc ); + void onProcessExited( TDEProcess *proc ); + void onReceivedStdout( TDEProcess *proc, char *buffer, int buflen ); + void onReceivedStderr( TDEProcess *proc, char *buffer, int buflen ); + void onWroteStdin( TDEProcess *proc ); }; #endif // __KMAIL_TEMPLATEPARSER_H__ diff --git a/kmail/templatesconfiguration.cpp b/kmail/templatesconfiguration.cpp index 8b4f37e8..93e831fa 100644 --- a/kmail/templatesconfiguration.cpp +++ b/kmail/templatesconfiguration.cpp @@ -41,7 +41,7 @@ TemplatesConfiguration::TemplatesConfiguration( TQWidget *parent, const char *name ) :TemplatesConfigurationBase( parent, name ) { - TQFont f = KGlobalSettings::fixedFont(); + TQFont f = TDEGlobalSettings::fixedFont(); textEdit_new->setFont( f ); textEdit_reply->setFont( f ); textEdit_reply_all->setFont( f ); diff --git a/kmail/urlhandlermanager.cpp b/kmail/urlhandlermanager.cpp index ad9c22eb..8e72b8ab 100644 --- a/kmail/urlhandlermanager.cpp +++ b/kmail/urlhandlermanager.cpp @@ -548,9 +548,9 @@ namespace { TQString displayName, libName, keyId; if ( !foundSMIMEData( url.path() + '#' + url.ref(), displayName, libName, keyId ) ) return false; - KProcess cmp; + TDEProcess cmp; cmp << "kleopatra" << "-query" << keyId; - if ( !cmp.start( KProcess::DontCare ) ) + if ( !cmp.start( TDEProcess::DontCare ) ) KMessageBox::error( w, i18n("Could not start certificate manager. " "Please check your installation."), i18n("KMail Error") ); diff --git a/kmail/vacation.cpp b/kmail/vacation.cpp index d3d374ae..a027c33b 100644 --- a/kmail/vacation.cpp +++ b/kmail/vacation.cpp @@ -573,7 +573,7 @@ namespace KMail { "\n" "Yours sincerely,\n" "-- \n") - .arg( KGlobal::locale()->formatDate( TQDate::currentDate().addDays( 1 ) ) ); + .arg( TDEGlobal::locale()->formatDate( TQDate::currentDate().addDays( 1 ) ) ); } int Vacation::defaultNotificationInterval() { diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp index 64b165ef..5279b78b 100644 --- a/kmail/xfaceconfigurator.cpp +++ b/kmail/xfaceconfigurator.cpp @@ -178,7 +178,7 @@ namespace KMail { mTextEdit = new TQTextEdit( page ); page_vlay->addWidget( mTextEdit ); TQWhatsThis::add( mTextEdit, i18n( "Use this field to enter an arbitrary X-Face string." ) ); - mTextEdit->setFont( KGlobalSettings::fixedFont() ); + mTextEdit->setFont( TDEGlobalSettings::fixedFont() ); mTextEdit->setWrapPolicy( TQTextEdit::Anywhere ); mTextEdit->setTextFormat( TQt::PlainText ); label2 = new KActiveLabel( i18n("Examples are available at http://www.xs4all.nl/~ace/X-Faces/."), page ); diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp index f212dc41..4c46b890 100644 --- a/kmobile/kmobile.cpp +++ b/kmobile/kmobile.cpp @@ -213,7 +213,7 @@ void KMobile::optionsConfigureKeys() void KMobile::optionsConfigureToolbars() { // use the standard toolbar editor - saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); + saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); } void KMobile::newToolbarConfig() @@ -222,7 +222,7 @@ void KMobile::newToolbarConfig() // recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.) createGUI(); - applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); + applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); } void KMobile::optionsPreferences() @@ -278,7 +278,7 @@ void KMobile::addDevice() TQString iconName = ptr->icon(); if (iconName.isEmpty()) iconName = KMOBILE_ICON_UNKNOWN; - TQPixmap pm = KGlobal::instance()->iconLoader()->loadIcon(iconName, KIcon::Desktop ); + TQPixmap pm = TDEGlobal::instance()->iconLoader()->loadIcon(iconName, KIcon::Desktop ); TQIconViewItem *item; item = new TQIconViewItem( dialog->iconView, ptr->name(), pm ); diff --git a/kmobile/kmobileitem.cpp b/kmobile/kmobileitem.cpp index d1e6c467..2471f667 100644 --- a/kmobile/kmobileitem.cpp +++ b/kmobile/kmobileitem.cpp @@ -98,7 +98,7 @@ bool KMobileItem::configLoad(int idx) TQPixmap KMobileItem::getIcon() const { - return KGlobal::instance()->iconLoader()->loadIcon(m_iconName, KIcon::Desktop ); + return TDEGlobal::instance()->iconLoader()->loadIcon(m_iconName, KIcon::Desktop ); } TQString KMobileItem::config_SectionName(int idx) const diff --git a/kmobile/kmobileview.cpp b/kmobile/kmobileview.cpp index 3770dc0d..89395bdd 100644 --- a/kmobile/kmobileview.cpp +++ b/kmobile/kmobileview.cpp @@ -100,7 +100,7 @@ KMobileItem *KMobileView::findDevice( const TQString &deviceName ) const bool KMobileView::startKonqueror( const TQString &devName ) { - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "kfmclient" << "openProfile" << "webbrowsing" << "mobile:/"+devName; return proc->start(); } diff --git a/kmobile/systemtray.cpp b/kmobile/systemtray.cpp index 7796a55b..9f15f055 100644 --- a/kmobile/systemtray.cpp +++ b/kmobile/systemtray.cpp @@ -38,7 +38,7 @@ SystemTray::SystemTray(KMainWindow *parent, const char *name) : KSystemTray(parent, name) { - m_appPix = KGlobal::instance()->iconLoader()->loadIcon("kmobile", KIcon::Small); + m_appPix = TDEGlobal::instance()->iconLoader()->loadIcon("kmobile", KIcon::Small); setPixmap(m_appPix); setToolTip(); @@ -72,7 +72,7 @@ void SystemTray::contextMenuAboutToShow(KPopupMenu *menu) for (unsigned int no=0; nomainView()->iconFileName(devName); - TQPixmap pm = KGlobal::instance()->iconLoader()->loadIcon(iconName, KIcon::Small); + TQPixmap pm = TDEGlobal::instance()->iconLoader()->loadIcon(iconName, KIcon::Small); menu->insertItem(pm, devName, SYSTEMTRAY_STARTID+no, 3+no); menu->connectItem(SYSTEMTRAY_STARTID+no, this, TQT_SLOT(menuItemSelected())); } diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp index 0f8291cf..b8b58fd6 100644 --- a/knode/articlewidget.cpp +++ b/knode/articlewidget.cpp @@ -192,7 +192,7 @@ void ArticleWidget::initActions() mCharsetSelect = new KSelectAction( i18n("Chars&et"), 0, mActionCollection, "set_charset" ); mCharsetSelect->setShortcutConfigurable( false ); - TQStringList cs = KGlobal::charsets()->descriptiveEncodingNames(); + TQStringList cs = TDEGlobal::charsets()->descriptiveEncodingNames(); cs.prepend( i18n("Automatic") ); mCharsetSelect->setItems( cs ); mCharsetSelect->setCurrentItem( 0 ); @@ -420,9 +420,9 @@ void ArticleWidget::displayArticle() TQStrListIterator npbit( nonPgpBlocks ); TQTextCodec *codec; if ( text ) - codec = KGlobal::charsets()->codecForName( text->contentType()->charset() ); + codec = TDEGlobal::charsets()->codecForName( text->contentType()->charset() ); else - codec = KGlobal::locale()->codecForEncoding(); + codec = TDEGlobal::locale()->codecForEncoding(); for( ; *pbit != 0; ++pbit, ++npbit ) { // handle non-pgp block @@ -607,7 +607,7 @@ void ArticleWidget::displayHeader() } } else if ( hb->is("Date") ) { KMime::Headers::Date *date=static_cast(hb); - headerHtml += toHtmlString( KGlobal::locale()->formatDateTime(date->qdt(), false, true), None ); + headerHtml += toHtmlString( TDEGlobal::locale()->formatDateTime(date->qdt(), false, true), None ); } else if ( hb->is("Newsgroups") ) { TQString groups = hb->asUnicodeString(); groups.replace( ',', ", " ); @@ -883,7 +883,7 @@ void ArticleWidget::displayAttachment( KMime::Content *att, int partNum ) TQCString mimetype = ct->mimeType(); KPIM::kAsciiToLower( mimetype.data() ); TQString iconName = KMimeType::mimeType( mimetype )->icon( TQString(), false ); - TQString iconFile = KGlobal::instance()->iconLoader()->iconPath( iconName, KIcon::Desktop ); + TQString iconFile = TDEGlobal::instance()->iconLoader()->iconPath( iconName, KIcon::Desktop ); html += "
" + comment + "

"; @@ -949,7 +949,7 @@ bool ArticleWidget::canDecodeText( const TQCString &charset ) const if ( charset.isEmpty() ) return false; bool ok = true; - KGlobal::charsets()->codecForName( charset,ok ); + TDEGlobal::charsets()->codecForName( charset,ok ); return ok; } @@ -1373,7 +1373,7 @@ void ArticleWidget::slotSetCharset( const TQString &charset ) mOverrideCharset = KMime::Headers::Latin1; } else { mForceCharset = true; - mOverrideCharset = KGlobal::charsets()->encodingForName( charset ).latin1(); + mOverrideCharset = TDEGlobal::charsets()->encodingForName( charset ).latin1(); } if ( mArticle && mArticle->hasContent() ) { diff --git a/knode/knarticlefactory.cpp b/knode/knarticlefactory.cpp index c260208e..d3240bbf 100644 --- a/knode/knarticlefactory.cpp +++ b/knode/knarticlefactory.cpp @@ -212,7 +212,7 @@ void KNArticleFactory::createReply(KNRemoteArticle *a, TQString selectedText, bo name = TQString::fromLatin1(a->from()->email()); attribution.replace(TQRegExp("%NAME"),name); attribution.replace(TQRegExp("%EMAIL"),TQString::fromLatin1(a->from()->email())); - attribution.replace(TQRegExp("%DATE"),KGlobal::locale()->formatDateTime(a->date()->qdt(),false)); + attribution.replace(TQRegExp("%DATE"),TDEGlobal::locale()->formatDateTime(a->date()->qdt(),false)); attribution.replace(TQRegExp("%MSID"),a->messageID()->asUnicodeString()); attribution.replace(TQRegExp("%GROUP"),g->groupname()); attribution.replace(TQRegExp("%L"),"\n"); diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp index 4ea5b2ed..ec6e61b1 100644 --- a/knode/kncomposer.cpp +++ b/knode/kncomposer.cpp @@ -840,9 +840,9 @@ bool KNComposer::applyChanges() TQString tmpText = tmp; Kpgp::Block block; bool ok=true; - TQTextCodec *codec=KGlobal::charsets()->codecForName(c_harset, ok); + TQTextCodec *codec=TDEGlobal::charsets()->codecForName(c_harset, ok); if(!ok) // no suitable codec found => try local settings and hope the best ;-) - codec=KGlobal::locale()->codecForEncoding(); + codec=TDEGlobal::locale()->codecForEncoding(); block.setText( codec->fromUnicode(tmpText) ); kdDebug(5003) << "signing article from " << article()->from()->email() << endl; @@ -964,7 +964,7 @@ void KNComposer::insertFile(TQFile *file, bool clear, bool box, TQString boxTitl { TQString temp; bool ok=true; - TQTextCodec *codec=KGlobal::charsets()->codecForName(c_harset, ok); + TQTextCodec *codec=TDEGlobal::charsets()->codecForName(c_harset, ok); TQTextStream ts(file); ts.setCodec(codec); @@ -1264,7 +1264,7 @@ void KNComposer::slotExternalEditor() } bool ok=true; - TQTextCodec *codec=KGlobal::charsets()->codecForName(c_harset, ok); + TQTextCodec *codec=TDEGlobal::charsets()->codecForName(c_harset, ok); TQString tmp; TQStringList textLines = v_iew->e_dit->processedText(); @@ -1287,7 +1287,7 @@ void KNComposer::slotExternalEditor() return; } - e_xternalEditor=new KProcess(); + e_xternalEditor=new TDEProcess(); // construct command line... TQStringList command = TQStringList::split(' ',editorCommand); @@ -1302,7 +1302,7 @@ void KNComposer::slotExternalEditor() if(!filenameAdded) // no %f in the editor command (*e_xternalEditor) << e_ditorTempfile->name(); - connect(e_xternalEditor, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(slotEditorFinished(KProcess *))); + connect(e_xternalEditor, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotEditorFinished(TDEProcess *))); if(!e_xternalEditor->start()) { KMessageBox::error(this, i18n("Unable to start external editor.\nPlease check your configuration in the settings dialog.")); delete e_xternalEditor; @@ -1520,7 +1520,7 @@ void KNComposer::slotGroupsBtnClicked() } -void KNComposer::slotEditorFinished(KProcess *) +void KNComposer::slotEditorFinished(TDEProcess *) { if(e_xternalEditor->normalExit()) { e_ditorTempfile->file()->close(); diff --git a/knode/kncomposer.h b/knode/kncomposer.h index 22b0b793..e41a40f1 100644 --- a/knode/kncomposer.h +++ b/knode/kncomposer.h @@ -31,7 +31,7 @@ class TQGroupBox; -class KProcess; +class TDEProcess; class KSpell; class KDictSpellingHighlighter; class KSelectAction; @@ -103,7 +103,7 @@ class KNComposer : public KMainWindow , virtual public KNodeComposerIface { //edit bool e_xternalEdited; - KProcess *e_xternalEditor; + TDEProcess *e_xternalEditor; KTempFile *e_ditorTempfile; KSpell *s_pellChecker; SpellingFilter* mSpellingFilter; @@ -160,7 +160,7 @@ class KNComposer : public KMainWindow , virtual public KNodeComposerIface { void slotGroupsBtnClicked(); // external editor - void slotEditorFinished(KProcess *); + void slotEditorFinished(TDEProcess *); void slotCancelEditor(); // attachment list diff --git a/knode/knconfig.cpp b/knode/knconfig.cpp index 2eecea7e..f8d9de39 100644 --- a/knode/knconfig.cpp +++ b/knode/knconfig.cpp @@ -131,17 +131,17 @@ TQString KNConfig::Identity::getSignature() else KMessageBox::error(knGlobals.topWidget, i18n("Cannot open the signature file.")); } else { - KProcess process; + TDEProcess process; // construct command line... TQStringList command = TQStringList::split(' ',s_igPath); for ( TQStringList::Iterator it = command.begin(); it != command.end(); ++it ) process << (*it); - connect(&process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), TQT_SLOT(slotReceiveStdout(KProcess *, char *, int))); - connect(&process, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), TQT_SLOT(slotReceiveStderr(KProcess *, char *, int))); + connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(slotReceiveStdout(TDEProcess *, char *, int))); + connect(&process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(slotReceiveStderr(TDEProcess *, char *, int))); - if (!process.start(KProcess::Block,KProcess::AllOutput)) + if (!process.start(TDEProcess::Block,TDEProcess::AllOutput)) KMessageBox::error(knGlobals.topWidget, i18n("Cannot run the signature generator.")); } } @@ -156,13 +156,13 @@ TQString KNConfig::Identity::getSignature() } -void KNConfig::Identity::slotReceiveStdout(KProcess *, char *buffer, int buflen) +void KNConfig::Identity::slotReceiveStdout(TDEProcess *, char *buffer, int buflen) { s_igContents.append(TQString::fromLocal8Bit(buffer,buflen)); } -void KNConfig::Identity::slotReceiveStderr(KProcess *, char *buffer, int buflen) +void KNConfig::Identity::slotReceiveStderr(TDEProcess *, char *buffer, int buflen) { s_igStdErr.append(TQString::fromLocal8Bit(buffer,buflen)); } @@ -242,18 +242,18 @@ KNConfig::Appearance::Appearance() //fonts u_seFonts = c->readBoolEntry("customFonts", false); - TQFont defFont=KGlobalSettings::generalFont(); + TQFont defFont=TDEGlobalSettings::generalFont(); f_onts[article]=c->readFontEntry("articleFont",&defFont); f_ontNames[article]=i18n("Article Body"); - defFont=KGlobalSettings::fixedFont(); + defFont=TDEGlobalSettings::fixedFont(); f_onts[articleFixed]=c->readFontEntry("articleFixedFont",&defFont); f_ontNames[articleFixed]=i18n("Article Body (Fixed)"); f_onts[composer]=c->readFontEntry("composerFont",&defFont); f_ontNames[composer]=i18n("Composer"); - defFont=KGlobalSettings::generalFont(); + defFont=TDEGlobalSettings::generalFont(); f_onts[groupList]=c->readFontEntry("groupListFont",&defFont); f_ontNames[groupList]=i18n("Group List"); @@ -261,7 +261,7 @@ KNConfig::Appearance::Appearance() f_ontNames[articleList]=i18n("Article List"); //icons - KGlobal::iconLoader()->addAppDir("knode"); + TDEGlobal::iconLoader()->addAppDir("knode"); recreateLVIcons(); i_cons[newFups] = UserIcon("newsubs"); i_cons[eyes] = UserIcon("eyes"); @@ -455,7 +455,7 @@ TQColor KNConfig::Appearance::defaultColor(int i) const return kapp->palette().active().base(); case alternateBackground: - return KGlobalSettings::alternateBackgroundColor(); + return TDEGlobalSettings::alternateBackgroundColor(); case quoted1: return TQColor( 0x00, 0x80, 0x00 ); @@ -469,7 +469,7 @@ TQColor KNConfig::Appearance::defaultColor(int i) const return kapp->palette().active().text(); case url: - return KGlobalSettings::linkColor(); + return TDEGlobalSettings::linkColor(); case readThread: return kapp->palette().disabled().text(); @@ -499,9 +499,9 @@ TQColor KNConfig::Appearance::defaultColor(int i) const TQFont KNConfig::Appearance::defaultFont(int i) const { if ( i == articleFixed || i == composer ) - return KGlobalSettings::fixedFont(); + return TDEGlobalSettings::fixedFont(); else - return KGlobalSettings::generalFont(); + return TDEGlobalSettings::generalFont(); } diff --git a/knode/knconfig.h b/knode/knconfig.h index b859f626..44a98559 100644 --- a/knode/knconfig.h +++ b/knode/knconfig.h @@ -27,7 +27,7 @@ #include class KScoringRule; -class KProcess; +class TDEProcess; class KSpellConfig; namespace Kpgp { class Config; @@ -114,8 +114,8 @@ Q_OBJECT protected slots: - void slotReceiveStdout(KProcess *proc, char *buffer, int buflen); - void slotReceiveStderr(KProcess *proc, char *buffer, int buflen); + void slotReceiveStdout(TDEProcess *proc, char *buffer, int buflen); + void slotReceiveStderr(TDEProcess *proc, char *buffer, int buflen); protected: TQString n_ame, diff --git a/knode/knconvert.cpp b/knode/knconvert.cpp index 8fdb4890..ba95e9a3 100644 --- a/knode/knconvert.cpp +++ b/knode/knconvert.cpp @@ -173,11 +173,11 @@ void KNConvert::slotStart() } TQString dataDir=locateLocal("data","knode/"); - t_ar=new KProcess; + t_ar=new TDEProcess; *t_ar << "tar"; *t_ar << "-cz" << dataDir << "-f" << b_ackupPath->text(); - connect(t_ar, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotTarExited(KProcess*))); + connect(t_ar, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotTarExited(TDEProcess*))); if(!t_ar->start()) { delete t_ar; t_ar = 0; @@ -206,7 +206,7 @@ void KNConvert::slotBrowse() } -void KNConvert::slotTarExited(KProcess *proc) +void KNConvert::slotTarExited(TDEProcess *proc) { bool success=true; diff --git a/knode/knconvert.h b/knode/knconvert.h index 49f8e701..59b23c9c 100644 --- a/knode/knconvert.h +++ b/knode/knconvert.h @@ -29,7 +29,7 @@ class TQWidgetStack; class TQCheckBox; class KLineEdit; -class KProcess; +class TDEProcess; class KDE_EXPORT KNConvert : public TQDialog { @@ -111,7 +111,7 @@ class KDE_EXPORT KNConvert : public TQDialog { TQStringList l_og; bool c_onversionDone; TQString v_ersion; - KProcess *t_ar; + TDEProcess *t_ar; void convert(); @@ -119,7 +119,7 @@ class KDE_EXPORT KNConvert : public TQDialog { void slotStart(); void slotCreateBkupToggled(bool b); void slotBrowse(); - void slotTarExited(KProcess *proc); + void slotTarExited(TDEProcess *proc); }; diff --git a/knode/kngroupdialog.cpp b/knode/kngroupdialog.cpp index 6807979b..4498898f 100644 --- a/knode/kngroupdialog.cpp +++ b/knode/kngroupdialog.cpp @@ -291,7 +291,7 @@ void KNGroupDialog::slotUser2() TQRadioButton *takeLast = new TQRadioButton( i18n("Created since last check:"), btnGrp ); topL->addMultiCellWidget(takeLast, 0, 0, 0, 1); - TQLabel *l = new TQLabel(KGlobal::locale()->formatDate(lastDate, false),btnGrp); + TQLabel *l = new TQLabel(TDEGlobal::locale()->formatDate(lastDate, false),btnGrp); topL->addWidget(l, 1, 1, TQt::AlignLeft); connect(takeLast, TQT_SIGNAL(toggled(bool)), l, TQT_SLOT(setEnabled(bool))); diff --git a/knode/kngroupmanager.cpp b/knode/kngroupmanager.cpp index 271a689d..92ed1666 100644 --- a/knode/kngroupmanager.cpp +++ b/knode/kngroupmanager.cpp @@ -677,7 +677,7 @@ void KNGroupManager::slotFetchGroupList(KNNntpAccount *a) d->path = a->path(); getSubscribed(a,d->subscribed); d->getDescriptions = a->fetchDescriptions(); - d->codecForDescriptions=KGlobal::charsets()->codecForName(knGlobals.configManager()->postNewsTechnical()->charset()); + d->codecForDescriptions=TDEGlobal::charsets()->codecForName(knGlobals.configManager()->postNewsTechnical()->charset()); emitJob( new KNJobData(KNJobData::JTFetchGroups, this, a, d) ); } @@ -691,7 +691,7 @@ void KNGroupManager::slotCheckForNewGroups(KNNntpAccount *a, TQDate date) getSubscribed(a,d->subscribed); d->getDescriptions = a->fetchDescriptions(); d->fetchSince = date; - d->codecForDescriptions=KGlobal::charsets()->codecForName(knGlobals.configManager()->postNewsTechnical()->charset()); + d->codecForDescriptions=TDEGlobal::charsets()->codecForName(knGlobals.configManager()->postNewsTechnical()->charset()); emitJob( new KNJobData(KNJobData::JTCheckNewGroups, this, a, d) ); } diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp index 7b7b5610..fa3b0478 100644 --- a/knode/knmainwidget.cpp +++ b/knode/knmainwidget.cpp @@ -810,7 +810,7 @@ void KNMainWidget::readOptions() a_ctArtSortHeaders->setCurrentItem( h_drView->sortColumn() ); resize(787,478); // default optimized for 800x600 - //applyMainWindowSettings(KGlobal::config(),"mainWindow_options"); + //applyMainWindowSettings(TDEGlobal::config(),"mainWindow_options"); // restore dock configuration manager()->readConfig(knGlobals.config(),"dock_configuration"); @@ -823,7 +823,7 @@ void KNMainWidget::saveOptions() conf->setGroup("APPEARANCE"); conf->writeEntry("quicksearch", q_uicksearch->isShown()); - //saveMainWindowSettings(KGlobal::config(),"mainWindow_options"); + //saveMainWindowSettings(TDEGlobal::config(),"mainWindow_options"); c_olView->writeConfig(); h_drView->writeConfig(); diff --git a/knode/knode.cpp b/knode/knode.cpp index 1af62747..6bb741c8 100644 --- a/knode/knode.cpp +++ b/knode/knode.cpp @@ -60,7 +60,7 @@ KNMainWindow::KNMainWindow( TQWidget* pWidget ) createGUI( "knodeui.rc" ); knGlobals.instance = 0; - applyMainWindowSettings(KGlobal::config(),"mainWindow_options"); + applyMainWindowSettings(TDEGlobal::config(),"mainWindow_options"); } KNMainWindow::~KNMainWindow() diff --git a/knode/knode_part.cpp b/knode/knode_part.cpp index 23bb3fba..4ada858c 100644 --- a/knode/knode_part.cpp +++ b/knode/knode_part.cpp @@ -60,10 +60,10 @@ KNodePart::KNodePart(TQWidget *parentWidget, const char *widgetName, kdDebug(5003) << "KNodePart()..." << endl; kdDebug(5003) << " InstanceName: " << kapp->instanceName() << endl; - KGlobal::locale()->insertCatalogue("libtdepim"); - KGlobal::locale()->insertCatalogue("libkpgp"); + TDEGlobal::locale()->insertCatalogue("libtdepim"); + TDEGlobal::locale()->insertCatalogue("libkpgp"); kapp->dcopClient()->suspend(); // Don't handle DCOP requests yet - KGlobal::iconLoader()->addAppDir("knode"); + TDEGlobal::iconLoader()->addAppDir("knode"); knGlobals.instance = KNodeFactory::instance(); // create a canvas to insert our widget diff --git a/knode/main.cpp b/knode/main.cpp index e433b543..663ddaac 100644 --- a/knode/main.cpp +++ b/knode/main.cpp @@ -37,8 +37,8 @@ int main(int argc, char* argv[]) return 0; KNApplication app; - KGlobal::locale()->insertCatalogue("libtdepim"); - KGlobal::locale()->insertCatalogue("libkpgp"); + TDEGlobal::locale()->insertCatalogue("libtdepim"); + TDEGlobal::locale()->insertCatalogue("libkpgp"); return app.exec(); } diff --git a/knode/utilities.cpp b/knode/utilities.cpp index 6d349336..4ed48ea9 100644 --- a/knode/utilities.cpp +++ b/knode/utilities.cpp @@ -311,7 +311,7 @@ void KNHelper::restoreWindowSize(const TQString &name, TQWidget *d, const TQSize TQSize s=c->readSizeEntry(name,&defaultSize); if(s.isValid()) { - TQRect max = KGlobalSettings::desktopGeometry(TQCursor::pos()); + TQRect max = TDEGlobalSettings::desktopGeometry(TQCursor::pos()); if ( s.width() > max.width() ) s.setWidth( max.width()-5 ); if ( s.height() > max.height() ) s.setHeight( max.height()-5 ); d->resize(s); diff --git a/knotes/knote.cpp b/knotes/knote.cpp index 72a75152..b68a342f 100644 --- a/knotes/knote.cpp +++ b/knotes/knote.cpp @@ -98,7 +98,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char * // (KOrganizer's journals don't have titles but a valid start date) if ( m_journal->summary().isNull() && m_journal->dtStart().isValid() ) { - TQString s = KGlobal::locale()->formatDateTime( m_journal->dtStart() ); + TQString s = TDEGlobal::locale()->formatDateTime( m_journal->dtStart() ); m_journal->setSummary( s ); } @@ -214,7 +214,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char * m_editor->cornerWidget()->setBackgroundMode( PaletteBase ); // the config file location - TQString configFile = KGlobal::dirs()->saveLocation( "appdata", "notes/" ); + TQString configFile = TDEGlobal::dirs()->saveLocation( "appdata", "notes/" ); configFile += m_journal->uid(); // no config file yet? -> use the default display config if available @@ -407,7 +407,7 @@ void KNote::slotKill( bool force ) delete m_config; m_config = 0; - TQString configFile = KGlobal::dirs()->saveLocation( "appdata", "notes/" ); + TQString configFile = TDEGlobal::dirs()->saveLocation( "appdata", "notes/" ); configFile += m_journal->uid(); if ( !KIO::NetAccess::del( KURL::fromPathOrURL( configFile ), this ) ) @@ -769,7 +769,7 @@ void KNote::slotClose() void KNote::slotInsDate() { - m_editor->insert( KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()) ); + m_editor->insert( TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()) ); } void KNote::slotSetAlarm() @@ -827,7 +827,7 @@ void KNote::slotMail() // get the mail action command const TQStringList cmd_list = TQStringList::split( TQChar(' '), KNotesGlobalConfig::mailAction() ); - KProcess mail; + TDEProcess mail; for ( TQStringList::ConstIterator it = cmd_list.constBegin(); it != cmd_list.constEnd(); ++it ) { @@ -839,7 +839,7 @@ void KNote::slotMail() mail << (*it).local8Bit(); } - if ( !mail.start( KProcess::DontCare ) ) + if ( !mail.start( TDEProcess::DontCare ) ) KMessageBox::sorry( this, i18n("Unable to start the mail process.") ); } diff --git a/knotes/knotebutton.cpp b/knotes/knotebutton.cpp index 0c7862b2..d3e571c0 100644 --- a/knotes/knotebutton.cpp +++ b/knotes/knotebutton.cpp @@ -39,7 +39,7 @@ KNoteButton::KNoteButton( const TQString& icon, TQWidget *parent, const char *na m_flat = true; if ( !icon.isEmpty() ) - setIconSet( KGlobal::iconLoader()->loadIconSet( icon, KIcon::Small, 10 ) ); + setIconSet( TDEGlobal::iconLoader()->loadIconSet( icon, KIcon::Small, 10 ) ); } KNoteButton::~KNoteButton() diff --git a/knotes/knoteconfig.kcfg b/knotes/knoteconfig.kcfg index c6449eec..09cd64dd 100644 --- a/knotes/knoteconfig.kcfg +++ b/knotes/knoteconfig.kcfg @@ -25,11 +25,11 @@ - KGlobalSettings::generalFont() + TDEGlobalSettings::generalFont() - KGlobalSettings::windowTitleFont() + TDEGlobalSettings::windowTitleFont() diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp index 25a57a42..9df09cf3 100644 --- a/knotes/knotesapp.cpp +++ b/knotes/knotesapp.cpp @@ -60,7 +60,7 @@ using namespace KNetwork; class KNotesKeyDialog : public KDialogBase { public: - KNotesKeyDialog( KGlobalAccel *globals, TQWidget *parent, const char* name = 0 ) + KNotesKeyDialog( TDEGlobalAccel *globals, TQWidget *parent, const char* name = 0 ) : KDialogBase( parent, name, true, i18n("Configure Shortcuts"), Default|Ok|Cancel, Ok ) { m_keyChooser = new KKeyChooser( globals, this ); @@ -147,7 +147,7 @@ KNotesApp::KNotesApp() m_noteGUI.setContent( doc ); // create accels for global shortcuts - m_globalAccel = new KGlobalAccel( TQT_TQOBJECT(this), "global accel" ); + m_globalAccel = new TDEGlobalAccel( TQT_TQOBJECT(this), "global accel" ); m_globalAccel->insert( "global_new_note", i18n("New Note"), "", ALT+SHIFT+Key_N, ALT+SHIFT+Key_N , TQT_TQOBJECT(this), TQT_SLOT(newNote()), true, true ); @@ -163,7 +163,7 @@ KNotesApp::KNotesApp() m_globalAccel->readSettings(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "Global Keybindings" ); m_globalAccel->setEnabled( config->readBoolEntry( "Enabled", true ) ); @@ -253,7 +253,7 @@ TQString KNotesApp::newNote( const TQString& name, const TQString& text ) if ( !name.isEmpty() ) journal->setSummary( name ); else - journal->setSummary( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); + journal->setSummary( TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); // the body of the note journal->setDescription( text ); diff --git a/knotes/knotesapp.h b/knotes/knotesapp.h index 9ec90442..66a3eea4 100644 --- a/knotes/knotesapp.h +++ b/knotes/knotesapp.h @@ -37,7 +37,7 @@ class KNote; class KPopupMenu; class KAction; class KActionMenu; -class KGlobalAccel; +class TDEGlobalAccel; class KXMLGUIFactory; class KXMLGUIBuilder; class KNotesAlarm; @@ -156,7 +156,7 @@ private: KPopupMenu *m_note_menu; KPopupMenu *m_context_menu; - KGlobalAccel *m_globalAccel; + TDEGlobalAccel *m_globalAccel; KXMLGUIFactory *m_guiFactory; KXMLGUIBuilder *m_guiBuilder; diff --git a/knotes/knoteslegacy.cpp b/knotes/knoteslegacy.cpp index 006e35cd..c7e79172 100644 --- a/knotes/knoteslegacy.cpp +++ b/knotes/knoteslegacy.cpp @@ -50,7 +50,7 @@ using namespace KCal; void KNotesLegacy::cleanUp() { // remove old (KDE 1.x) local config file if it still exists - TQString configfile = KGlobal::dirs()->saveLocation( "config" ) + "knotesrc"; + TQString configfile = TDEGlobal::dirs()->saveLocation( "config" ) + "knotesrc"; if ( TQFile::exists( configfile ) ) { KSimpleConfig *test = new KSimpleConfig( configfile ); test->setGroup( "General" ); @@ -71,7 +71,7 @@ bool KNotesLegacy::convert( CalendarLocal *calendar ) { bool converted = false; - TQDir noteDir( KGlobal::dirs()->saveLocation( "appdata", "notes/" ) ); + TQDir noteDir( TDEGlobal::dirs()->saveLocation( "appdata", "notes/" ) ); const TQStringList notes = noteDir.entryList( TQDir::Files, TQDir::Name ); for ( TQStringList::ConstIterator note = notes.constBegin(); note != notes.constEnd(); ++note ) { @@ -147,7 +147,7 @@ bool KNotesLegacy::convertKNotes1Config( Journal *journal, TQDir& noteDir, // set the defaults KIO::NetAccess::copy( - KURL( KGlobal::dirs()->saveLocation( "config" ) + "knotesrc" ), + KURL( TDEGlobal::dirs()->saveLocation( "config" ) + "knotesrc" ), KURL( configFile ), 0 ); diff --git a/knotes/knotesnetrecv.cpp b/knotes/knotesnetrecv.cpp index 2c683dd6..a843c47b 100644 --- a/knotes/knotesnetrecv.cpp +++ b/knotes/knotesnetrecv.cpp @@ -61,7 +61,7 @@ KNotesNetworkReceiver::KNotesNetworkReceiver( KBufferedSocket *s ) : TQObject(), m_buffer( new TQByteArray() ), m_sock( s ) { - TQString date = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true, false ); + TQString date = TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true, false ); // Add the remote IP or hostname and the date to the title, to help the // user guess who wrote it. diff --git a/knotes/resourcelocal.cpp b/knotes/resourcelocal.cpp index 53ea68ac..440b1454 100644 --- a/knotes/resourcelocal.cpp +++ b/knotes/resourcelocal.cpp @@ -49,7 +49,7 @@ ResourceLocal::ResourceLocal( const KConfig *config ) { kdDebug(5500) << "ResourceLocal::ResourceLocal()" << endl; setType( "file" ); - mURL = KGlobal::dirs()->saveLocation( "data", "knotes/" ) + "notes.ics"; + mURL = TDEGlobal::dirs()->saveLocation( "data", "knotes/" ) + "notes.ics"; if ( config ) { diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp index 5d2f3c62..4f513757 100644 --- a/kode/kodemain.cpp +++ b/kode/kodemain.cpp @@ -268,11 +268,11 @@ int addProperty( TDECmdLineArgs *args ) if ( args->isSet( "inplace" ) ) { TQString headerFileNameOut = headerFileName + ".kodeorig" ; - KProcess proc; + TDEProcess proc; proc << "cp" << TQFile::encodeName( headerFileName ).data() << TQFile::encodeName( headerFileNameOut ).data(); - if ( !proc.start( KProcess::Block ) ) { + if ( !proc.start( TDEProcess::Block ) ) { kdError() << "Copy failed" << endl; } else { kdDebug() << "Write to original file." << endl; diff --git a/konsolekalendar/konsolekalendarexports.cpp b/konsolekalendar/konsolekalendarexports.cpp index af371d07..9894ac96 100644 --- a/konsolekalendar/konsolekalendarexports.cpp +++ b/konsolekalendar/konsolekalendarexports.cpp @@ -79,15 +79,15 @@ bool KonsoleKalendarExports::exportAsTxt( TQTextStream *ts, // Print Event Date (in user's prefered format) *ts << i18n( "Date:" ) << "\t" - << KGlobal::locale()->formatDate( date ) + << TDEGlobal::locale()->formatDate( date ) << endl; // Print Event Starttime - Endtime, for Non-Floating Events Only if ( !event->doesFloat() ) { *ts << "\t" - << KGlobal::locale()->formatTime( event->dtStart().time() ) + << TDEGlobal::locale()->formatTime( event->dtStart().time() ) << " - " - << KGlobal::locale()->formatTime( event->dtEnd().time() ); + << TDEGlobal::locale()->formatTime( event->dtEnd().time() ); } *ts << endl; @@ -159,15 +159,15 @@ bool KonsoleKalendarExports::exportAsTxtShort( TQTextStream *ts, if ( !sameday ) { // If a new date, then Print the Event Date (in user's prefered format) - *ts << KGlobal::locale()->formatDate( date ) << ":" + *ts << TDEGlobal::locale()->formatDate( date ) << ":" << endl; } // Print Event Starttime - Endtime if ( !event->doesFloat() ) { - *ts << KGlobal::locale()->formatTime( event->dtStart().time() ) + *ts << TDEGlobal::locale()->formatTime( event->dtStart().time() ) << " - " - << KGlobal::locale()->formatTime( event->dtEnd().time() ); + << TDEGlobal::locale()->formatTime( event->dtEnd().time() ); } else { *ts << i18n( "[all day]\t" ); } @@ -222,14 +222,14 @@ bool KonsoleKalendarExports::exportAsCSV( TQTextStream *ts, TQString dquote = i18n( "\"" ); // character to use to quote CSV fields if ( !event->doesFloat() ) { - *ts << pF( KGlobal::locale()->formatDate( date ) ) - << delim << pF( KGlobal::locale()->formatTime( event->dtStart().time() ) ) - << delim << pF( KGlobal::locale()->formatDate( date ) ) - << delim << pF( KGlobal::locale()->formatTime( event->dtEnd().time() ) ); + *ts << pF( TDEGlobal::locale()->formatDate( date ) ) + << delim << pF( TDEGlobal::locale()->formatTime( event->dtStart().time() ) ) + << delim << pF( TDEGlobal::locale()->formatDate( date ) ) + << delim << pF( TDEGlobal::locale()->formatTime( event->dtEnd().time() ) ); } else { - *ts << pF( KGlobal::locale()->formatDate( date ) ) + *ts << pF( TDEGlobal::locale()->formatDate( date ) ) << delim << pF( "" ) - << delim << pF( KGlobal::locale()->formatDate( date ) ) + << delim << pF( TDEGlobal::locale()->formatDate( date ) ) << delim << pF( "" ); } diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp index bedd52c3..82f2bbbe 100644 --- a/kontact/interfaces/plugin.cpp +++ b/kontact/interfaces/plugin.cpp @@ -57,7 +57,7 @@ Plugin::Plugin( Kontact::Core *core, TQObject *parent, const char *name ) : KXMLGUIClient( core ), TQObject( parent, name ), d( new Private ) { core->factory()->addClient( this ); - KGlobal::locale()->insertCatalogue(name); + TDEGlobal::locale()->insertCatalogue(name); d->core = core; d->dcopClient = 0; diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp index 76b2b759..e878ce1c 100644 --- a/kontact/plugins/kmail/summarywidget.cpp +++ b/kontact/plugins/kmail/summarywidget.cpp @@ -48,7 +48,7 @@ SummaryWidget::SummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const c { TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 ); - TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kontact_mail", KIcon::Desktop, + TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_mail", KIcon::Desktop, KIcon::SizeMedium ); TQWidget *header = createHeader(this, icon, i18n("E-Mail")); mLayout = new TQGridLayout( 1, 3, 3 ); diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp index 0752ade0..725219f4 100644 --- a/kontact/plugins/knotes/knotes_part.cpp +++ b/kontact/plugins/knotes/knotes_part.cpp @@ -161,7 +161,7 @@ TQString KNotesPart::newNote( const TQString& name, const TQString& text ) if ( !name.isEmpty() ) journal->setSummary( name ); else - journal->setSummary( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); + journal->setSummary( TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); // the body of the note journal->setDescription( text ); diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h index a9eb11bd..91c198af 100644 --- a/kontact/plugins/knotes/knotes_part_p.h +++ b/kontact/plugins/knotes/knotes_part_p.h @@ -68,7 +68,7 @@ class KNotesIconViewItem : public KIconViewItem KIconEffect effect; TQColor color( journal->customProperty( "KNotes", "BgColor" ) ); - TQPixmap icon = KGlobal::iconLoader()->loadIcon( "knotes", KIcon::Desktop ); + TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "knotes", KIcon::Desktop ); icon = effect.apply( icon, KIconEffect::Colorize, 1, color, false ); setPixmap( icon ); setText( journal->summary() ); diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp index ec77cc50..0c643534 100644 --- a/kontact/plugins/knotes/knotetip.cpp +++ b/kontact/plugins/knotes/knotetip.cpp @@ -100,7 +100,7 @@ void KNoteTip::setNote( KNotesIconViewItem *item ) while ( w > 60 && h == mPreview->heightForWidth( w - 20 ) ) w -= 20; - TQRect desk = KGlobalSettings::desktopGeometry( mNoteIVI->rect().center() ); + TQRect desk = TDEGlobalSettings::desktopGeometry( mNoteIVI->rect().center() ); resize( w, TQMIN( h, desk.height() / 2 - 20 ) ); hide(); @@ -206,7 +206,7 @@ void KNoteTip::reposition() TQPoint pos = rect.center(); // should the tooltip be shown to the left or to the right of the ivi? - TQRect desk = KGlobalSettings::desktopGeometry( pos ); + TQRect desk = TDEGlobalSettings::desktopGeometry( pos ); if ( rect.center().x() + width() > desk.right() ) { // to the left if ( pos.x() - width() < 0 ) diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp index 309904a9..dd5c78eb 100644 --- a/kontact/plugins/knotes/summarywidget.cpp +++ b/kontact/plugins/knotes/summarywidget.cpp @@ -50,7 +50,7 @@ KNotesSummaryWidget::KNotesSummaryWidget( Kontact::Plugin *plugin, { TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 ); - TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kontact_notes", + TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_notes", KIcon::Desktop, KIcon::SizeMedium ); TQWidget* header = createHeader( this, icon, i18n( "Notes" ) ); mainLayout->addWidget( header ); diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp index ee8eefdc..bbd9be2b 100644 --- a/kontact/plugins/korganizer/summarywidget.cpp +++ b/kontact/plugins/korganizer/summarywidget.cpp @@ -56,7 +56,7 @@ SummaryWidget::SummaryWidget( KOrganizerPlugin *plugin, TQWidget *parent, { TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 ); - TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kontact_date", + TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_date", KIcon::Desktop, KIcon::SizeMedium ); TQWidget *header = createHeader( this, icon, i18n( "Calendar" ) ); mainLayout->addWidget( header ); @@ -167,15 +167,15 @@ void SummaryWidget::updateView() ( sD.day() == currentDate.addDays( 1 ).day() ) ) { datestr = i18n( "Tomorrow" ); } else { - datestr = KGlobal::locale()->formatDate( sD ); + datestr = TDEGlobal::locale()->formatDate( sD ); } // Print the date span for multiday, floating events, for the // first day of the event only. if ( ev->isMultiDay() && ev->doesFloat() && dayof == 1 && span > 1 ) { - datestr = KGlobal::locale()->formatDate( ev->dtStart().date() ); + datestr = TDEGlobal::locale()->formatDate( ev->dtStart().date() ); datestr += " -\n " + - KGlobal::locale()->formatDate( sD.addDays( span-1 ) ); + TDEGlobal::locale()->formatDate( sD.addDays( span-1 ) ); } label = new TQLabel( datestr, this ); @@ -225,8 +225,8 @@ void SummaryWidget::updateView() } } datestr = i18n( "Time from - to", "%1 - %2" ) - .arg( KGlobal::locale()->formatTime( sST ) ) - .arg( KGlobal::locale()->formatTime( sET ) ); + .arg( TDEGlobal::locale()->formatTime( sST ) ) + .arg( TDEGlobal::locale()->formatTime( sET ) ); label = new TQLabel( datestr, this ); label->setAlignment( AlignLeft | AlignVCenter ); mLayout->addWidget( label, counter, 3 ); @@ -270,7 +270,7 @@ void SummaryWidget::popupMenu( const TQString &uid ) KPopupMenu popup( this ); TQToolTip::remove( this ); popup.insertItem( i18n( "&Edit Appointment..." ), 0 ); - popup.insertItem( KGlobal::iconLoader()->loadIcon( "editdelete", KIcon::Small), + popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "editdelete", KIcon::Small), i18n( "&Delete Appointment" ), 1 ); switch ( popup.exec( TQCursor::pos() ) ) { diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp index 7171e539..b0cbf7d9 100644 --- a/kontact/plugins/korganizer/todosummarywidget.cpp +++ b/kontact/plugins/korganizer/todosummarywidget.cpp @@ -58,7 +58,7 @@ TodoSummaryWidget::TodoSummaryWidget( TodoPlugin *plugin, { TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 ); - TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kontact_todo", + TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_todo", KIcon::Desktop, KIcon::SizeMedium ); TQWidget *header = createHeader( this, icon, i18n( "To-do" ) ); mainLayout->addWidget( header ); @@ -227,11 +227,11 @@ void TodoSummaryWidget::popupMenu( const TQString &uid ) KPopupMenu popup( this ); TQToolTip::remove( this ); popup.insertItem( i18n( "&Edit To-do..." ), 0 ); - popup.insertItem( KGlobal::iconLoader()->loadIcon( "editdelete", KIcon::Small), + popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "editdelete", KIcon::Small), i18n( "&Delete To-do" ), 1 ); KCal::Todo *todo = mCalendar->todo( uid ); if ( !todo->isCompleted() ) { - popup.insertItem( KGlobal::iconLoader()->loadIcon( "checkedbox", KIcon::Small), + popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "checkedbox", KIcon::Small), i18n( "&Mark To-do Completed" ), 2 ); } diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp index b3184943..8a659a6e 100644 --- a/kontact/plugins/kpilot/summarywidget.cpp +++ b/kontact/plugins/kpilot/summarywidget.cpp @@ -59,7 +59,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) mLayout = new TQGridLayout( this, 2, 3, 3, 3 ); int row=0; - TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kpilot", KIcon::Desktop, KIcon::SizeMedium ); + TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kpilot", KIcon::Desktop, KIcon::SizeMedium ); TQWidget *header = createHeader( this, icon, i18n( "KPilot Configuration" ) ); mLayout->addMultiCellWidget( header, row,row, 0,3 ); diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp index 92207c1e..8e6719fc 100644 --- a/kontact/plugins/newsticker/summarywidget.cpp +++ b/kontact/plugins/newsticker/summarywidget.cpp @@ -47,7 +47,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) { TQVBoxLayout *vlay = new TQVBoxLayout( this, 3, 3 ); - TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kontact_news", + TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_news", KIcon::Desktop, KIcon::SizeMedium ); TQWidget *header = createHeader( this, icon, i18n( "News Feeds" ) ); diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp index 1b847508..a3698930 100644 --- a/kontact/plugins/specialdates/sdsummarywidget.cpp +++ b/kontact/plugins/specialdates/sdsummarywidget.cpp @@ -84,7 +84,7 @@ SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, // Create the Summary Layout TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 ); - TQPixmap icon = KGlobal::iconLoader()->loadIcon( "cookie", + TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "cookie", KIcon::Desktop, KIcon::SizeMedium ); TQWidget *header = createHeader( this, icon, i18n( "Special Dates" ) ); @@ -226,8 +226,8 @@ void SDSummaryWidget::updateView() TQLabel *label = 0; // No reason to show the date year - TQString savefmt = KGlobal::locale()->dateFormat(); - KGlobal::locale()->setDateFormat( KGlobal::locale()-> + TQString savefmt = TDEGlobal::locale()->dateFormat(); + TDEGlobal::locale()->setDateFormat( TDEGlobal::locale()-> dateFormat().replace( 'Y', ' ' ) ); // Search for Birthdays and Anniversaries in the Addressbook @@ -424,7 +424,7 @@ void SDSummaryWidget::updateView() } label = new TQLabel( this ); if ( icon_img.isNull() ) { - label->setPixmap( KGlobal::iconLoader()->loadIcon( icon_name, + label->setPixmap( TDEGlobal::iconLoader()->loadIcon( icon_name, KIcon::Small ) ); } else { label->setPixmap( icon_img ); @@ -446,13 +446,13 @@ void SDSummaryWidget::updateView() } else if ( (*addrIt).daysTo == 1 ) { datestr = i18n( "Tomorrow" ); } else { - datestr = KGlobal::locale()->formatDate( sD ); + datestr = TDEGlobal::locale()->formatDate( sD ); } // Print the date span for multiday, floating events, for the // first day of the event only. if ( (*addrIt).span > 1 ) { TQString endstr = - KGlobal::locale()->formatDate( sD.addDays( (*addrIt).span - 1 ) ); + TDEGlobal::locale()->formatDate( sD.addDays( (*addrIt).span - 1 ) ); datestr += " -\n " + endstr; } @@ -550,7 +550,7 @@ void SDSummaryWidget::updateView() for ( label = mLabels.first(); label; label = mLabels.next() ) label->show(); - KGlobal::locale()->setDateFormat( savefmt ); + TDEGlobal::locale()->setDateFormat( savefmt ); } void SDSummaryWidget::mailContact( const TQString &uid ) @@ -575,9 +575,9 @@ void SDSummaryWidget::viewContact( const TQString &uid ) void SDSummaryWidget::popupMenu( const TQString &uid ) { KPopupMenu popup( this ); - popup.insertItem( KGlobal::iconLoader()->loadIcon( "kmail", KIcon::Small ), + popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "kmail", KIcon::Small ), i18n( "Send &Mail" ), 0 ); - popup.insertItem( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Small ), + popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Small ), i18n( "View &Contact" ), 1 ); switch ( popup.exec( TQCursor::pos() ) ) { diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp index 360da023..f3eae012 100644 --- a/kontact/plugins/summary/kcmkontactsummary.cpp +++ b/kontact/plugins/summary/kcmkontactsummary.cpp @@ -55,7 +55,7 @@ class PluginItem : public TQCheckListItem : TQCheckListItem( parent, TQString(), TQCheckListItem::CheckBox ), mInfo( info ) { - TQPixmap pm = KGlobal::iconLoader()->loadIcon( mInfo->icon(), KIcon::Small ); + TQPixmap pm = TDEGlobal::iconLoader()->loadIcon( mInfo->icon(), KIcon::Small ); setPixmap( 0, pm ); } diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp index da0c160d..ba85836b 100644 --- a/kontact/plugins/summary/summaryview_part.cpp +++ b/kontact/plugins/summary/summaryview_part.cpp @@ -317,7 +317,7 @@ void SummaryViewPart::slotAdjustPalette() void SummaryViewPart::setDate( const TQDate& newDate ) { TQString date( "%1" ); - date = date.arg( KGlobal::locale()->formatDate( newDate ) ); + date = date.arg( TDEGlobal::locale()->formatDate( newDate ) ); mDateLabel->setText( date ); } diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp index 63c7c897..2b114ca2 100644 --- a/kontact/plugins/weather/summarywidget.cpp +++ b/kontact/plugins/weather/summarywidget.cpp @@ -45,7 +45,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) mLayout = new TQVBoxLayout( this, 3, 3 ); mLayout->setAlignment( TQt::AlignTop ); - TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kweather", KIcon::Desktop, KIcon::SizeMedium ); + TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kweather", KIcon::Desktop, KIcon::SizeMedium ); TQWidget *header = createHeader( this, icon, i18n( "Weather Service" ) ); mLayout->addWidget( header ); @@ -209,9 +209,9 @@ void SummaryWidget::updateSummary( bool ) void SummaryWidget::showReport( const TQString &stationID ) { - mProc = new KProcess; - TQApplication::connect( mProc, TQT_SIGNAL( processExited( KProcess* ) ), - this, TQT_SLOT( reportFinished( KProcess* ) ) ); + mProc = new TDEProcess; + TQApplication::connect( mProc, TQT_SIGNAL( processExited( TDEProcess* ) ), + this, TQT_SLOT( reportFinished( TDEProcess* ) ) ); *mProc << "kweatherreport"; *mProc << stationID; @@ -221,7 +221,7 @@ void SummaryWidget::showReport( const TQString &stationID ) } } -void SummaryWidget::reportFinished( KProcess* ) +void SummaryWidget::reportFinished( TDEProcess* ) { mProc->deleteLater(); mProc = 0; diff --git a/kontact/plugins/weather/summarywidget.h b/kontact/plugins/weather/summarywidget.h index 8bb36ce8..96361526 100644 --- a/kontact/plugins/weather/summarywidget.h +++ b/kontact/plugins/weather/summarywidget.h @@ -35,7 +35,7 @@ #include #include -class KProcess; +class TDEProcess; class TQGridLayout; class TQLabel; @@ -107,7 +107,7 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject void updateView(); void timeout(); void showReport( const TQString& ); - void reportFinished( KProcess* ); + void reportFinished( TDEProcess* ); private: TQStringList mStations; @@ -118,7 +118,7 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject TQPtrList mLayouts; TQVBoxLayout *mLayout; - KProcess* mProc; + TDEProcess* mProc; }; #endif diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp index ae0d0965..db40083a 100644 --- a/kontact/src/aboutdialog.cpp +++ b/kontact/src/aboutdialog.cpp @@ -46,7 +46,7 @@ AboutDialog::AboutDialog( Kontact::Core *core, const char *name ) mCore( core ) { addAboutData( i18n( "Kontact Container" ), TQString( "kontact" ), - KGlobal::instance()->aboutData() ); + TDEGlobal::instance()->aboutData() ); TQValueList plugins = mCore->pluginList(); TQValueList::ConstIterator end = plugins.end(); @@ -54,7 +54,7 @@ AboutDialog::AboutDialog( Kontact::Core *core, const char *name ) for ( ; it != end; ++it ) addAboutPlugin( *it ); - addLicenseText( KGlobal::instance()->aboutData() ); + addLicenseText( TDEGlobal::instance()->aboutData() ); } void AboutDialog::addAboutPlugin( Kontact::Plugin *plugin ) @@ -65,7 +65,7 @@ void AboutDialog::addAboutPlugin( Kontact::Plugin *plugin ) void AboutDialog::addAboutData( const TQString &title, const TQString &icon, const TDEAboutData *about ) { - TQPixmap pixmap = KGlobal::iconLoader()->loadIcon( icon, + TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon( icon, KIcon::Desktop, 48 ); TQFrame *topFrame = addPage( title, TQString(), pixmap ); @@ -160,7 +160,7 @@ void AboutDialog::addLicenseText( const TDEAboutData *about ) if ( !about || about->license().isEmpty() ) return; - TQPixmap pixmap = KGlobal::iconLoader()->loadIcon( "signature", + TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon( "signature", KIcon::Desktop, 48 ); TQString title = i18n( "%1 License" ).arg( about->programName() ); diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp index a6490766..2fef3e0b 100644 --- a/kontact/src/iconsidepane.cpp +++ b/kontact/src/iconsidepane.cpp @@ -111,7 +111,7 @@ void EntryItem::reloadPixmap() { int size = (int)navigator()->viewMode(); if ( size != 0 ) - mPixmap = KGlobal::iconLoader()->loadIcon( mPlugin->icon(), + mPixmap = TDEGlobal::iconLoader()->loadIcon( mPlugin->icon(), KIcon::Desktop, size, mPlugin->disabled() ? KIcon::DisabledState diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp index 0fa50b21..71fb5e1b 100644 --- a/kontact/src/main.cpp +++ b/kontact/src/main.cpp @@ -53,7 +53,7 @@ class KontactApp : public KUniqueApplication { public: KontactApp() : mMainWindow( 0 ), mSessionRestored( false ) { - KGlobal::iconLoader()->addAppDir( "tdepim" ); + TDEGlobal::iconLoader()->addAppDir( "tdepim" ); } ~KontactApp() {} diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index 307f1c4b..5ac040f7 100644 --- a/kontact/src/mainwindow.cpp +++ b/kontact/src/mainwindow.cpp @@ -1050,7 +1050,7 @@ void MainWindow::configureShortcuts() void MainWindow::configureToolbars() { - saveMainWindowSettings( KGlobal::config(), "MainWindow" ); + saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); KEditToolbar edit( factory() ); connect( &edit, TQT_SIGNAL( newToolbarConfig() ), @@ -1064,7 +1064,7 @@ void MainWindow::slotNewToolbarConfig() createGUI( mCurrentPlugin->part() ); } if ( mCurrentPlugin ) { - applyMainWindowSettings( KGlobal::config(), "MainWindow" ); + applyMainWindowSettings( TDEGlobal::config(), "MainWindow" ); } updateShortcuts(); // for the plugActionList call } @@ -1160,7 +1160,7 @@ void MainWindow::slotShowStatusMsg( const TQString &msg ) TQString MainWindow::introductionString() { - KIconLoader *iconloader = KGlobal::iconLoader(); + KIconLoader *iconloader = TDEGlobal::iconLoader(); int iconSize = iconloader->currentSize( KIcon::Desktop ); TQString handbook_icon_path = iconloader->iconPath( "contents2", KIcon::Desktop ); diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp index d929bcb3..c64cbf97 100644 --- a/kontact/src/profilemanager.cpp +++ b/kontact/src/profilemanager.cpp @@ -178,7 +178,7 @@ void Kontact::ProfileManager::writeProfileConfig( const Kontact::Profile& profil void Kontact::ProfileManager::readConfig() { - const TQStringList profilePaths = KGlobal::dirs()->findAllResources( "data", TQString::fromLatin1( "kontact/profiles/*/profile.cfg" ) ); + const TQStringList profilePaths = TDEGlobal::dirs()->findAllResources( "data", TQString::fromLatin1( "kontact/profiles/*/profile.cfg" ) ); typedef TQMap ProfileMap; ProfileMap profiles; diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp index 52e47d57..741a04f8 100644 --- a/korganizer/actionmanager.cpp +++ b/korganizer/actionmanager.cpp @@ -754,9 +754,9 @@ void ActionManager::file_icalimport() return; } - KProcess proc; + TDEProcess proc; proc << "ical2vcal" << tmpfn.name(); - bool success = proc.start( KProcess::Block ); + bool success = proc.start( TDEProcess::Block ); if ( !success ) { kdDebug(5850) << "Error starting ical2vcal." << endl; @@ -1290,11 +1290,11 @@ void ActionManager::setDestinationPolicy() void ActionManager::configureDateTime() { - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "kcmshell" << "language"; - connect( proc,TQT_SIGNAL( processExited( KProcess * ) ), - TQT_SLOT( configureDateTimeFinished( KProcess * ) ) ); + connect( proc,TQT_SIGNAL( processExited( TDEProcess * ) ), + TQT_SLOT( configureDateTimeFinished( TDEProcess * ) ) ); if ( !proc->start() ) { KMessageBox::sorry( dialogParent(), @@ -1405,7 +1405,7 @@ bool ActionManager::addIncidence( const TQString& ical ) return mCalendarView->addIncidence( ical ); } -void ActionManager::configureDateTimeFinished( KProcess *proc ) +void ActionManager::configureDateTimeFinished( TDEProcess *proc ) { delete proc; } @@ -1875,7 +1875,7 @@ void ActionManager::goDate( const TQDate& date ) void ActionManager::goDate( const TQString& date ) { - goDate( KGlobal::locale()->readDate( date ) ); + goDate( TDEGlobal::locale()->readDate( date ) ); } void ActionManager::showDate(const TQDate & date) diff --git a/korganizer/actionmanager.h b/korganizer/actionmanager.h index 47e4c4d8..8c6a4402 100644 --- a/korganizer/actionmanager.h +++ b/korganizer/actionmanager.h @@ -51,7 +51,7 @@ class KRecentFilesAction; class KSelectAction; class KToggleAction; class KConfig; -class KProcess; +class TDEProcess; class KTempFile; class KXMLGUIClient; class CalendarView; @@ -338,7 +338,7 @@ class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface /** called by the auto archive timer to automatically delete/archive events */ void slotAutoArchive(); - void configureDateTimeFinished(KProcess *); + void configureDateTimeFinished(TDEProcess *); void setTitle(); diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index ab725b4c..2f31310b 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -775,7 +775,7 @@ void CalendarView::incidenceChanged( Incidence *oldIncidence, Todo *todo = static_cast(newIncidence); if ( todo->isCompleted() || modification == KOGlobals::COMPLETION_MODIFIED_WITH_RECURRENCE ) { - TQString timeStr = KGlobal::locale()->formatTime( TQTime::currentTime() ); + TQString timeStr = TDEGlobal::locale()->formatTime( TQTime::currentTime() ); TQString description = i18n( "To-do completed: %1 (%2)" ).arg( newIncidence->summary() ).arg( timeStr ); @@ -786,7 +786,7 @@ void CalendarView::incidenceChanged( Incidence *oldIncidence, journal = new Journal(); journal->setDtStart( TQDateTime::currentDateTime() ); - TQString dateStr = KGlobal::locale()->formatDate( TQDate::currentDate() ); + TQString dateStr = TDEGlobal::locale()->formatDate( TQDate::currentDate() ); journal->setSummary( i18n("Journal of %1").arg( dateStr ) ); journal->setDescription( description ); @@ -1677,8 +1677,8 @@ void CalendarView::mailFreeBusy( int daysToPublish ) KOPrefs::instance()->email() ) ); kdDebug(5850) << "calendarview: schedule_publish_freebusy: startDate: " - << KGlobal::locale()->formatDateTime( start ) << " End Date: " - << KGlobal::locale()->formatDateTime( end ) << endl; + << TDEGlobal::locale()->formatDateTime( start ) << " End Date: " + << TDEGlobal::locale()->formatDateTime( end ) << endl; PublishDialog *publishdlg = new PublishDialog(); if ( publishdlg->exec() == TQDialog::Accepted ) { @@ -2405,7 +2405,7 @@ void CalendarView::deleteIncidence(Incidence *incidence, bool force) "Do you want to delete only the current one on %2, only all " "future recurrences, or all its recurrences?" ) .arg( incidence->summary() ) - .arg( KGlobal::locale()->formatDate(itemDate)), + .arg( TDEGlobal::locale()->formatDate(itemDate)), i18n("KOrganizer Confirmation"), i18n("Delete C&urrent"), i18n("Delete &Future"), i18n("Delete &All")); diff --git a/korganizer/datenavigator.cpp b/korganizer/datenavigator.cpp index bb4206b0..4d85a7a4 100644 --- a/korganizer/datenavigator.cpp +++ b/korganizer/datenavigator.cpp @@ -104,7 +104,7 @@ void DateNavigator::selectDates( const TQDate &d, int count, const TQDate &prefe void DateNavigator::selectWeekByDay( int weekDay, const TQDate &d, const TQDate &preferredMonth ) { int dateCount = mSelectedDates.count(); - bool weekStart = ( weekDay == KGlobal::locale()->weekStartDay() ); + bool weekStart = ( weekDay == TDEGlobal::locale()->weekStartDay() ); if ( weekStart && dateCount == 7 ) { selectWeek( d, preferredMonth ); } else { @@ -121,7 +121,7 @@ void DateNavigator::selectWeek( const TQDate &d, const TQDate &preferredMonth ) { int dayOfWeek = KOGlobals::self()->calendarSystem()->dayOfWeek( d ); - int weekStart = KGlobal::locale()->weekStartDay(); + int weekStart = TDEGlobal::locale()->weekStartDay(); TQDate firstDate = d.addDays( weekStart - dayOfWeek ); @@ -139,7 +139,7 @@ void DateNavigator::selectWorkWeek() void DateNavigator::selectWorkWeek( const TQDate &d ) { - int weekStart = KGlobal::locale()->weekStartDay(); + int weekStart = TDEGlobal::locale()->weekStartDay(); int dayOfWeek = KOGlobals::self()->calendarSystem()->dayOfWeek( d ); diff --git a/korganizer/eventarchiver.cpp b/korganizer/eventarchiver.cpp index be685441..536c37f7 100644 --- a/korganizer/eventarchiver.cpp +++ b/korganizer/eventarchiver.cpp @@ -118,7 +118,7 @@ void EventArchiver::run( Calendar* calendar, const TQDate& limitDate, TQWidget* KMessageBox::information( widget, i18n( "There are no incidences available to archive before the specified cut-off date %1. " - "Archiving will not be performed." ).arg( KGlobal::locale()->formatDate( limitDate ) ), + "Archiving will not be performed." ).arg( TDEGlobal::locale()->formatDate( limitDate ) ), "ArchiverNoIncidences" ); } return; @@ -147,7 +147,7 @@ void EventArchiver::deleteIncidences( Calendar* calendar, const TQDate& limitDat int result = KMessageBox::warningContinueCancelList( widget, i18n("Delete all items before %1 without saving?\n" "The following items will be deleted:") - .arg(KGlobal::locale()->formatDate(limitDate)), incidenceStrs, + .arg(TDEGlobal::locale()->formatDate(limitDate)), incidenceStrs, i18n("Delete Old Items"),KStdGuiItem::del()); if (result != KMessageBox::Continue) return; diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index 7808dcbb..3594a860 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp @@ -86,7 +86,7 @@ JournalDateEntry::~JournalDateEntry() void JournalDateEntry::setDate(const TQDate &date) { TQString dtstring = TQString( "
%1 " ) - .arg( KGlobal::locale()->formatDate(date) ); + .arg( TDEGlobal::locale()->formatDate(date) ); dtstring += " " + i18n("[Add Journal Entry]") + diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index 08780410..dcf2a3eb 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp @@ -61,7 +61,7 @@ KDateNavigator::KDateNavigator( TQWidget *parent, const char *name ) connect( mNavigatorBar, TQT_SIGNAL( yearSelected( int ) ), TQT_SIGNAL( yearSelected( int ) ) ); int i; - TQString generalFont = KGlobalSettings::generalFont().family(); + TQString generalFont = TDEGlobalSettings::generalFont().family(); // Set up the heading fields. for( i = 0; i < 7; i++ ) { @@ -149,7 +149,7 @@ TQDate KDateNavigator::startDate() const const KCalendarSystem *calsys = KOGlobals::self()->calendarSystem(); int m_fstDayOfWkCalsys = calsys->dayOfWeek( dayone ); - int weekstart = KGlobal::locale()->weekStartDay(); + int weekstart = TDEGlobal::locale()->weekStartDay(); // If month begins on Monday and Monday is first day of week, // month should begin on second line. Sunday doesn't have this problem. @@ -234,7 +234,7 @@ void KDateNavigator::updateView() void KDateNavigator::updateConfig() { int day; - int weekstart = KGlobal::locale()->weekStartDay(); + int weekstart = TDEGlobal::locale()->weekStartDay(); for( int i = 0; i < 7; i++ ) { day = weekstart + i <= 7 ? weekstart + i : ( weekstart + i ) % 7; TQString dayName = KOGlobals::self()->calendarSystem()->weekDayName( day, diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index 6c1c7952..484cc165 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -147,7 +147,7 @@ void MarcusBains::updateLocationRecalc( bool recalculate ) if(recalculate) mTimeBox->setFont(KOPrefs::instance()->mMarcusBainsFont); - TQString timeStr = KGlobal::locale()->formatTime(tim, KOPrefs::instance()->mMarcusBainsShowSeconds); + TQString timeStr = TDEGlobal::locale()->formatTime(tim, KOPrefs::instance()->mMarcusBainsShowSeconds); TQFontMetrics fm = fontMetrics(); mTimeBox->setText( timeStr ); TQSize sz( fm.width( timeStr + ' ' ), fm.height() ); diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index f11ea8c0..216f1dfd 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp @@ -836,17 +836,17 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev ) TQString shortH; TQString longH; if ( !isMultiItem() ) { - shortH = KGlobal::locale()->formatTime(mIncidence->dtStart().time()); + shortH = TDEGlobal::locale()->formatTime(mIncidence->dtStart().time()); if (mIncidence->type() != "Todo") longH = i18n("%1 - %2").arg(shortH) - .arg(KGlobal::locale()->formatTime(mIncidence->dtEnd().time())); + .arg(TDEGlobal::locale()->formatTime(mIncidence->dtEnd().time())); else longH = shortH; } else if ( !mMultiItemInfo->mFirstMultiItem ) { - shortH = KGlobal::locale()->formatTime(mIncidence->dtStart().time()); + shortH = TDEGlobal::locale()->formatTime(mIncidence->dtStart().time()); longH = shortH; } else { - shortH = KGlobal::locale()->formatTime(mIncidence->dtEnd().time()); + shortH = TDEGlobal::locale()->formatTime(mIncidence->dtEnd().time()); longH = i18n("- %1").arg(shortH); } @@ -937,8 +937,8 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev ) (mIncidence->dtStart() != mIncidence->dtEnd()) ) { // multi days shortH = longH = i18n("%1 - %2") - .arg(KGlobal::locale()->formatDate(mIncidence->dtStart().date())) - .arg(KGlobal::locale()->formatDate(mIncidence->dtEnd().date())); + .arg(TDEGlobal::locale()->formatDate(mIncidence->dtStart().date())) + .arg(TDEGlobal::locale()->formatDate(mIncidence->dtEnd().date())); // paint headline p.fillRect( 0, 0, width(), (ft/2) + margin + hlHeight, diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 5b46fedb..91cf417d 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -288,7 +288,7 @@ KOAgendaView::KOAgendaView( Calendar *cal, topLayout->addWidget(mSplitterAgenda); #if KDE_IS_VERSION( 3, 1, 93 ) - mSplitterAgenda->setOpaqueResize( KGlobalSettings::opaqueResize() ); + mSplitterAgenda->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); #else mSplitterAgenda->setOpaqueResize(); #endif @@ -625,7 +625,7 @@ void KOAgendaView::createDayLabels( bool force ) // dayLayout->setMinimumWidth(1); int dW = calsys->dayOfWeek(date); - TQString veryLongStr = KGlobal::locale()->formatDate( date ); + TQString veryLongStr = TDEGlobal::locale()->formatDate( date ); TQString longstr = i18n( "short_weekday date (e.g. Mon 13)","%1 %2" ) .arg( calsys->weekDayName( dW, true ) ) .arg( calsys->day(date) ); diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index d8434078..cf6fa102 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -717,7 +717,7 @@ TQPair KODayMatrix::matrixLimits( const TQDate &month ) calSys->setYMD( d, calSys->year( month ), calSys->month( month ), 1 ); const int dayOfWeek = calSys->dayOfWeek( d ); - const int weekstart = KGlobal::locale()->weekStartDay(); + const int weekstart = TDEGlobal::locale()->weekStartDay(); d = d.addDays( weekstart - dayOfWeek ); diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp index ec23e9ee..cf10b9fd 100644 --- a/korganizer/koeditorattachments.cpp +++ b/korganizer/koeditorattachments.cpp @@ -132,7 +132,7 @@ class AttachmentListItem : public KIconViewItem static TQPixmap icon( KMimeType::Ptr mimeType, const TQString &uri ) { TQString iconStr = mimeType->icon( uri, false ); - return KGlobal::iconLoader()->loadIcon( iconStr, KIcon::Small ); + return TDEGlobal::iconLoader()->loadIcon( iconStr, KIcon::Small ); } void readAttachment() { @@ -234,7 +234,7 @@ AttachmentEditDialog::AttachmentEditDialog( AttachmentListItem *item, grid->addWidget( new TQLabel( i18n( "Size:" ), topFrame ), 4, 0 ); grid->addWidget( new TQLabel( TQString::fromLatin1( "%1 (%2)" ). arg( KIO::convertSize( size ) ). - arg( KGlobal::locale()->formatNumber( + arg( TDEGlobal::locale()->formatNumber( size, 0 ) ), topFrame ), 4, 2 ); } vbl->addStretch( 10 ); diff --git a/korganizer/koeditorfreebusy.cpp b/korganizer/koeditorfreebusy.cpp index 807901b8..c97ad456 100644 --- a/korganizer/koeditorfreebusy.cpp +++ b/korganizer/koeditorfreebusy.cpp @@ -188,10 +188,10 @@ void FreeBusyItem::setFreeBusyPeriods( FreeBusy* fb ) toolTip += "
"; } toolTip += "" + i18n( "Start:" ) + "" + " "; - toolTip += KGlobal::locale()->formatDateTime( per.start() ); + toolTip += TDEGlobal::locale()->formatDateTime( per.start() ); toolTip += "
"; toolTip += "" + i18n( "End:" ) + "" + " "; - toolTip += KGlobal::locale()->formatDateTime( per.end() ); + toolTip += TDEGlobal::locale()->formatDateTime( per.end() ); toolTip += "
"; toolTip += ""; newSubItem->setTooltipText( toolTip ); @@ -320,7 +320,7 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent, mGanttView->setShowLegendButton( false ); // Initially, center to current date mGanttView->centerTimelineAfterShow( TQDateTime::currentDateTime() ); - if ( KGlobal::locale()->use12Clock() ) + if ( TDEGlobal::locale()->use12Clock() ) mGanttView->setHourFormat( KDGanttView::Hour_12 ); else mGanttView->setHourFormat( KDGanttView::Hour_24_FourDigit ); diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp index a5dd834f..dc54a526 100644 --- a/korganizer/koeditorgeneralevent.cpp +++ b/korganizer/koeditorgeneralevent.cpp @@ -197,7 +197,7 @@ void KOEditorGeneralEvent::initInvitationBar(TQWidget * parent, TQBoxLayout * la { TQBoxLayout *topLayout = new TQHBoxLayout( layout ); mInvitationBar = new TQFrame( parent ); - mInvitationBar->setPaletteBackgroundColor( KGlobalSettings::alternateBackgroundColor() ); + mInvitationBar->setPaletteBackgroundColor( TDEGlobalSettings::alternateBackgroundColor() ); topLayout->addWidget( mInvitationBar ); TQBoxLayout *barLayout = new TQHBoxLayout( mInvitationBar ); @@ -468,7 +468,7 @@ void KOEditorGeneralEvent::setDuration() void KOEditorGeneralEvent::emitDateTimeStr() { - KLocale *l = KGlobal::locale(); + KLocale *l = TDEGlobal::locale(); TQString from,to; if (mAlldayEventCheckbox->isChecked()) { @@ -493,14 +493,14 @@ bool KOEditorGeneralEvent::validateInput() if (!mStartTimeEdit->inputIsValid()) { KMessageBox::sorry( 0, i18n("Please specify a valid start time, for example '%1'.") - .arg( KGlobal::locale()->formatTime( TQTime::currentTime() ) ) ); + .arg( TDEGlobal::locale()->formatTime( TQTime::currentTime() ) ) ); return false; } if (!mEndTimeEdit->inputIsValid()) { KMessageBox::sorry( 0, i18n("Please specify a valid end time, for example '%1'.") - .arg( KGlobal::locale()->formatTime( TQTime::currentTime() ) ) ); + .arg( TDEGlobal::locale()->formatTime( TQTime::currentTime() ) ) ); return false; } } @@ -508,14 +508,14 @@ bool KOEditorGeneralEvent::validateInput() if (!mStartDateEdit->date().isValid()) { KMessageBox::sorry( 0, i18n("Please specify a valid start date, for example '%1'.") - .arg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) ); + .arg( TDEGlobal::locale()->formatDate( TQDate::currentDate() ) ) ); return false; } if (!mEndDateEdit->date().isValid()) { KMessageBox::sorry( 0, i18n("Please specify a valid end date, for example '%1'.") - .arg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) ); + .arg( TDEGlobal::locale()->formatDate( TQDate::currentDate() ) ) ); return false; } diff --git a/korganizer/koeditorgeneraljournal.cpp b/korganizer/koeditorgeneraljournal.cpp index de97376d..3741acb3 100644 --- a/korganizer/koeditorgeneraljournal.cpp +++ b/korganizer/koeditorgeneraljournal.cpp @@ -196,7 +196,7 @@ bool KOEditorGeneralJournal::validateInput() if (!mDateEdit->date().isValid()) { KMessageBox::sorry( 0, i18n("Please specify a valid date, for example '%1'.") - .arg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) ); + .arg( TDEGlobal::locale()->formatDate( TQDate::currentDate() ) ) ); return false; } diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp index 5ba7188b..54822c83 100644 --- a/korganizer/koeditorgeneraltodo.cpp +++ b/korganizer/koeditorgeneraltodo.cpp @@ -565,7 +565,7 @@ void KOEditorGeneralTodo::completedChanged() void KOEditorGeneralTodo::dateChanged() { - KLocale *l = KGlobal::locale(); + KLocale *l = TDEGlobal::locale(); TQString dateTimeStr = ""; if ( mStartCheck->isChecked() ) { diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp index 4b5889a8..3aceab47 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp @@ -183,7 +183,7 @@ RecurWeekly::RecurWeekly( TQWidget *parent, const char *name ) : TQHBox *dayBox = new TQHBox( this ); topLayout->addWidget( dayBox, 1, AlignVCenter ); // Respect start of week setting - int weekStart=KGlobal::locale()->weekStartDay(); + int weekStart=TDEGlobal::locale()->weekStartDay(); for ( int i = 0; i < 7; ++i ) { // i is the nr of the combobox, not the day of week! // label=(i+weekStart+6)%7 + 1; @@ -631,7 +631,7 @@ ExceptionsWidget::ExceptionsWidget( TQWidget *parent, const char *name ) : void ExceptionsWidget::addException() { TQDate date = mExceptionDateEdit->date(); - TQString dateStr = KGlobal::locale()->formatDate( date ); + TQString dateStr = TDEGlobal::locale()->formatDate( date ); if( !mExceptionList->findItem( dateStr ) ) { mExceptionDates.append( date ); mExceptionList->insertItem( dateStr ); @@ -645,7 +645,7 @@ void ExceptionsWidget::changeException() TQDate date = mExceptionDateEdit->date(); mExceptionDates[ pos ] = date; - mExceptionList->changeItem( KGlobal::locale()->formatDate( date ), pos ); + mExceptionList->changeItem( TDEGlobal::locale()->formatDate( date ), pos ); } void ExceptionsWidget::deleteException() @@ -663,7 +663,7 @@ void ExceptionsWidget::setDates( const DateList &dates ) mExceptionDates.clear(); DateList::ConstIterator dit; for ( dit = dates.begin(); dit != dates.end(); ++dit ) { - mExceptionList->insertItem( KGlobal::locale()->formatDate(* dit ) ); + mExceptionList->insertItem( TDEGlobal::locale()->formatDate(* dit ) ); mExceptionDates.append( *dit ); } } @@ -824,7 +824,7 @@ void RecurrenceRangeWidget::setDateTimes( const TQDateTime &start, const TQDateTime & ) { mStartDateLabel->setText( i18n("Begins on: %1") - .arg( KGlobal::locale()->formatDate( start.date() ) ) ); + .arg( TDEGlobal::locale()->formatDate( start.date() ) ) ); } ///////////////////////// RecurrenceRangeDialog /////////////////////////// @@ -1394,8 +1394,8 @@ bool KOEditorRecurrence::validateInput() mEventStartDt.isValid() && ((mRecurrenceRange->endDate())formatDate( mRecurrenceRange->endDate() ) ) - .arg( KGlobal::locale()->formatDate( mEventStartDt.date() ) ) ); + .arg( TDEGlobal::locale()->formatDate( mRecurrenceRange->endDate() ) ) + .arg( TDEGlobal::locale()->formatDate( mEventStartDt.date() ) ) ); return false; } int recurrenceType = mRecurrenceChooser->type(); diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp index 3077e0cd..3c1c8e4f 100644 --- a/korganizer/koglobals.cpp +++ b/korganizer/koglobals.cpp @@ -72,7 +72,7 @@ KOGlobals::KOGlobals() mOwnInstance = new TDEInstance( "korganizer" ); mOwnInstance->config()->setGroup( "General" ); mOwnInstance->iconLoader()->addAppDir( "tdepim" ); - KGlobal::iconLoader()->addAppDir( "tdepim" ); + TDEGlobal::iconLoader()->addAppDir( "tdepim" ); mAlarmClient = new AlarmClient; } @@ -91,7 +91,7 @@ KOGlobals::~KOGlobals() const KCalendarSystem *KOGlobals::calendarSystem() const { - return KGlobal::locale()->calendar(); + return TDEGlobal::locale()->calendar(); } AlarmClient *KOGlobals::alarmClient() const @@ -106,7 +106,7 @@ void KOGlobals::fitDialogToScreen( TQWidget *wid, bool force ) int w = wid->frameSize().width(); int h = wid->frameSize().height(); - TQRect desk = KGlobalSettings::desktopGeometry( wid ); + TQRect desk = TDEGlobalSettings::desktopGeometry( wid ); if ( w > desk.width() ) { w = desk.width(); resized = true; diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp index 55afba9e..bb535a95 100644 --- a/korganizer/koincidenceeditor.cpp +++ b/korganizer/koincidenceeditor.cpp @@ -193,7 +193,7 @@ void KOIncidenceEditor::setupDesignerTabs( const TQString &type ) { TQStringList activePages = KOPrefs::instance()->activeDesignerFields(); - TQStringList list = KGlobal::dirs()->findAllResources( "data", + TQStringList list = TDEGlobal::dirs()->findAllResources( "data", "korganizer/designer/" + type + "/*.ui", true, true ); for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it ) { const TQString &fn = (*it).mid( (*it).findRev('/') + 1 ); diff --git a/korganizer/komailclient.cpp b/korganizer/komailclient.cpp index a6edc648..78819403 100644 --- a/korganizer/komailclient.cpp +++ b/korganizer/komailclient.cpp @@ -196,20 +196,20 @@ bool KOMailClient::send(const TQString &from,const TQString &_to,const TQString if (command.isNull()) return false; // give up command.append(TQString::fromLatin1(" -s ")); - command.append(KProcess::quote(subject)); + command.append(TDEProcess::quote(subject)); if (bcc) { command.append(TQString::fromLatin1(" -b ")); - command.append(KProcess::quote(from)); + command.append(TDEProcess::quote(from)); } if ( !cc.isEmpty() ) { command.append(" -c "); - command.append(KProcess::quote(cc)); + command.append(TDEProcess::quote(cc)); } command.append(" "); - command.append(KProcess::quote(to)); + command.append(TDEProcess::quote(to)); needHeaders = false; } diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 6bb94f5c..fb52f4b6 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -566,7 +566,7 @@ class MonthViewCell::CreateItemVisitor : if (event->doesFloat()) text = event->summary(); else { - text = KGlobal::locale()->formatTime(event->dtStart().time()); + text = TDEGlobal::locale()->formatTime(event->dtStart().time()); dt.setTime( event->dtStart().time() ); text += ' ' + event->summary(); } @@ -603,7 +603,7 @@ class MonthViewCell::CreateItemVisitor : TQDateTime dt( mDate ); if ( todo->hasDueDate() && !todo->doesFloat() && todo->dtDue().time() != TQTime( 0,0 ) && todo->dtDue().time().isValid() ) { - text += KGlobal::locale()->formatTime( todo->dtDue().time() ); + text += TDEGlobal::locale()->formatTime( todo->dtDue().time() ); text += ' '; dt.setTime( todo->dtDue().time() ); } @@ -928,7 +928,7 @@ bool KOMonthView::eventDurationHint( TQDateTime &startDt, TQDateTime &endDt, boo void KOMonthView::updateConfig() { - mWeekStartDay = KGlobal::locale()->weekStartDay(); + mWeekStartDay = TDEGlobal::locale()->weekStartDay(); TQFontMetrics fontmetric( mDayLabels[0]->font() ); mWidthLongDayLabel = 0; diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index a7c4eea2..58248ba4 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -72,12 +72,12 @@ KOPrefs::KOPrefs() : mDefaultResourceColor = TQColor();//Default is a color invalid - mDefaultTimeBarFont = KGlobalSettings::generalFont(); + mDefaultTimeBarFont = TDEGlobalSettings::generalFont(); // make a large default time bar font, at least 16 points. mDefaultTimeBarFont.setPointSize( TQMAX( mDefaultTimeBarFont.pointSize() + 4, 16 ) ); - mDefaultMonthViewFont = KGlobalSettings::generalFont(); + mDefaultMonthViewFont = TDEGlobalSettings::generalFont(); // make it a bit smaller mDefaultMonthViewFont.setPointSize( mDefaultMonthViewFont.pointSize() - 2 ); diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 15003755..54ca4dfc 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp @@ -343,7 +343,7 @@ class KOPrefsDialogTime : public KPrefsModule cb->setText( TQString() ); if ( KOPrefs::instance()->audioFilePathItem()->value().isEmpty() ) { - TQString defAudioFile = KGlobal::dirs()->findResourceDir( "sound", "KDE-Sys-Warning.ogg"); + TQString defAudioFile = TDEGlobal::dirs()->findResourceDir( "sound", "KDE-Sys-Warning.ogg"); KOPrefs::instance()->audioFilePathItem()->setValue( defAudioFile + "KDE-Sys-Warning.ogg" ); } TQString filter = i18n( "*.ogg *.wav *.mp3 *.wma *.flac *.aiff *.raw *.au *.ra|" @@ -374,7 +374,7 @@ class KOPrefsDialogTime : public KPrefsModule TQHBox *workDaysBox = new TQHBox( workingHoursGroup ); // Respect start of week setting - int weekStart=KGlobal::locale()->weekStartDay(); + int weekStart=TDEGlobal::locale()->weekStartDay(); for ( int i = 0; i < 7; ++i ) { const KCalendarSystem *calSys = KOGlobals::self()->calendarSystem(); TQString weekDayName = calSys->weekDayName( (i + weekStart + 6)%7 + 1, true ); @@ -481,7 +481,7 @@ extern "C" { KCModule *create_korganizerconfigtime( TQWidget *parent, const char * ) { - KGlobal::locale()->insertCatalogue( "timezones" ); + TDEGlobal::locale()->insertCatalogue( "timezones" ); return new KOPrefsDialogTime( parent, "kcmkorganizertime" ); } } @@ -602,14 +602,14 @@ class KOPrefsDialogFonts : public KPrefsModule KPrefsWidFont *timeBarFont = addWidFont( KOPrefs::instance()->timeBarFontItem(), topFrame, - KGlobal::locale()->formatTime( TQTime( 12, 34 ) ) ); + TDEGlobal::locale()->formatTime( TQTime( 12, 34 ) ) ); topLayout->addWidget(timeBarFont->label(),0,0); topLayout->addWidget(timeBarFont->preview(),0,1); topLayout->addWidget(timeBarFont->button(),0,2); KPrefsWidFont *monthViewFont = addWidFont( KOPrefs::instance()->monthViewFontItem(), topFrame, - KGlobal::locale()->formatTime(TQTime(12,34)) + " " + + TDEGlobal::locale()->formatTime(TQTime(12,34)) + " " + i18n("Event text") ); topLayout->addWidget(monthViewFont->label(),1,0); @@ -625,7 +625,7 @@ class KOPrefsDialogFonts : public KPrefsModule KPrefsWidFont *marcusBainsFont = addWidFont( KOPrefs::instance()->marcusBainsFontItem(), topFrame, - KGlobal::locale()->formatTime( TQTime( 12, 34, 23 ) ) ); + TDEGlobal::locale()->formatTime( TQTime( 12, 34, 23 ) ) ); topLayout->addWidget(marcusBainsFont->label(),3,0); topLayout->addWidget(marcusBainsFont->preview(),3,1); topLayout->addWidget(marcusBainsFont->button(),3,2); diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp index 9f711d60..8cac3182 100644 --- a/korganizer/korgac/alarmdialog.cpp +++ b/korganizer/korgac/alarmdialog.cpp @@ -112,7 +112,7 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c connect( calendar, TQT_SIGNAL(calendarChanged()), this, TQT_SLOT(slotCalendarChanged()) ); - KGlobal::iconLoader()->addAppDir( "tdepim" ); + TDEGlobal::iconLoader()->addAppDir( "tdepim" ); setButtonOK( i18n( "Suspend" ) ); TQWidget *topBox = plainPage(); @@ -123,7 +123,7 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c topLayout->addWidget( label ); mSplitter = new TQSplitter( Qt::Vertical, topBox ); - mSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() ); + mSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); topLayout->addWidget( mSplitter ); mIncidenceListView = new KListView( mSplitter ); @@ -505,9 +505,9 @@ void AlarmDialog::eventNotification() if (alarm->type() == Alarm::Procedure) { // FIXME: Add a message box asking whether the procedure should really be executed kdDebug(5890) << "Starting program: '" << alarm->programFile() << "'" << endl; - KProcess proc; + TDEProcess proc; proc << TQFile::encodeName(alarm->programFile()).data(); - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); } else if (alarm->type() == Alarm::Audio) { beeped = true; @@ -693,7 +693,7 @@ TQDateTime AlarmDialog::triggerDateForIncidence( Incidence *incidence, if ( incidence->doesRecur() ) { result = incidence->recurrence()->getNextDateTime( reminderAt ); - displayStr = KGlobal::locale()->formatDateTime( result ); + displayStr = TDEGlobal::locale()->formatDateTime( result ); } if ( incidence->type() == "Event" ) { diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp index aaeedd7f..301f058a 100644 --- a/korganizer/korgac/alarmdockwindow.cpp +++ b/korganizer/korgac/alarmdockwindow.cpp @@ -57,7 +57,7 @@ AlarmDockWindow::AlarmDockWindow( const char *name ) setCaption( mName ); // Set up icons - KGlobal::iconLoader()->addAppDir( "korgac" ); + TDEGlobal::iconLoader()->addAppDir( "korgac" ); mPixmapEnabled = loadSizedIcon( "korgac", width() ); mPixmapDisabled = loadSizedIcon( "korgac_disabled", width() ); diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp index 5b3ee4e9..a2eacaf0 100644 --- a/korganizer/korgac/koalarmclient.cpp +++ b/korganizer/korgac/koalarmclient.cpp @@ -152,9 +152,9 @@ void KOAlarmClient::slotQuit() void KOAlarmClient::saveLastCheckTime() { - KConfigGroup cg( KGlobal::config(), "Alarms"); + KConfigGroup cg( TDEGlobal::config(), "Alarms"); cg.writeEntry( "CalendarsLastChecked", mLastChecked ); - KGlobal::config()->sync(); + TDEGlobal::config()->sync(); } void KOAlarmClient::quit() diff --git a/korganizer/korgac/korgacmain.cpp b/korganizer/korgac/korgacmain.cpp index 8b901238..afa7fe45 100644 --- a/korganizer/korgac/korgacmain.cpp +++ b/korganizer/korgac/korgacmain.cpp @@ -80,7 +80,7 @@ int main( int argc, char **argv ) MyApp app; app.disableSessionManagement(); - KGlobal::locale()->insertCatalogue( "libkcal" ); + TDEGlobal::locale()->insertCatalogue( "libkcal" ); return app.exec(); } diff --git a/korganizer/korganizer.cpp b/korganizer/korganizer.cpp index 6067ca02..dba9c2c8 100644 --- a/korganizer/korganizer.cpp +++ b/korganizer/korganizer.cpp @@ -202,7 +202,7 @@ void KOrganizer::writeSettings() void KOrganizer::initActions() { - setInstance( KGlobal::instance() ); + setInstance( TDEGlobal::instance() ); setXMLFile( "korganizerui.rc" ); setStandardToolBarMenuEnabled( true ); diff --git a/korganizer/korganizer.h b/korganizer/korganizer.h index b51a4f99..e43c06a8 100644 --- a/korganizer/korganizer.h +++ b/korganizer/korganizer.h @@ -41,7 +41,7 @@ class KTempFile; class KRecentFilesAction; class KOWindowList; class KToggleAction; -class KProcess; +class TDEProcess; class KONewStuff; class ActionManager; class CalendarView; diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp index 4bea20a7..6886358f 100644 --- a/korganizer/korganizer_part.cpp +++ b/korganizer/korganizer_part.cpp @@ -71,9 +71,9 @@ KOrganizerPart::KOrganizerPart( TQWidget *parentWidget, const char *widgetName, const TQStringList & ) : KParts::ReadOnlyPart(parent, name), mTopLevelWidget( parentWidget->topLevelWidget() ) { - KGlobal::locale()->insertCatalogue( "libkcal" ); - KGlobal::locale()->insertCatalogue( "libtdepim" ); - KGlobal::locale()->insertCatalogue( "kdgantt" ); + TDEGlobal::locale()->insertCatalogue( "libkcal" ); + TDEGlobal::locale()->insertCatalogue( "libtdepim" ); + TDEGlobal::locale()->insertCatalogue( "kdgantt" ); KOCore::self()->addXMLGUIClient( mTopLevelWidget, this ); @@ -140,7 +140,7 @@ TDEAboutData *KOrganizerPart::createAboutData() return new KOrg::AboutData; } -void KOrganizerPart::startCompleted( KProcess *process ) +void KOrganizerPart::startCompleted( TDEProcess *process ) { delete process; } diff --git a/korganizer/korganizer_part.h b/korganizer/korganizer_part.h index ff35d9ba..1596c4d8 100644 --- a/korganizer/korganizer_part.h +++ b/korganizer/korganizer_part.h @@ -33,7 +33,7 @@ class TDEInstance; class TDEAboutData; -class KProcess; +class TDEProcess; class CalendarView; class ActionManager; @@ -95,7 +95,7 @@ class KOrganizerPart: public KParts::ReadOnlyPart, virtual bool openFile(); protected slots: - void startCompleted( KProcess * ); + void startCompleted( TDEProcess * ); private: CalendarView *mView; diff --git a/korganizer/kotimelineview.cpp b/korganizer/kotimelineview.cpp index d47e360e..a93c6d68 100644 --- a/korganizer/kotimelineview.cpp +++ b/korganizer/kotimelineview.cpp @@ -54,7 +54,7 @@ KOTimelineView::KOTimelineView(Calendar *calendar, TQWidget *parent, mGantt->removeColumn( 0 ); mGantt->addColumn( i18n("Calendar") ); mGantt->setHeaderVisible( true ); - if ( KGlobal::locale()->use12Clock() ) + if ( TDEGlobal::locale()->use12Clock() ) mGantt->setHourFormat( KDGanttView::Hour_12 ); else mGantt->setHourFormat( KDGanttView::Hour_24_FourDigit ); diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp index e7fad7da..1e13f8a6 100644 --- a/korganizer/kotodoviewitem.cpp +++ b/korganizer/kotodoviewitem.cpp @@ -268,11 +268,11 @@ void KOTodoViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int progress = (int)(( (width-6)*mTodo->percentComplete())/100.0 + 0.5); p->fillRect( 0, 0, width, height(), _cg.base() ); // background - p->setPen( KGlobalSettings::textColor() ); //border - p->setBrush( KGlobalSettings::baseColor() ); //filling + p->setPen( TDEGlobalSettings::textColor() ); //border + p->setBrush( TDEGlobalSettings::baseColor() ); //filling p->drawRect( 2, 2, width-4, height()-4); p->fillRect( 3, 3, progress, height()-6, - KGlobalSettings::highlightColor() ); + TDEGlobalSettings::highlightColor() ); p->restore(); } else { TQCheckListItem::paintCell(p, _cg, column, width, alignment); diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index 6287890c..14bae60c 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp @@ -65,7 +65,7 @@ KOWhatsNextView::KOWhatsNextView(Calendar *calendar, TQWidget *parent, : KOrg::BaseView(calendar, parent, name) { // TQLabel *dateLabel = -// new TQLabel(KGlobal::locale()->formatDate(TQDate::currentDate()),this); +// new TQLabel(TDEGlobal::locale()->formatDate(TQDate::currentDate()),this); // dateLabel->setMargin(2); // dateLabel->setAlignment(AlignCenter); @@ -103,11 +103,11 @@ void KOWhatsNextView::updateView() mText += "

"; if ( mStartDate.daysTo( mEndDate ) < 1 ) { - mText += KGlobal::locale()->formatDate( mStartDate ); + mText += TDEGlobal::locale()->formatDate( mStartDate ); } else { mText += i18n("Date from - to", "%1 - %2") - .arg( KGlobal::locale()->formatDate( mStartDate ) ) - .arg( KGlobal::locale()->formatDate( mEndDate ) ); + .arg( TDEGlobal::locale()->formatDate( mStartDate ) ) + .arg( TDEGlobal::locale()->formatDate( mEndDate ) ); } mText+="

\n"; @@ -281,14 +281,14 @@ void KOWhatsNextView::appendEvent( Incidence *ev, const TQDateTime &start, if ( starttime.date().daysTo( endtime.date() ) >= 1 ) { mText += i18n("date from - to", "%1 - %2") - .arg( KGlobal::locale()->formatDateTime( starttime ) ) - .arg( KGlobal::locale()->formatDateTime( endtime ) ); + .arg( TDEGlobal::locale()->formatDateTime( starttime ) ) + .arg( TDEGlobal::locale()->formatDateTime( endtime ) ); } else { /*if (reply) */ mText += i18n("date, from - to", "%1, %2 - %3") - .arg( KGlobal::locale()->formatDate( starttime.date(), true ) ) - .arg( KGlobal::locale()->formatTime( starttime.time() ) ) - .arg( KGlobal::locale()->formatTime( endtime.time() ) ); + .arg( TDEGlobal::locale()->formatDate( starttime.date(), true ) ) + .arg( TDEGlobal::locale()->formatTime( starttime.time() ) ) + .arg( TDEGlobal::locale()->formatTime( endtime.time() ) ); } } // } diff --git a/korganizer/main.cpp b/korganizer/main.cpp index 3f335775..118b3264 100644 --- a/korganizer/main.cpp +++ b/korganizer/main.cpp @@ -47,9 +47,9 @@ int main ( int argc, char **argv ) KOrganizerApp app; - KGlobal::locale()->insertCatalogue( "libkcal" ); - KGlobal::locale()->insertCatalogue( "libtdepim" ); - KGlobal::locale()->insertCatalogue( "kdgantt" ); + TDEGlobal::locale()->insertCatalogue( "libkcal" ); + TDEGlobal::locale()->insertCatalogue( "libtdepim" ); + TDEGlobal::locale()->insertCatalogue( "kdgantt" ); if ( app.isRestored() ) { RESTORE( KOrganizer ) diff --git a/korganizer/multiagendaview.cpp b/korganizer/multiagendaview.cpp index 7370f6f1..e76d36b5 100644 --- a/korganizer/multiagendaview.cpp +++ b/korganizer/multiagendaview.cpp @@ -58,7 +58,7 @@ MultiAgendaView::MultiAgendaView( Calendar * cal, CalendarView *calendarView, mLeftTopSpacer = new TQWidget( topSideBox ); mLeftTopSpacer->setFixedHeight( topLabelHeight ); mLeftSplitter = new TQSplitter( Qt::Vertical, topSideBox ); - mLeftSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() ); + mLeftSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); TQLabel *label = new TQLabel( i18n("All Day"), mLeftSplitter ); label->setAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak ); TQVBox *sideBox = new TQVBox( mLeftSplitter ); @@ -82,7 +82,7 @@ MultiAgendaView::MultiAgendaView( Calendar * cal, CalendarView *calendarView, mRightTopSpacer = new TQWidget( topSideBox ); mRightTopSpacer->setFixedHeight( topLabelHeight ); mRightSplitter = new TQSplitter( Qt::Vertical, topSideBox ); - mRightSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() ); + mRightSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); new TQWidget( mRightSplitter ); sideBox = new TQVBox( mRightSplitter ); eiSpacer = new EventIndicator( EventIndicator::Top, sideBox ); @@ -461,7 +461,7 @@ bool MultiAgendaView::eventFilter(TQObject * obj, TQEvent * event) { if ( obj->className() == TQCString(TQSPLITTERHANDLE_OBJECT_NAME_STRING) ) { // KDE4: not needed anymore, TQSplitter has a moved signal there - if ( (event->type() == TQEvent::MouseMove && KGlobalSettings::opaqueResize()) + if ( (event->type() == TQEvent::MouseMove && TDEGlobalSettings::opaqueResize()) || event->type() == TQEvent::MouseButtonRelease ) { FOREACH_VIEW( agenda ) { if ( TQT_BASE_OBJECT(agenda->splitter()) == TQT_BASE_OBJECT(obj->parent()) ) diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp index 063c6756..ca3c4c49 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 6298151a..54a11852 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 8a9f37bd..742c7849 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 0c124bbe..f22e1b17 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 64cdd7a3..da7d5f48 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); } }; diff --git a/korganizer/printing/calprintdefaultplugins.cpp b/korganizer/printing/calprintdefaultplugins.cpp index caa2e69e..e6701554 100644 --- a/korganizer/printing/calprintdefaultplugins.cpp +++ b/korganizer/printing/calprintdefaultplugins.cpp @@ -298,7 +298,7 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height ) exceptString = i18n("except for listed dates", " except"); for ( uint i = 0; i < recurs->exDates().size(); i++ ) { exceptString.append(" "); - exceptString.append( KGlobal::locale()->formatDate(recurs->exDates()[i], + exceptString.append( TDEGlobal::locale()->formatDate(recurs->exDates()[i], true) ); } } @@ -482,24 +482,24 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height ) if ( (*rit)->dtStart().isValid() ) { datesString += i18n( "Start Date: %1\n").arg( - KGlobal::locale()->formatDate( (*rit)->dtStart().date(), + TDEGlobal::locale()->formatDate( (*rit)->dtStart().date(), true ) ); if ( !(*rit)->doesFloat() ) { datesString += i18n( "Start Time: %1\n").arg( - KGlobal::locale()->formatTime((*rit)->dtStart().time(), + TDEGlobal::locale()->formatTime((*rit)->dtStart().time(), false, false) ); } } if ( (*rit)->dtEnd().isValid() ) { subitemString += i18n( "Due Date: %1\n").arg( - KGlobal::locale()->formatDate( (*rit)->dtEnd().date(), + TDEGlobal::locale()->formatDate( (*rit)->dtEnd().date(), true ) ); if ( !(*rit)->doesFloat() ) { subitemString += i18n( "subitem due time", "Due Time: %1\n").arg( - KGlobal::locale()->formatTime((*rit)->dtEnd().time(), + TDEGlobal::locale()->formatTime((*rit)->dtEnd().time(), false, false) ); } } @@ -705,7 +705,7 @@ void CalPrintDay::print( TQPainter &p, int width, int height ) TQRect footerBox( 0, height - footerHeight(), width, footerHeight() ); height -= footerHeight(); - KLocale *local = KGlobal::locale(); + KLocale *local = TDEGlobal::locale(); do { TQTime curStartTime( mStartTime ); @@ -915,7 +915,7 @@ void CalPrintWeek::print( TQPainter &p, int width, int height ) toWeek = mToDate.addDays( 6 - weekdayCol ); curWeek = fromWeek.addDays( 6 ); - KLocale *local = KGlobal::locale(); + KLocale *local = TDEGlobal::locale(); TQString line1, line2, title; TQRect headerBox( 0, 0, width, headerHeight() ); diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp index 99d57395..50436228 100644 --- a/korganizer/printing/calprintpluginbase.cpp +++ b/korganizer/printing/calprintpluginbase.cpp @@ -558,7 +558,7 @@ int CalPrintPluginBase::drawFooter( TQPainter &p, TQRect &footbox ) TQFont oldfont( p.font() ); p.setFont( TQFont( "sans-serif", 6 ) ); TQFontMetrics fm( p.font() ); - TQString dateStr = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false ); + TQString dateStr = TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false ); p.drawText( footbox, TQt::AlignCenter | TQt::AlignVCenter | TQt::SingleLine, i18n( "print date: formatted-datetime", "printed: %1" ).arg( dateStr ) ); p.setFont( oldfont ); @@ -690,7 +690,7 @@ void CalPrintPluginBase::drawTimeLine( TQPainter &p, const TQTime &fromTime, if ( newY < box.bottom() ) { TQFont oldFont( p.font() ); // draw the time: - if ( !KGlobal::locale()->use12Clock() ) { + if ( !TDEGlobal::locale()->use12Clock() ) { p.drawLine( xcenter, (int)newY, box.right(), (int)newY ); numStr.setNum( curTime.hour() ); if ( cellHeight > 30 ) { @@ -706,7 +706,7 @@ void CalPrintPluginBase::drawTimeLine( TQPainter &p, const TQTime &fromTime, } else { p.drawLine( box.left(), (int)newY, box.right(), (int)newY ); TQTime time( curTime.hour(), 0 ); - numStr = KGlobal::locale()->formatTime( time ); + numStr = TDEGlobal::locale()->formatTime( time ); if ( box.width() < 60 ) { p.setFont( TQFont( "sans-serif", 7, TQFont::Bold ) ); // for weekprint } else { @@ -906,14 +906,14 @@ void CalPrintPluginBase::drawAgendaItem( PrintCellItem *item, TQPainter &p, if ( event->location().isEmpty() ) { str = i18n( "starttime - endtime summary", "%1-%2 %3" ). - arg( KGlobal::locale()->formatTime( startTime.time() ) ). - arg( KGlobal::locale()->formatTime( endTime.time() ) ). + arg( TDEGlobal::locale()->formatTime( startTime.time() ) ). + arg( TDEGlobal::locale()->formatTime( endTime.time() ) ). arg( cleanStr( event->summary() ) ); } else { str = i18n( "starttime - endtime summary, location", "%1-%2 %3, %4" ). - arg( KGlobal::locale()->formatTime( startTime.time() ) ). - arg( KGlobal::locale()->formatTime( endTime.time() ) ). + arg( TDEGlobal::locale()->formatTime( startTime.time() ) ). + arg( TDEGlobal::locale()->formatTime( endTime.time() ) ). arg( cleanStr( event->summary() ) ). arg( cleanStr( event->location() ) ); } @@ -927,7 +927,7 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd, bool fullDate, bool printRecurDaily, bool printRecurWeekly ) { TQString dayNumStr; - const KLocale*local = KGlobal::locale(); + const KLocale*local = TDEGlobal::locale(); // This has to be localized if ( fullDate && mCalSys ) { @@ -1001,7 +1001,7 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd, continue; } if ( todo->hasStartDate() && !todo->doesFloat() ) { - timeText = KGlobal::locale()->formatTime( todo->dtStart().time() ) + " "; + timeText = TDEGlobal::locale()->formatTime( todo->dtStart().time() ) + " "; } else { timeText = ""; } @@ -1017,11 +1017,11 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd, if ( !todo->doesFloat() ) { str = i18n( "%1 (Due: %2)" ). arg( summaryStr ). - arg( KGlobal::locale()->formatDateTime( todo->dtDue() ) ); + arg( TDEGlobal::locale()->formatDateTime( todo->dtDue() ) ); } else { str = i18n( "%1 (Due: %2)" ). arg( summaryStr ). - arg( KGlobal::locale()->formatDate( todo->dtDue().date(), true ) ); + arg( TDEGlobal::locale()->formatDate( todo->dtDue().date(), true ) ); } } else { str = summaryStr; @@ -1423,7 +1423,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p, TodoParentStart *r ) { TQString outStr; - const KLocale *local = KGlobal::locale(); + const KLocale *local = TDEGlobal::locale(); TQRect rect; TodoParentStart startpt; @@ -1640,7 +1640,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p, int CalPrintPluginBase::weekdayColumn( int weekday ) { - return ( weekday + 7 - KGlobal::locale()->weekStartDay() ) % 7; + return ( weekday + 7 - TDEGlobal::locale()->weekStartDay() ) % 7; } void CalPrintPluginBase::drawJournalField( TQPainter &p, TQString field, TQString text, @@ -1670,7 +1670,7 @@ void CalPrintPluginBase::drawJournal( Journal * journal, TQPainter &p, int x, in TQFont oldFont( p.font() ); p.setFont( TQFont( "sans-serif", 15 ) ); TQString headerText; - TQString dateText( KGlobal::locale()-> + TQString dateText( TDEGlobal::locale()-> formatDate( journal->dtStart().date(), false ) ); if ( journal->summary().isEmpty() ) { diff --git a/korganizer/timelabels.cpp b/korganizer/timelabels.cpp index 38c58728..0d554edd 100644 --- a/korganizer/timelabels.cpp +++ b/korganizer/timelabels.cpp @@ -112,7 +112,7 @@ void TimeLabels::drawContents(TQPainter *p,int cx, int cy, int cw, int ch) TQFont nFont = font(); p->setFont( font() ); - if (!KGlobal::locale()->use12Clock()) { + if (!TDEGlobal::locale()->use12Clock()) { suffix = "00"; } else if (cell > 11) suffix = "pm"; @@ -144,7 +144,7 @@ void TimeLabels::drawContents(TQPainter *p,int cx, int cy, int cw, int ch) p->drawLine( cx, int(y), cw+2, int(y) ); hour.setNum(cell); // handle 24h and am/pm time formats - if (KGlobal::locale()->use12Clock()) { + if (TDEGlobal::locale()->use12Clock()) { if (cell == 12) suffix = "pm"; if (cell == 0) hour.setNum(12); if (cell > 12) hour.setNum(cell - 12); @@ -185,10 +185,10 @@ void TimeLabels::updateConfig() setFont(KOPrefs::instance()->mTimeBarFont); TQString test = "20"; - if ( KGlobal::locale()->use12Clock() ) + if ( TDEGlobal::locale()->use12Clock() ) test = "12"; mMiniWidth = fontMetrics().width( test ); - if ( KGlobal::locale()->use12Clock() ) + if ( TDEGlobal::locale()->use12Clock() ) test = "pm"; else { test = "00"; diff --git a/korganizer/timezone.cpp b/korganizer/timezone.cpp index a8ef2233..73891c2d 100644 --- a/korganizer/timezone.cpp +++ b/korganizer/timezone.cpp @@ -59,5 +59,5 @@ int main(int argc,char **argv) << qtime.toString( TQt::ISODate ) << endl; kdDebug(5850) << "KLocale::formatTime(): " - << KGlobal::locale()->formatTime( qtime ) << endl; + << TDEGlobal::locale()->formatTime( qtime ) << endl; } diff --git a/korganizer/urihandler.cpp b/korganizer/urihandler.cpp index 6b454e63..6e4819a8 100644 --- a/korganizer/urihandler.cpp +++ b/korganizer/urihandler.cpp @@ -117,9 +117,9 @@ bool UriHandler::process( TQWidget *parent, const TQString &uri ) // KaddressBook is not already running. // Pass it the UID of the contact via the command line while starting it - its neater. // We start it without its main interface - TQString iconPath = KGlobal::iconLoader()->iconPath( "go", KIcon::Small ); + TQString iconPath = TDEGlobal::iconLoader()->iconPath( "go", KIcon::Small ); TQString tmpStr = "kaddressbook --editor-only --uid "; - tmpStr += KProcess::quote( uid ); + tmpStr += TDEProcess::quote( uid ); KRun::runCommand( tmpStr, "KAddressBook", iconPath ); return true; } diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp index b026e95c..60277d1e 100644 --- a/korn/boxcontaineritem.cpp +++ b/korn/boxcontaineritem.cpp @@ -161,10 +161,10 @@ void BoxContainerItem::readConfig( KConfig* config, const int index ) void BoxContainerItem::runCommand( const TQString& cmd ) { - KProcess *process = new KProcess; + TDEProcess *process = new TDEProcess; process->setUseShell( true ); *process << cmd; - connect( process, TQT_SIGNAL( processExited (KProcess *) ), this, TQT_SLOT( processExited( KProcess * ) ) ); + connect( process, TQT_SIGNAL( processExited (TDEProcess *) ), this, TQT_SLOT( processExited( TDEProcess * ) ) ); process->start(); } @@ -281,7 +281,7 @@ void BoxContainerItem::drawLabel( TQLabel *label, const int count, const bool ne } if( hasIcon ) - pixmap = KGlobal::iconLoader()->loadIcon( *_icons[ index ], KIcon::Desktop, KIcon::SizeSmallMedium ); + pixmap = TDEGlobal::iconLoader()->loadIcon( *_icons[ index ], KIcon::Desktop, KIcon::SizeSmallMedium ); if( hasIcon && hasFg ) { @@ -435,7 +435,7 @@ void BoxContainerItem::stopTimer() doStopTimer(); } -void BoxContainerItem::processExited( KProcess* proc ) +void BoxContainerItem::processExited( TDEProcess* proc ) { delete proc; } diff --git a/korn/boxcontaineritem.h b/korn/boxcontaineritem.h index e12c400f..f903feb8 100644 --- a/korn/boxcontaineritem.h +++ b/korn/boxcontaineritem.h @@ -27,7 +27,7 @@ class KornMailSubject; class KActionCollection; class KConfig; class KPopupMenu; -class KProcess; +class TDEProcess; class TQColor; class TQLabel; @@ -213,10 +213,10 @@ signals: private slots: /** - * This slot is called when a KProcess-instance needs to be deleted:) + * This slot is called when a TDEProcess-instance needs to be deleted:) * @param proc The instance of the instance which must be deleted. */ - void processExited( KProcess* proc ); + void processExited( TDEProcess* proc ); protected: //This settings are stored here because every implementation needs them. diff --git a/korn/kio.cpp b/korn/kio.cpp index 8015595c..a2131198 100644 --- a/korn/kio.cpp +++ b/korn/kio.cpp @@ -461,17 +461,17 @@ bool KKioDrop::startProcess() // debug( "proc start: %s", _command.data() ); - _process = new KProcess; + _process = new TDEProcess; _process->setUseShell( true ); // only reading stdin yet - connect( _process,TQT_SIGNAL(receivedStdout( KProcess *, char *, int)), - this, TQT_SLOT(receivedStdout( KProcess *,char *,int)) ); - connect( _process, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(processExit(KProcess*)) ); + connect( _process,TQT_SIGNAL(receivedStdout( TDEProcess *, char *, int)), + this, TQT_SLOT(receivedStdout( TDEProcess *,char *,int)) ); + connect( _process, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(processExit(TDEProcess*)) ); *_process << _kurl->path(); - _process->start( KProcess::NotifyOnExit, KProcess::Stdout ); + _process->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ); return true; } @@ -491,7 +491,7 @@ bool KKioDrop::stopProcess() return true; } -void KKioDrop::receivedStdout( KProcess *proc, char * buffer, int /*len*/ ) +void KKioDrop::receivedStdout( TDEProcess *proc, char * buffer, int /*len*/ ) { assert(static_cast(proc) == static_cast(_process)); @@ -540,7 +540,7 @@ void KKioDrop::receivedStdout( KProcess *proc, char * buffer, int /*len*/ ) } -void KKioDrop::processExit(KProcess* proc) +void KKioDrop::processExit(TDEProcess* proc) { assert(static_cast(proc) == static_cast(_process)); diff --git a/korn/kio.h b/korn/kio.h index 21ac533e..519dced5 100644 --- a/korn/kio.h +++ b/korn/kio.h @@ -28,7 +28,7 @@ class TQWidget; class KDropDialog; class KornMailSubject; -class KProcess; +class TDEProcess; class KIO_Count; class KIO_Protocol; class KIO_Subjects; @@ -70,7 +70,7 @@ private: int _readSubjectsTotalSteps; int _deleteMailsTotalSteps; //For process - KProcess *_process; + TDEProcess *_process; //List of mailurls fetched by the last time emails were counted struct FileInfo { @@ -202,7 +202,7 @@ public slots: private slots: //For Process too - void processExit(KProcess*); - void receivedStdout( KProcess *, char *, int); + void processExit(TDEProcess*); + void receivedStdout( TDEProcess *, char *, int); }; #endif // KEG_KIODROP_H diff --git a/korn/mailsubject.cpp b/korn/mailsubject.cpp index 747d9ec7..459d7d46 100644 --- a/korn/mailsubject.cpp +++ b/korn/mailsubject.cpp @@ -178,7 +178,7 @@ const TQTextCodec* KornMailSubject::codecForName(const TQCString& _str) { if (_str.isEmpty()) return 0; TQCString codec = _str; - return KGlobal::charsets()->codecForName(codec); + return TDEGlobal::charsets()->codecForName(codec); } void KornMailSubject::decodeHeaders() diff --git a/korn/subjectsdlg.cpp b/korn/subjectsdlg.cpp index 5c96cbba..d1cf3954 100644 --- a/korn/subjectsdlg.cpp +++ b/korn/subjectsdlg.cpp @@ -15,13 +15,13 @@ KornSubjectsDlg::SubjectListViewItem::SubjectListViewItem( TQListView *parent, KornMailSubject * item) // set the column strings except column 2 (date) - : KListViewItem(parent, item->getSender(), item->getSubject(), "", KGlobal::locale()->formatNumber(item->getSize(), 0)) + : KListViewItem(parent, item->getSender(), item->getSubject(), "", TDEGlobal::locale()->formatNumber(item->getSize(), 0)) , _mailSubject( new KornMailSubject( *item ) ) { // convert the date according to the user settings and show it in column 2 TQDateTime date; date.setTime_t(_mailSubject->getDate()); - setText(2, KGlobal::locale()->formatDateTime(date, true, true)); + setText(2, TDEGlobal::locale()->formatDateTime(date, true, true)); } KornSubjectsDlg::SubjectListViewItem::~SubjectListViewItem() diff --git a/kresources/birthdays/resourcekabc.cpp b/kresources/birthdays/resourcekabc.cpp index 7102c8be..3a6af941 100644 --- a/kresources/birthdays/resourcekabc.cpp +++ b/kresources/birthdays/resourcekabc.cpp @@ -60,8 +60,8 @@ extern "C" { void *init_kcal_kabc() { - KGlobal::locale()->insertCatalogue( "kres_birthday" ); - KGlobal::locale()->insertCatalogue( "libkcal" ); + TDEGlobal::locale()->insertCatalogue( "kres_birthday" ); + TDEGlobal::locale()->insertCatalogue( "libkcal" ); return new KRES::PluginFactory(); } } diff --git a/kresources/blogging/kcal_resourceblogging_plugin.cpp b/kresources/blogging/kcal_resourceblogging_plugin.cpp index b3eaf937..4cc3dd8c 100644 --- a/kresources/blogging/kcal_resourceblogging_plugin.cpp +++ b/kresources/blogging/kcal_resourceblogging_plugin.cpp @@ -34,8 +34,8 @@ extern "C" { void *init_kcal_blogging() { - KGlobal::locale()->insertCatalogue( "tdepimresources" ); - KGlobal::locale()->insertCatalogue( "kres_blogging" ); + TDEGlobal::locale()->insertCatalogue( "tdepimresources" ); + TDEGlobal::locale()->insertCatalogue( "kres_blogging" ); return new BloggingFactory; } } diff --git a/kresources/caldav/export.h b/kresources/caldav/export.h index e747b58a..2e22c557 100644 --- a/kresources/caldav/export.h +++ b/kresources/caldav/export.h @@ -39,7 +39,7 @@ #define EXPORT_KRESOURCES_PLUGIN( resourceclass, resourceconfigclass, catalog ) \ typedef KRES::PluginFactory< resourceclass, resourceconfigclass > FactoryBase; \ class Factory : public FactoryBase { \ - public: Factory() { KGlobal::locale()->insertCatalogue(catalog); } \ + public: Factory() { TDEGlobal::locale()->insertCatalogue(catalog); } \ }; \ K_EXPORT_PLUGIN( Factory ) @@ -48,8 +48,8 @@ #define EXPORT_KRESOURCES_PLUGIN2( resourceclass, resourceconfigclass, catalog1, catalog2 ) \ typedef KRES::PluginFactory< resourceclass, resourceconfigclass > FactoryBase; \ class Factory : public FactoryBase { \ - public: Factory() { KGlobal::locale()->insertCatalogue(catalog1); \ - KGlobal::locale()->insertCatalogue(catalog2); } \ + public: Factory() { TDEGlobal::locale()->insertCatalogue(catalog1); \ + TDEGlobal::locale()->insertCatalogue(catalog2); } \ }; \ K_EXPORT_PLUGIN( Factory ) diff --git a/kresources/caldav/plugin.cpp b/kresources/caldav/plugin.cpp index ffccf678..9ce6d60f 100644 --- a/kresources/caldav/plugin.cpp +++ b/kresources/caldav/plugin.cpp @@ -40,8 +40,8 @@ extern "C" { void *init_kcal_caldav() { - KGlobal::locale()->insertCatalogue( "libkcal" ); - KGlobal::locale()->insertCatalogue( "kres_caldav" ); + TDEGlobal::locale()->insertCatalogue( "libkcal" ); + TDEGlobal::locale()->insertCatalogue( "kres_caldav" ); return new CalDavFactory; } } diff --git a/kresources/carddav/export.h b/kresources/carddav/export.h index e747b58a..2e22c557 100644 --- a/kresources/carddav/export.h +++ b/kresources/carddav/export.h @@ -39,7 +39,7 @@ #define EXPORT_KRESOURCES_PLUGIN( resourceclass, resourceconfigclass, catalog ) \ typedef KRES::PluginFactory< resourceclass, resourceconfigclass > FactoryBase; \ class Factory : public FactoryBase { \ - public: Factory() { KGlobal::locale()->insertCatalogue(catalog); } \ + public: Factory() { TDEGlobal::locale()->insertCatalogue(catalog); } \ }; \ K_EXPORT_PLUGIN( Factory ) @@ -48,8 +48,8 @@ #define EXPORT_KRESOURCES_PLUGIN2( resourceclass, resourceconfigclass, catalog1, catalog2 ) \ typedef KRES::PluginFactory< resourceclass, resourceconfigclass > FactoryBase; \ class Factory : public FactoryBase { \ - public: Factory() { KGlobal::locale()->insertCatalogue(catalog1); \ - KGlobal::locale()->insertCatalogue(catalog2); } \ + public: Factory() { TDEGlobal::locale()->insertCatalogue(catalog1); \ + TDEGlobal::locale()->insertCatalogue(catalog2); } \ }; \ K_EXPORT_PLUGIN( Factory ) diff --git a/kresources/carddav/plugin.cpp b/kresources/carddav/plugin.cpp index 8d51e53b..d0c4724f 100644 --- a/kresources/carddav/plugin.cpp +++ b/kresources/carddav/plugin.cpp @@ -38,8 +38,8 @@ extern "C" { void *init_kabc_carddav() { - KGlobal::locale()->insertCatalogue( "tdepimresources" ); - KGlobal::locale()->insertCatalogue( "kres_caldav" ); + TDEGlobal::locale()->insertCatalogue( "tdepimresources" ); + TDEGlobal::locale()->insertCatalogue( "kres_caldav" ); return new CardDavFactory; } } diff --git a/kresources/egroupware/kabc_resourcexmlrpcplugin.cpp b/kresources/egroupware/kabc_resourcexmlrpcplugin.cpp index 68918f8c..c4c0cc6c 100644 --- a/kresources/egroupware/kabc_resourcexmlrpcplugin.cpp +++ b/kresources/egroupware/kabc_resourcexmlrpcplugin.cpp @@ -34,7 +34,7 @@ extern "C" { void *init_kabc_xmlrpc() { - KGlobal::locale()->insertCatalogue( "kres_xmlrpc" ); + TDEGlobal::locale()->insertCatalogue( "kres_xmlrpc" ); return new XMLRPCFactory; } } diff --git a/kresources/egroupware/kcal_resourcexmlrpcplugin.cpp b/kresources/egroupware/kcal_resourcexmlrpcplugin.cpp index a22e55a0..021389b6 100644 --- a/kresources/egroupware/kcal_resourcexmlrpcplugin.cpp +++ b/kresources/egroupware/kcal_resourcexmlrpcplugin.cpp @@ -34,7 +34,7 @@ extern "C" { void *init_kcal_xmlrpc() { - KGlobal::locale()->insertCatalogue( "kres_xmlrpc" ); + TDEGlobal::locale()->insertCatalogue( "kres_xmlrpc" ); return new XMLRPCFactory; } } diff --git a/kresources/egroupware/knotes_resourcexmlrpcplugin.cpp b/kresources/egroupware/knotes_resourcexmlrpcplugin.cpp index db8cfdc4..276cb6b0 100644 --- a/kresources/egroupware/knotes_resourcexmlrpcplugin.cpp +++ b/kresources/egroupware/knotes_resourcexmlrpcplugin.cpp @@ -34,7 +34,7 @@ extern "C" { void *init_knotes_xmlrpc() { - KGlobal::locale()->insertCatalogue( "kres_xmlrpc" ); + TDEGlobal::locale()->insertCatalogue( "kres_xmlrpc" ); return new XMLRPCFactory; } } diff --git a/kresources/exchange/resourceexchange.cpp b/kresources/exchange/resourceexchange.cpp index 9aace416..eb90b8c4 100644 --- a/kresources/exchange/resourceexchange.cpp +++ b/kresources/exchange/resourceexchange.cpp @@ -60,7 +60,7 @@ extern "C" { void* init_resourcecalendarexchange() { - KGlobal::locale()->insertCatalogue( "kres_exchange" ); + TDEGlobal::locale()->insertCatalogue( "kres_exchange" ); return new ExchangeFactory; } } diff --git a/kresources/featureplan/kcal_resourcefeatureplanplugin.cpp b/kresources/featureplan/kcal_resourcefeatureplanplugin.cpp index 8f384ac9..ae2759e4 100644 --- a/kresources/featureplan/kcal_resourcefeatureplanplugin.cpp +++ b/kresources/featureplan/kcal_resourcefeatureplanplugin.cpp @@ -34,7 +34,7 @@ extern "C" { void* init_kcal_resourcefeatureplan() { - KGlobal::locale()->insertCatalogue( "kres_featureplan" ); + TDEGlobal::locale()->insertCatalogue( "kres_featureplan" ); return new FeatureplanFactory; } } diff --git a/kresources/groupdav/kabc_resourcegroupdav_plugin.cpp b/kresources/groupdav/kabc_resourcegroupdav_plugin.cpp index 63614979..d487889f 100644 --- a/kresources/groupdav/kabc_resourcegroupdav_plugin.cpp +++ b/kresources/groupdav/kabc_resourcegroupdav_plugin.cpp @@ -35,8 +35,8 @@ extern "C" { void *init_kabc_groupdav() { - KGlobal::locale()->insertCatalogue( "tdepimresources" ); - KGlobal::locale()->insertCatalogue( "kres_groupdav" ); + TDEGlobal::locale()->insertCatalogue( "tdepimresources" ); + TDEGlobal::locale()->insertCatalogue( "kres_groupdav" ); return new GroupDavFactory; } } diff --git a/kresources/groupdav/kcal_resourcegroupdav_plugin.cpp b/kresources/groupdav/kcal_resourcegroupdav_plugin.cpp index 10b751a3..f06e5d24 100644 --- a/kresources/groupdav/kcal_resourcegroupdav_plugin.cpp +++ b/kresources/groupdav/kcal_resourcegroupdav_plugin.cpp @@ -36,8 +36,8 @@ extern "C" { void *init_kcal_groupdav() { - KGlobal::locale()->insertCatalogue( "tdepimresources" ); - KGlobal::locale()->insertCatalogue( "kres_groupdav" ); + TDEGlobal::locale()->insertCatalogue( "tdepimresources" ); + TDEGlobal::locale()->insertCatalogue( "kres_groupdav" ); return new GroupDavFactory; } } diff --git a/kresources/groupware/kabc_resourcegroupware_plugin.cpp b/kresources/groupware/kabc_resourcegroupware_plugin.cpp index 38b156fd..c7266b18 100644 --- a/kresources/groupware/kabc_resourcegroupware_plugin.cpp +++ b/kresources/groupware/kabc_resourcegroupware_plugin.cpp @@ -32,8 +32,8 @@ extern "C" { void *init_kabc_groupware() { - KGlobal::locale()->insertCatalogue( "libkcal" ); - KGlobal::locale()->insertCatalogue( "kres_groupware" ); + TDEGlobal::locale()->insertCatalogue( "libkcal" ); + TDEGlobal::locale()->insertCatalogue( "kres_groupware" ); return new ResourceGroupware; } } diff --git a/kresources/groupware/kcal_resourcegroupware_plugin.cpp b/kresources/groupware/kcal_resourcegroupware_plugin.cpp index bfa4f9f6..992a95d5 100644 --- a/kresources/groupware/kcal_resourcegroupware_plugin.cpp +++ b/kresources/groupware/kcal_resourcegroupware_plugin.cpp @@ -33,8 +33,8 @@ extern "C" { void *init_kcal_groupware() { - KGlobal::locale()->insertCatalogue( "libkcal" ); - KGlobal::locale()->insertCatalogue( "kres_groupware" ); + TDEGlobal::locale()->insertCatalogue( "libkcal" ); + TDEGlobal::locale()->insertCatalogue( "kres_groupware" ); return new ResourceGroupware; } } diff --git a/kresources/groupwise/kabc_resourcegroupwise_plugin.cpp b/kresources/groupwise/kabc_resourcegroupwise_plugin.cpp index bacd1a7b..3f973bc5 100644 --- a/kresources/groupwise/kabc_resourcegroupwise_plugin.cpp +++ b/kresources/groupwise/kabc_resourcegroupwise_plugin.cpp @@ -33,8 +33,8 @@ extern "C" { void *init_kabc_groupwise() { - KGlobal::locale()->insertCatalogue( "libkcal" ); - KGlobal::locale()->insertCatalogue( "kres_groupwise" ); + TDEGlobal::locale()->insertCatalogue( "libkcal" ); + TDEGlobal::locale()->insertCatalogue( "kres_groupwise" ); return new GroupwiseFactory; } } diff --git a/kresources/groupwise/kcal_resourcegroupwise_plugin.cpp b/kresources/groupwise/kcal_resourcegroupwise_plugin.cpp index 8cce68e7..1c1df762 100644 --- a/kresources/groupwise/kcal_resourcegroupwise_plugin.cpp +++ b/kresources/groupwise/kcal_resourcegroupwise_plugin.cpp @@ -33,8 +33,8 @@ extern "C" { void *init_kcal_groupwise() { - KGlobal::locale()->insertCatalogue( "libkcal" ); - KGlobal::locale()->insertCatalogue( "kres_groupwise" ); + TDEGlobal::locale()->insertCatalogue( "libkcal" ); + TDEGlobal::locale()->insertCatalogue( "kres_groupwise" ); return new GroupwiseFactory; } } diff --git a/kresources/kolab/shared/resourcekolabbase.cpp b/kresources/kolab/shared/resourcekolabbase.cpp index d88c2125..c6f1f425 100644 --- a/kresources/kolab/shared/resourcekolabbase.cpp +++ b/kresources/kolab/shared/resourcekolabbase.cpp @@ -52,8 +52,8 @@ static unsigned int uniquifier = 0; ResourceKolabBase::ResourceKolabBase( const TQCString& objId ) : mSilent( false ) { - KGlobal::locale()->insertCatalogue( "kres_kolab" ); - KGlobal::locale()->insertCatalogue( "libkcal" ); + TDEGlobal::locale()->insertCatalogue( "kres_kolab" ); + TDEGlobal::locale()->insertCatalogue( "libkcal" ); TQString uniqueObjId = TQString( objId ) + TQString::number( uniquifier++ ); mConnection = new KMailConnection( this, uniqueObjId.utf8() ); } diff --git a/kresources/remote/resourceremote_plugin.cpp b/kresources/remote/resourceremote_plugin.cpp index 85e6363e..67eaa92f 100644 --- a/kresources/remote/resourceremote_plugin.cpp +++ b/kresources/remote/resourceremote_plugin.cpp @@ -34,8 +34,8 @@ extern "C" { void *init_kcal_remote() { - KGlobal::locale()->insertCatalogue( "libkcal" ); - KGlobal::locale()->insertCatalogue( "kres_remote" ); + TDEGlobal::locale()->insertCatalogue( "libkcal" ); + TDEGlobal::locale()->insertCatalogue( "kres_remote" ); return new RemoteFactory; } } diff --git a/kresources/scalix/scalixadmin/main.cpp b/kresources/scalix/scalixadmin/main.cpp index b317d90d..6b9192a3 100644 --- a/kresources/scalix/scalixadmin/main.cpp +++ b/kresources/scalix/scalixadmin/main.cpp @@ -42,7 +42,7 @@ int main( int argc, char **argv ) TDEApplication app; - KGlobal::locale()->insertCatalogue( "scalixadmin" ); + TDEGlobal::locale()->insertCatalogue( "scalixadmin" ); MainWindow *window = new MainWindow; window->show(); diff --git a/kresources/scalix/scalixadmin/mainwindow.cpp b/kresources/scalix/scalixadmin/mainwindow.cpp index 4f3dbf94..04e396d7 100644 --- a/kresources/scalix/scalixadmin/mainwindow.cpp +++ b/kresources/scalix/scalixadmin/mainwindow.cpp @@ -37,19 +37,19 @@ MainWindow::MainWindow() { KJanusWidget *wdg = new KJanusWidget( this, "", KJanusWidget::IconList ); - TQPixmap icon = KGlobal::iconLoader()->loadIcon( "folder_yellow", KIcon::Desktop ); + TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "folder_yellow", KIcon::Desktop ); TQVBox *page = wdg->addVBoxPage( i18n( "Other Accounts" ), i18n( "Register other accounts" ), icon ); new OtherUserPage( page ); - icon = KGlobal::iconLoader()->loadIcon( "edu_languages", KIcon::Desktop ); + icon = TDEGlobal::iconLoader()->loadIcon( "edu_languages", KIcon::Desktop ); page = wdg->addVBoxPage( i18n( "Delegates" ), i18n( "Setup delegates for my account" ), icon ); new DelegatePage( page ); - icon = KGlobal::iconLoader()->loadIcon( "kontact_summary_green", KIcon::Desktop ); + icon = TDEGlobal::iconLoader()->loadIcon( "kontact_summary_green", KIcon::Desktop ); page = wdg->addVBoxPage( i18n( "Out of Office..." ), i18n( "Setup Out of Office Message" ), icon ); new OutOfOfficePage( page ); - icon = KGlobal::iconLoader()->loadIcon( "password", KIcon::Desktop ); + icon = TDEGlobal::iconLoader()->loadIcon( "password", KIcon::Desktop ); page = wdg->addVBoxPage( i18n( "Password" ), i18n( "Change the password" ), icon ); new PasswordPage( page ); diff --git a/kresources/scalix/shared/resourcescalixbase.cpp b/kresources/scalix/shared/resourcescalixbase.cpp index c9c7ee11..de1aa915 100644 --- a/kresources/scalix/shared/resourcescalixbase.cpp +++ b/kresources/scalix/shared/resourcescalixbase.cpp @@ -51,8 +51,8 @@ static unsigned int uniquifier = 0; ResourceScalixBase::ResourceScalixBase( const TQCString& objId ) : mSilent( false ) { - KGlobal::locale()->insertCatalogue( "kres_scalix" ); - KGlobal::locale()->insertCatalogue( "libkcal" ); + TDEGlobal::locale()->insertCatalogue( "kres_scalix" ); + TDEGlobal::locale()->insertCatalogue( "libkcal" ); TQString uniqueObjId = TQString( objId ) + TQString::number( uniquifier++ ); mConnection = new KMailConnection( this, uniqueObjId.utf8() ); } diff --git a/kresources/slox/kabcresourceslox_plugin.cpp b/kresources/slox/kabcresourceslox_plugin.cpp index f570cff9..cbc02f25 100644 --- a/kresources/slox/kabcresourceslox_plugin.cpp +++ b/kresources/slox/kabcresourceslox_plugin.cpp @@ -32,8 +32,8 @@ extern "C" { void *init_kabc_slox() { - KGlobal::locale()->insertCatalogue( "libkcal" ); - KGlobal::locale()->insertCatalogue( "kabc_slox" ); + TDEGlobal::locale()->insertCatalogue( "libkcal" ); + TDEGlobal::locale()->insertCatalogue( "kabc_slox" ); return new SloxFactory; } } diff --git a/kresources/slox/kcalresourceslox_plugin.cpp b/kresources/slox/kcalresourceslox_plugin.cpp index e141892d..8a5cf690 100644 --- a/kresources/slox/kcalresourceslox_plugin.cpp +++ b/kresources/slox/kcalresourceslox_plugin.cpp @@ -33,8 +33,8 @@ extern "C" { void *init_kcal_slox() { - KGlobal::locale()->insertCatalogue( "libkcal" ); - KGlobal::locale()->insertCatalogue( "kabc_slox" ); + TDEGlobal::locale()->insertCatalogue( "libkcal" ); + TDEGlobal::locale()->insertCatalogue( "kabc_slox" ); return new SLOXFactory; } } diff --git a/kresources/slox/sloxfolderdialog.cpp b/kresources/slox/sloxfolderdialog.cpp index 4f17ea89..4d21c230 100644 --- a/kresources/slox/sloxfolderdialog.cpp +++ b/kresources/slox/sloxfolderdialog.cpp @@ -82,7 +82,7 @@ void SloxFolderDialog::createFolderViewItem( SloxFolder *folder ) } folder->item->setText( 0, folder->name() ); folder->item->setText( 1, folder->id() ); - KGlobal::instance()->iconLoader()->addAppDir( "kmail" ); + TDEGlobal::instance()->iconLoader()->addAppDir( "kmail" ); switch ( folder->type() ) { case Calendar: folder->item->setPixmap( 0, SmallIcon( "kmgroupware_folder_calendar" ) ); diff --git a/kresources/tvanytime/kcal_resourcetvanytime_plugin.cpp b/kresources/tvanytime/kcal_resourcetvanytime_plugin.cpp index 481a62b5..9ff0ae75 100644 --- a/kresources/tvanytime/kcal_resourcetvanytime_plugin.cpp +++ b/kresources/tvanytime/kcal_resourcetvanytime_plugin.cpp @@ -33,8 +33,8 @@ extern "C" { void *init_kcal_tvanytime() { - KGlobal::locale()->insertCatalogue( "libkcal" ); - KGlobal::locale()->insertCatalogue( "kres_tvanytime" ); + TDEGlobal::locale()->insertCatalogue( "libkcal" ); + TDEGlobal::locale()->insertCatalogue( "kres_tvanytime" ); return new TVAnytimeFactory; } } diff --git a/ktnef/gui/ktnefmain.cpp b/ktnef/gui/ktnefmain.cpp index 884c3ac9..837f01c3 100644 --- a/ktnef/gui/ktnefmain.cpp +++ b/ktnef/gui/ktnefmain.cpp @@ -65,12 +65,12 @@ KTNEFMain::KTNEFMain(TQWidget *parent, const char *name) setupTNEF(); - KGlobal::config()->setGroup("Settings"); - defaultdir_ = KGlobal::config()->readPathEntry("defaultdir", "/tmp/"); + TDEGlobal::config()->setGroup("Settings"); + defaultdir_ = TDEGlobal::config()->readPathEntry("defaultdir", "/tmp/"); lastdir_ = defaultdir_; // create personale temo extract dir - KStandardDirs::makeDir(KGlobal::dirs()->localtdedir() + "/share/apps/ktnef/tmp"); + KStandardDirs::makeDir(TDEGlobal::dirs()->localtdedir() + "/share/apps/ktnef/tmp"); resize(430,350); setAutoSaveSettings( "MainWindow" ); @@ -189,7 +189,7 @@ void KTNEFMain::viewFile() TQString KTNEFMain::extractTemp(KTNEFAttach *att) { - TQString dir = KGlobal::dirs()->localtdedir() + "/share/apps/ktnef/tmp/"; + TQString dir = TDEGlobal::dirs()->localtdedir() + "/share/apps/ktnef/tmp/"; parser_->extractFileTo(att->name(), dir); dir.append(att->name()); return dir; @@ -251,8 +251,8 @@ void KTNEFMain::optionDefaultDir() if (!dirname.isEmpty()) { defaultdir_ = dirname; - KGlobal::config()->setGroup("Settings"); - KGlobal::config()->writePathEntry("defaultdir",defaultdir_); + TDEGlobal::config()->setGroup("Settings"); + TDEGlobal::config()->writePathEntry("defaultdir",defaultdir_); } } @@ -285,7 +285,7 @@ void KTNEFMain::enableSingleAction(bool on) void KTNEFMain::cleanup() { - TQDir d(KGlobal::dirs()->localtdedir() + "/share/apps/ktnef/tmp/"); + TQDir d(TDEGlobal::dirs()->localtdedir() + "/share/apps/ktnef/tmp/"); const TQFileInfoList *list = d.entryInfoList(TQDir::Files|TQDir::Hidden,TQDir::Unsorted); TQFileInfoListIterator it(*list); for (;it.current();++it) @@ -358,7 +358,7 @@ void KTNEFMain::viewDragRequested( const TQValueList& list ) void KTNEFMain::slotEditToolbars() { - saveMainWindowSettings( KGlobal::config(), TQString::fromLatin1("MainWindow") ); + saveMainWindowSettings( TDEGlobal::config(), TQString::fromLatin1("MainWindow") ); KEditToolbar dlg(actionCollection()); connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() )); dlg.exec(); @@ -367,7 +367,7 @@ void KTNEFMain::slotEditToolbars() void KTNEFMain::slotNewToolbarConfig() { createGUI(); - applyMainWindowSettings( KGlobal::config(), TQString::fromLatin1("MainWindow") ); + applyMainWindowSettings( TDEGlobal::config(), TQString::fromLatin1("MainWindow") ); } void KTNEFMain::slotShowMessageProperties() @@ -380,7 +380,7 @@ void KTNEFMain::slotShowMessageText() { TQString rtf = parser_->message()->rtfString(); tqDebug( "%s", rtf.latin1() ); - KTempFile tmpFile( KGlobal::dirs()->localtdedir() + "/share/apps/ktnef/tmp/", "rtf"); + KTempFile tmpFile( TDEGlobal::dirs()->localtdedir() + "/share/apps/ktnef/tmp/", "rtf"); *( tmpFile.textStream() ) << rtf; tmpFile.close(); diff --git a/libemailfunctions/networkstatus.cpp b/libemailfunctions/networkstatus.cpp index 25e7cdf1..7bb83642 100644 --- a/libemailfunctions/networkstatus.cpp +++ b/libemailfunctions/networkstatus.cpp @@ -35,7 +35,7 @@ NetworkStatus *NetworkStatus::mSelf = 0; NetworkStatus::NetworkStatus() : TQObject( 0, "NetworkStatus" ), DCOPObject( "NetworkStatus" ) { - KConfigGroup group( KGlobal::config(), "NetworkStatus" ); + KConfigGroup group( TDEGlobal::config(), "NetworkStatus" ); if ( group.readBoolEntry( "Online", true ) == true ) mStatus = Online; else @@ -46,7 +46,7 @@ NetworkStatus::NetworkStatus() NetworkStatus::~NetworkStatus() { - KConfigGroup group( KGlobal::config(), "NetworkStatus" ); + KConfigGroup group( TDEGlobal::config(), "NetworkStatus" ); group.writeEntry( "Online", mStatus == Online ); } diff --git a/libkcal/event.cpp b/libkcal/event.cpp index 5bd3a818..b040d182 100644 --- a/libkcal/event.cpp +++ b/libkcal/event.cpp @@ -100,17 +100,17 @@ TQDate Event::dateEnd() const TQString Event::dtEndTimeStr() const { - return KGlobal::locale()->formatTime(dtEnd().time()); + return TDEGlobal::locale()->formatTime(dtEnd().time()); } TQString Event::dtEndDateStr(bool shortfmt) const { - return KGlobal::locale()->formatDate(dtEnd().date(),shortfmt); + return TDEGlobal::locale()->formatDate(dtEnd().date(),shortfmt); } TQString Event::dtEndStr() const { - return KGlobal::locale()->formatDateTime(dtEnd()); + return TDEGlobal::locale()->formatDateTime(dtEnd()); } void Event::setHasEndDate(bool b) diff --git a/libkcal/htmlexport.cpp b/libkcal/htmlexport.cpp index de436e0d..7938c751 100644 --- a/libkcal/htmlexport.cpp +++ b/libkcal/htmlexport.cpp @@ -147,9 +147,9 @@ void HtmlExport::createMonthView(TQTextStream *ts) while ( start < toDate() ) { // Write header - *ts << "

" << (i18n("month_year","%1 %2").arg(KGlobal::locale()->calendar()->monthName(start)) + *ts << "

" << (i18n("month_year","%1 %2").arg(TDEGlobal::locale()->calendar()->monthName(start)) .arg(start.year())) << "

\n"; - if ( KGlobal::locale()->weekStartDay() == 1 ) { + if ( TDEGlobal::locale()->weekStartDay() == 1 ) { start = start.addDays(1 - start.dayOfWeek()); } else { if (start.dayOfWeek() != 7) { @@ -161,7 +161,7 @@ void HtmlExport::createMonthView(TQTextStream *ts) // Write table header *ts << "
"; for(int i=0; i<7; ++i) { - *ts << ""; + *ts << ""; } *ts << "\n"; @@ -256,7 +256,7 @@ void HtmlExport::createEventList (TQTextStream *ts) if ( first ) { *ts << " \n"; first = false; } diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp index a8a6bdb0..74c896f5 100644 --- a/libkcal/incidencebase.cpp +++ b/libkcal/incidencebase.cpp @@ -205,17 +205,17 @@ TQDateTime IncidenceBase::dtStart() const TQString IncidenceBase::dtStartTimeStr() const { - return KGlobal::locale()->formatTime(dtStart().time()); + return TDEGlobal::locale()->formatTime(dtStart().time()); } TQString IncidenceBase::dtStartDateStr(bool shortfmt) const { - return KGlobal::locale()->formatDate(dtStart().date(),shortfmt); + return TDEGlobal::locale()->formatDate(dtStart().date(),shortfmt); } TQString IncidenceBase::dtStartStr() const { - return KGlobal::locale()->formatDateTime(dtStart()); + return TDEGlobal::locale()->formatDateTime(dtStart()); } diff --git a/libkcal/incidenceformatter.cpp b/libkcal/incidenceformatter.cpp index 063ccf07..7632b17e 100644 --- a/libkcal/incidenceformatter.cpp +++ b/libkcal/incidenceformatter.cpp @@ -221,7 +221,7 @@ static TQString displayViewLinkPerson( const TQString& email, TQString name, TQS mailto.setProtocol( "mailto" ); mailto.setPath( email ); const TQString iconPath = - KGlobal::iconLoader()->iconPath( "mail_new", KIcon::Small ); + TDEGlobal::iconLoader()->iconPath( "mail_new", KIcon::Small ); tmpString += " " + htmlAddLink( mailto.url(), "" ); @@ -401,38 +401,38 @@ static TQString displayViewFormatHeader( Incidence *incidence ) if ( incidence->customProperty( "KABC", "BIRTHDAY" ) == "YES" ) { if ( incidence->customProperty( "KABC", "ANNIVERSARY" ) == "YES" ) { iconPath = - KGlobal::iconLoader()->iconPath( "calendaranniversary", KIcon::Small ); + TDEGlobal::iconLoader()->iconPath( "calendaranniversary", KIcon::Small ); } else { - iconPath = KGlobal::iconLoader()->iconPath( "calendarbirthday", KIcon::Small ); + iconPath = TDEGlobal::iconLoader()->iconPath( "calendarbirthday", KIcon::Small ); } } else { - iconPath = KGlobal::iconLoader()->iconPath( "appointment", KIcon::Small ); + iconPath = TDEGlobal::iconLoader()->iconPath( "appointment", KIcon::Small ); } tmpStr += ""; } if ( incidence->type() == "Todo" ) { tmpStr += "iconPath( "todo", KIcon::Small ) + + TDEGlobal::iconLoader()->iconPath( "todo", KIcon::Small ) + "\">"; } if ( incidence->type() == "Journal" ) { tmpStr += "iconPath( "journal", KIcon::Small ) + + TDEGlobal::iconLoader()->iconPath( "journal", KIcon::Small ) + "\">"; } if ( incidence->isAlarmEnabled() ) { tmpStr += "iconPath( "bell", KIcon::Small ) + + TDEGlobal::iconLoader()->iconPath( "bell", KIcon::Small ) + "\">"; } if ( incidence->doesRecur() ) { tmpStr += "iconPath( "recur", KIcon::Small ) + + TDEGlobal::iconLoader()->iconPath( "recur", KIcon::Small ) + "\">"; } if ( incidence->isReadOnly() ) { tmpStr += "iconPath( "readonlyevent", KIcon::Small ) + + TDEGlobal::iconLoader()->iconPath( "readonlyevent", KIcon::Small ) + "\">"; } @@ -1174,7 +1174,7 @@ static TQString invitationPerson( const TQString& email, TQString name, TQString mailto.setProtocol( "mailto" ); mailto.setPath( person.fullName() ); const TQString iconPath = - KGlobal::iconLoader()->iconPath( "mail_new", KIcon::Small ); + TDEGlobal::iconLoader()->iconPath( "mail_new", KIcon::Small ); tmpString += " " + htmlAddLink( mailto.url(), "" ) ; @@ -1365,10 +1365,10 @@ static TQString invitationDetailsEvent( Event* event, bool noHtmlMode ) for ( ex_iter = exceptions.begin(); ex_iter != exceptions.end(); ++ex_iter ) { if (isFirstExRow == true) { isFirstExRow = false; - html += invitationRow( i18n("Cancelled on:"), KGlobal::locale()->formatDate(* ex_iter ) ); + html += invitationRow( i18n("Cancelled on:"), TDEGlobal::locale()->formatDate(* ex_iter ) ); } else { - html += invitationRow(" ", KGlobal::locale()->formatDate(* ex_iter ) ); + html += invitationRow(" ", TDEGlobal::locale()->formatDate(* ex_iter ) ); } } } @@ -1487,7 +1487,7 @@ static TQString invitationDetailsFreeBusy( FreeBusy *fb, bool /*noHtmlMode*/ ) html += invitationRow( i18n("Start date:"), IncidenceFormatter::dateToString( fb->dtStart(), true ) ); html += invitationRow( i18n("End date:"), - KGlobal::locale()->formatDate( fb->dtEnd().date(), true ) ); + TDEGlobal::locale()->formatDate( fb->dtEnd().date(), true ) ); html += "\n"; html += "\n"; @@ -1511,19 +1511,19 @@ static TQString invitationDetailsFreeBusy( FreeBusy *fb, bool /*noHtmlMode*/ ) cont += i18n("1 second", "%n seconds", dur); } html += invitationRow( TQString(), i18n("startDate for duration", "%1 for %2") - .arg( KGlobal::locale()->formatDateTime( per.start(), false ) ) + .arg( TDEGlobal::locale()->formatDateTime( per.start(), false ) ) .arg(cont) ); } else { TQString cont; if ( per.start().date() == per.end().date() ) { cont = i18n("date, fromTime - toTime ", "%1, %2 - %3") - .arg( KGlobal::locale()->formatDate( per.start().date() ) ) - .arg( KGlobal::locale()->formatTime( per.start().time() ) ) - .arg( KGlobal::locale()->formatTime( per.end().time() ) ); + .arg( TDEGlobal::locale()->formatDate( per.start().date() ) ) + .arg( TDEGlobal::locale()->formatTime( per.start().time() ) ) + .arg( TDEGlobal::locale()->formatTime( per.end().time() ) ); } else { cont = i18n("fromDateTime - toDateTime", "%1 - %2") - .arg( KGlobal::locale()->formatDateTime( per.start(), false ) ) - .arg( KGlobal::locale()->formatDateTime( per.end(), false ) ); + .arg( TDEGlobal::locale()->formatDateTime( per.start(), false ) ) + .arg( TDEGlobal::locale()->formatDateTime( per.end(), false ) ); } html += invitationRow( TQString(), cont ); @@ -2005,7 +2005,7 @@ static TQString invitationAttachments( InvitationFormatterHelper *helper, Incide // Attachment icon KMimeType::Ptr mimeType = KMimeType::mimeType( a->mimeType() ); const TQString iconStr = mimeType ? mimeType->icon( a->uri(), false ) : TQString( "application-octet-stream" ); - const TQString iconPath = KGlobal::iconLoader()->iconPath( iconStr, KIcon::Small ); + const TQString iconPath = TDEGlobal::iconLoader()->iconPath( iconStr, KIcon::Small ); if ( !iconPath.isEmpty() ) { tmpStr += ""; } @@ -3320,9 +3320,9 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Journal*journal ) TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( FreeBusy *fb ) { TQString tmp( "
" + i18n("Period start: %1") ); - TQString ret = tmp.arg( KGlobal::locale()->formatDateTime( fb->dtStart() ) ); + TQString ret = tmp.arg( TDEGlobal::locale()->formatDateTime( fb->dtStart() ) ); tmp = "
" + i18n("Period start: %1"); - ret += tmp.arg( KGlobal::locale()->formatDateTime( fb->dtEnd() ) ); + ret += tmp.arg( TDEGlobal::locale()->formatDateTime( fb->dtEnd() ) ); return ret; } @@ -3637,9 +3637,9 @@ bool IncidenceFormatter::MailBodyVisitor::visit( Event *event ) // TODO_Recurrence: What to do with floating TQString endstr; if ( event->doesFloat() ) { - endstr = KGlobal::locale()->formatDate( recur->endDate() ); + endstr = TDEGlobal::locale()->formatDate( recur->endDate() ); } else { - endstr = KGlobal::locale()->formatDateTime( recur->endDateTime() ); + endstr = TDEGlobal::locale()->formatDateTime( recur->endDateTime() ); } mResult += i18n("Repeat until: %1\n").arg( endstr ); } else { @@ -3652,7 +3652,7 @@ bool IncidenceFormatter::MailBodyVisitor::visit( Event *event ) mResult += i18n("This recurring meeting has been cancelled on the following days:\n"); DateList::ConstIterator ex_iter; for ( ex_iter = exceptions.begin(); ex_iter != exceptions.end(); ++ex_iter ) { - mResult += i18n(" %1\n").arg( KGlobal::locale()->formatDate(* ex_iter ) ); + mResult += i18n(" %1\n").arg( TDEGlobal::locale()->formatDate(* ex_iter ) ); } } } @@ -3722,9 +3722,9 @@ static TQString recurEnd( Incidence *incidence ) { TQString endstr; if ( incidence->doesFloat() ) { - endstr = KGlobal::locale()->formatDate( incidence->recurrence()->endDate() ); + endstr = TDEGlobal::locale()->formatDate( incidence->recurrence()->endDate() ); } else { - endstr = KGlobal::locale()->formatDateTime( incidence->recurrence()->endDateTime() ); + endstr = TDEGlobal::locale()->formatDateTime( incidence->recurrence()->endDateTime() ); } return endstr; } @@ -3801,10 +3801,10 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) dayList.append( i18n( "29th" ) ); dayList.append( i18n( "30th" ) ); dayList.append( i18n( "31st" ) ); - int weekStart = KGlobal::locale()->weekStartDay(); + int weekStart = TDEGlobal::locale()->weekStartDay(); TQString dayNames; TQString recurStr, txt; - const KCalendarSystem *calSys = KGlobal::locale()->calendar(); + const KCalendarSystem *calSys = TDEGlobal::locale()->calendar(); Recurrence *recur = incidence->recurrence(); switch ( recur->recurrenceType() ) { case Recurrence::rNone: @@ -4017,13 +4017,13 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) TQString IncidenceFormatter::timeToString( const TQDateTime &date, bool shortfmt ) { - return KGlobal::locale()->formatTime( date.time(), !shortfmt ); + return TDEGlobal::locale()->formatTime( date.time(), !shortfmt ); } TQString IncidenceFormatter::dateToString( const TQDateTime &date, bool shortfmt ) { return - KGlobal::locale()->formatDate( date.date(), shortfmt ); + TDEGlobal::locale()->formatDate( date.date(), shortfmt ); } TQString IncidenceFormatter::dateTimeToString( const TQDateTime &date, @@ -4033,7 +4033,7 @@ TQString IncidenceFormatter::dateTimeToString( const TQDateTime &date, return dateToString( date, shortfmt ); } - return KGlobal::locale()->formatDateTime( date, shortfmt ); + return TDEGlobal::locale()->formatDateTime( date, shortfmt ); } TQString IncidenceFormatter::resourceString( Calendar *calendar, Incidence *incidence ) @@ -4133,7 +4133,7 @@ TQStringList IncidenceFormatter::reminderStringList( Incidence *incidence, bool if ( alarm->hasTime() ) { offset = 0; if ( alarm->time().isValid() ) { - atStr = KGlobal::locale()->formatDateTime( alarm->time() ); + atStr = TDEGlobal::locale()->formatDateTime( alarm->time() ); } } else if ( alarm->hasStartOffset() ) { offset = alarm->startOffset().asSeconds(); @@ -4146,7 +4146,7 @@ TQStringList IncidenceFormatter::reminderStringList( Incidence *incidence, bool "%1 after the start" ); } else { //offset is 0 if ( incidence->dtStart().isValid() ) { - atStr = KGlobal::locale()->formatDateTime( incidence->dtStart() ); + atStr = TDEGlobal::locale()->formatDateTime( incidence->dtStart() ); } } } else if ( alarm->hasEndOffset() ) { @@ -4172,12 +4172,12 @@ TQStringList IncidenceFormatter::reminderStringList( Incidence *incidence, bool if ( incidence->type() == "Todo" ) { Todo *t = static_cast( incidence ); if ( t->dtDue().isValid() ) { - atStr = KGlobal::locale()->formatDateTime( t->dtDue() ); + atStr = TDEGlobal::locale()->formatDateTime( t->dtDue() ); } } else { Event *e = static_cast( incidence ); if ( e->dtEnd().isValid() ) { - atStr = KGlobal::locale()->formatDateTime( e->dtEnd() ); + atStr = TDEGlobal::locale()->formatDateTime( e->dtEnd() ); } } } diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp index dacab7e9..d32fad05 100644 --- a/libkcal/resourcecached.cpp +++ b/libkcal/resourcecached.cpp @@ -689,12 +689,12 @@ void ResourceCached::addInfoText( TQString &txt ) const if ( mLastLoad.isValid() ) { txt += "
"; txt += i18n("Last loaded: %1") - .arg( KGlobal::locale()->formatDateTime( mLastLoad ) ); + .arg( TDEGlobal::locale()->formatDateTime( mLastLoad ) ); } if ( mLastSave.isValid() ) { txt += "
"; txt += i18n("Last saved: %1") - .arg( KGlobal::locale()->formatDateTime( mLastSave ) ); + .arg( TDEGlobal::locale()->formatDateTime( mLastSave ) ); } } diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp index b3fe65d9..7c4a4df3 100644 --- a/libkcal/todo.cpp +++ b/libkcal/todo.cpp @@ -127,18 +127,18 @@ TQDateTime Todo::dtDue( bool first ) const TQString Todo::dtDueTimeStr() const { - return KGlobal::locale()->formatTime( dtDue(!doesRecur()).time() ); + return TDEGlobal::locale()->formatTime( dtDue(!doesRecur()).time() ); } TQString Todo::dtDueDateStr(bool shortfmt) const { - return KGlobal::locale()->formatDate(dtDue( !doesRecur() ).date(),shortfmt); + return TDEGlobal::locale()->formatDate(dtDue( !doesRecur() ).date(),shortfmt); } // TODO: Add shortfmt param!!! TQString Todo::dtDueStr() const { - return KGlobal::locale()->formatDateTime( dtDue( !doesRecur() ) ); + return TDEGlobal::locale()->formatDateTime( dtDue( !doesRecur() ) ); } bool Todo::hasDueDate() const @@ -201,17 +201,17 @@ void Todo::setDtStart( const TQDateTime &dtStart ) TQString Todo::dtStartTimeStr( bool first ) const { - return KGlobal::locale()->formatTime(dtStart(first).time()); + return TDEGlobal::locale()->formatTime(dtStart(first).time()); } TQString Todo::dtStartDateStr(bool shortfmt, bool first) const { - return KGlobal::locale()->formatDate(dtStart(first).date(),shortfmt); + return TDEGlobal::locale()->formatDate(dtStart(first).date(),shortfmt); } TQString Todo::dtStartStr(bool first) const { - return KGlobal::locale()->formatDateTime(dtStart(first)); + return TDEGlobal::locale()->formatDateTime(dtStart(first)); } bool Todo::isCompleted() const @@ -242,7 +242,7 @@ TQDateTime Todo::completed() const TQString Todo::completedStr() const { - return KGlobal::locale()->formatDateTime(mCompleted); + return TDEGlobal::locale()->formatDateTime(mCompleted); } void Todo::setCompleted(const TQDateTime &completed) diff --git a/libkholidays/kholidays.cpp b/libkholidays/kholidays.cpp index 3b4ec63a..369b021c 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 ) diff --git a/libkmime/kmime_content.cpp b/libkmime/kmime_content.cpp index 5dead52a..20862496 100644 --- a/libkmime/kmime_content.cpp +++ b/libkmime/kmime_content.cpp @@ -416,7 +416,7 @@ void Content::decodedText(TQString &s, bool trimText, return; bool ok=true; - TQTextCodec *codec=KGlobal::charsets()->codecForName(contentType()->charset(),ok); + TQTextCodec *codec=TDEGlobal::charsets()->codecForName(contentType()->charset(),ok); s=codec->toUnicode(b_ody.data(), b_ody.length()); @@ -442,7 +442,7 @@ void Content::decodedText(TQStringList &l, bool trimText, TQString unicode; bool ok=true; - TQTextCodec *codec=KGlobal::charsets()->codecForName(contentType()->charset(),ok); + TQTextCodec *codec=TDEGlobal::charsets()->codecForName(contentType()->charset(),ok); unicode=codec->toUnicode(b_ody.data(), b_ody.length()); @@ -464,11 +464,11 @@ void Content::decodedText(TQStringList &l, bool trimText, void Content::fromUnicodeString(const TQString &s) { bool ok=true; - TQTextCodec *codec=KGlobal::charsets()->codecForName(contentType()->charset(),ok); + TQTextCodec *codec=TDEGlobal::charsets()->codecForName(contentType()->charset(),ok); if(!ok) { // no suitable codec found => try local settings and hope the best ;-) - codec=KGlobal::locale()->codecForEncoding(); - TQCString chset=KGlobal::locale()->encoding(); + codec=TDEGlobal::locale()->codecForEncoding(); + TQCString chset=TDEGlobal::locale()->encoding(); contentType()->setCharset(chset); } diff --git a/libkmime/kmime_header_parsing.cpp b/libkmime/kmime_header_parsing.cpp index 32099f29..70d0b657 100644 --- a/libkmime/kmime_header_parsing.cpp +++ b/libkmime/kmime_header_parsing.cpp @@ -208,7 +208,7 @@ bool parseEncodedWord( const char* & scursor, const char * const send, // try if there's a (text)codec for the charset found: bool matchOK = false; TQTextCodec - *textCodec = KGlobal::charsets()->codecForName( maybeCharset, matchOK ); + *textCodec = TDEGlobal::charsets()->codecForName( maybeCharset, matchOK ); if ( !matchOK || !textCodec ) { KMIME_WARN_UNKNOWN(Charset,maybeCharset); @@ -1250,7 +1250,7 @@ static void decodeRFC2231Value( Codec* & rfc2231Codec, // bool matchOK = false; - textcodec = KGlobal::charsets()->codecForName( charset, matchOK ); + textcodec = TDEGlobal::charsets()->codecForName( charset, matchOK ); if ( !matchOK ) { textcodec = 0; KMIME_WARN_UNKNOWN(Charset,charset); diff --git a/libkmime/kmime_util.cpp b/libkmime/kmime_util.cpp index f18a5e8d..60140181 100644 --- a/libkmime/kmime_util.cpp +++ b/libkmime/kmime_util.cpp @@ -223,13 +223,13 @@ TQString decodeRFC2047String(const TQCString &src, const char **usedCS, TQTextCodec *codec=0; bool ok=true; if (forceCS || declaredCS.isEmpty()) { - codec=KGlobal::charsets()->codecForName(defaultCS); + codec=TDEGlobal::charsets()->codecForName(defaultCS); (*usedCS)=cachedCharset(defaultCS); } else { - codec=KGlobal::charsets()->codecForName(declaredCS, ok); + codec=TDEGlobal::charsets()->codecForName(declaredCS, ok); if(!ok) { //no suitable codec found => use default charset - codec=KGlobal::charsets()->codecForName(defaultCS); + codec=TDEGlobal::charsets()->codecForName(defaultCS); (*usedCS)=cachedCharset(defaultCS); } else @@ -254,12 +254,12 @@ TQCString encodeRFC2047String(const TQString &src, const char *charset, TQTextCodec *codec=0; usedCS=charset; - codec=KGlobal::charsets()->codecForName(usedCS, ok); + codec=TDEGlobal::charsets()->codecForName(usedCS, ok); if(!ok) { //no codec available => try local8Bit and hope the best ;-) - usedCS=KGlobal::locale()->encoding(); - codec=KGlobal::charsets()->codecForName(usedCS, ok); + usedCS=TDEGlobal::locale()->encoding(); + codec=TDEGlobal::charsets()->codecForName(usedCS, ok); } if (usedCS.find("8859-")>=0) // use "B"-Encoding for non iso-8859-x charsets @@ -636,7 +636,7 @@ DateFormatter::qdateToTimeT(const TQDateTime& dt) const TQString DateFormatter::fancy(time_t otime) const { - KLocale *locale = KGlobal::locale(); + KLocale *locale = TDEGlobal::locale(); if ( otime <= 0 ) return i18n( "unknown" ); @@ -691,7 +691,7 @@ DateFormatter::localized(time_t otime, bool shortFormat, bool includeSecs, { TQDateTime tmp; TQString ret; - KLocale *locale = KGlobal::locale(); + KLocale *locale = TDEGlobal::locale(); tmp.setTime_t( otime ); diff --git a/libkpgp/kpgpbase2.cpp b/libkpgp/kpgpbase2.cpp index 9427edaf..b8a6448a 100644 --- a/libkpgp/kpgpbase2.cpp +++ b/libkpgp/kpgpbase2.cpp @@ -533,7 +533,7 @@ Base2::doGetPublicKeys( const TQCString & cmd, const TQStringList & patterns ) for ( TQStringList::ConstIterator it = patterns.begin(); it != patterns.end(); ++it ) { - exitStatus = run( cmd + " " + KProcess::quote( *it ).local8Bit(), + exitStatus = run( cmd + " " + TDEProcess::quote( *it ).local8Bit(), 0, true ); if ( exitStatus != 0 ) { diff --git a/libkpgp/kpgpbase5.cpp b/libkpgp/kpgpbase5.cpp index 0e583732..d7066cb9 100644 --- a/libkpgp/kpgpbase5.cpp +++ b/libkpgp/kpgpbase5.cpp @@ -363,7 +363,7 @@ Base5::publicKeys( const TQStringList & patterns ) for ( TQStringList::ConstIterator it = patterns.begin(); it != patterns.end(); ++it ) { cmd += " "; - cmd += KProcess::quote( *it ).local8Bit(); + cmd += TDEProcess::quote( *it ).local8Bit(); } status = 0; exitStatus = run( cmd, 0, true ); @@ -393,7 +393,7 @@ Base5::secretKeys( const TQStringList & patterns ) for ( TQStringList::ConstIterator it = patterns.begin(); it != patterns.end(); ++it ) { cmd += " "; - cmd += KProcess::quote( *it ).local8Bit(); + cmd += TDEProcess::quote( *it ).local8Bit(); } status = 0; exitStatus = run( cmd, 0, true ); diff --git a/libkpgp/kpgpbaseG.cpp b/libkpgp/kpgpbaseG.cpp index 251a7737..52bb6bc7 100644 --- a/libkpgp/kpgpbaseG.cpp +++ b/libkpgp/kpgpbaseG.cpp @@ -414,7 +414,7 @@ BaseG::publicKeys( const TQStringList & patterns ) for ( TQStringList::ConstIterator it = patterns.begin(); it != patterns.end(); ++it ) { cmd += " "; - cmd += KProcess::quote( *it ).local8Bit(); + cmd += TDEProcess::quote( *it ).local8Bit(); } status = 0; exitStatus = runGpg( cmd, 0, true ); @@ -446,7 +446,7 @@ BaseG::secretKeys( const TQStringList & patterns ) for ( TQStringList::ConstIterator it = patterns.begin(); it != patterns.end(); ++it ) { cmd += " "; - cmd += KProcess::quote( *it ).local8Bit(); + cmd += TDEProcess::quote( *it ).local8Bit(); } status = 0; exitStatus = runGpg( cmd, 0, true ); diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp index 37533220..2e6d7160 100644 --- a/libkpgp/kpgpui.cpp +++ b/libkpgp/kpgpui.cpp @@ -543,13 +543,13 @@ TQString KeySelectionDialog::keyInfo( const Kpgp::Key *key ) const if( remark.isEmpty() ) { return " " + i18n("creation date and status of an OpenPGP key", "Creation date: %1, Status: %2") - .arg( KGlobal::locale()->formatDate( dt.date(), true ) ) + .arg( TDEGlobal::locale()->formatDate( dt.date(), true ) ) .arg( status ); } else { return " " + i18n("creation date, status and remark of an OpenPGP key", "Creation date: %1, Status: %2 (%3)") - .arg( KGlobal::locale()->formatDate( dt.date(), true ) ) + .arg( TDEGlobal::locale()->formatDate( dt.date(), true ) ) .arg( status ) .arg( remark ); } @@ -1498,7 +1498,7 @@ KeyApprovalDialog::KeyApprovalDialog( const TQStringList& addresses, + marginHint() + 2; // don't make the dialog too large - TQRect desk = KGlobalSettings::desktopGeometry(this); + TQRect desk = TDEGlobalSettings::desktopGeometry(this); int screenWidth = desk.width(); if( dialogWidth > 3*screenWidth/4 ) dialogWidth = 3*screenWidth/4; @@ -1635,7 +1635,7 @@ CipherTextDialog::CipherTextDialog( const TQCString & text, unicodeText = TQString::fromLocal8Bit(text.data()); else { bool ok=true; - TQTextCodec *codec = KGlobal::charsets()->codecForName(charset, ok); + TQTextCodec *codec = TDEGlobal::charsets()->codecForName(charset, ok); if(!ok) unicodeText = TQString::fromLocal8Bit(text.data()); else @@ -1660,7 +1660,7 @@ void CipherTextDialog::setMinimumSize() #if KDE_IS_VERSION( 3, 1, 90 ) - int maxWidth = KGlobalSettings::desktopGeometry(parentWidget()).width()-100; + int maxWidth = TDEGlobalSettings::desktopGeometry(parentWidget()).width()-100; #else KConfig gc("kdeglobals", false, false); gc.setGroup("Windows"); diff --git a/libkpimidentities/identity.cpp b/libkpimidentities/identity.cpp index 046225af..c0ce5a6e 100644 --- a/libkpimidentities/identity.cpp +++ b/libkpimidentities/identity.cpp @@ -93,7 +93,7 @@ TQString Signature::textFromCommand( bool * ok ) const // run the process: int rc = 0; - if ( !proc.start( KProcess::Block, KProcess::Stdout ) ) + if ( !proc.start( TDEProcess::Block, TDEProcess::Stdout ) ) rc = -1; else rc = ( proc.normalExit() ) ? proc.exitStatus() : -1 ; diff --git a/libkpimidentities/identity.h b/libkpimidentities/identity.h index a05ab61c..7139b753 100644 --- a/libkpimidentities/identity.h +++ b/libkpimidentities/identity.h @@ -15,7 +15,7 @@ #include #include -class KProcess; +class TDEProcess; namespace KPIM { class Identity; class Signature; diff --git a/libtdepim/addresseeemailselection.cpp b/libtdepim/addresseeemailselection.cpp index feec5ff4..fe66adbd 100644 --- a/libtdepim/addresseeemailselection.cpp +++ b/libtdepim/addresseeemailselection.cpp @@ -133,7 +133,7 @@ TQPixmap AddresseeEmailSelection::itemIcon( const KABC::Addressee &addressee, ui if ( !addressee.photo().data().isNull() ) return addressee.photo().data().smoothScale( 16, 16 ); else - return KGlobal::iconLoader()->loadIcon( "personal", KIcon::Small ); + return TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Small ); } bool AddresseeEmailSelection::itemEnabled( const KABC::Addressee &addressee, uint ) const @@ -160,7 +160,7 @@ TQString AddresseeEmailSelection::distributionListText( const KABC::Distribution TQPixmap AddresseeEmailSelection::distributionListIcon( const KABC::DistributionList* ) const { - return KGlobal::iconLoader()->loadIcon( "tdmconfig", KIcon::Small ); + return TDEGlobal::iconLoader()->loadIcon( "tdmconfig", KIcon::Small ); } bool AddresseeEmailSelection::distributionListEnabled( const KABC::DistributionList* ) const diff --git a/libtdepim/addresseelineedit.cpp b/libtdepim/addresseelineedit.cpp index d076fd3d..3b55024b 100644 --- a/libtdepim/addresseelineedit.cpp +++ b/libtdepim/addresseelineedit.cpp @@ -419,9 +419,9 @@ void AddresseeLineEdit::doCompletion( bool ctrlT ) { m_lastSearchMode = ctrlT; - KGlobalSettings::Completion mode = completionMode(); + TDEGlobalSettings::Completion mode = completionMode(); - if ( mode == KGlobalSettings::CompletionNone ) + if ( mode == TDEGlobalSettings::CompletionNone ) return; if ( s_addressesDirty ) { @@ -447,20 +447,20 @@ void AddresseeLineEdit::doCompletion( bool ctrlT ) switch ( mode ) { - case KGlobalSettings::CompletionPopupAuto: + case TDEGlobalSettings::CompletionPopupAuto: { if ( m_searchString.isEmpty() ) break; } - case KGlobalSettings::CompletionPopup: + case TDEGlobalSettings::CompletionPopup: { const TQStringList items = getAdjustedCompletionItems( true ); setCompletedItems( items, false ); break; } - case KGlobalSettings::CompletionShell: + case TDEGlobalSettings::CompletionShell: { TQString match = s_completion->makeCompletion( m_searchString ); if ( !match.isNull() && match != m_searchString ) { @@ -471,8 +471,8 @@ void AddresseeLineEdit::doCompletion( bool ctrlT ) break; } - case KGlobalSettings::CompletionMan: // Short-Auto in fact - case KGlobalSettings::CompletionAuto: + case TDEGlobalSettings::CompletionMan: // Short-Auto in fact + case TDEGlobalSettings::CompletionAuto: { //force autoSuggest in KLineEdit::keyPressed or setCompletedText will have no effect setCompletionMode( completionMode() ); @@ -521,7 +521,7 @@ void AddresseeLineEdit::doCompletion( bool ctrlT ) break; } - case KGlobalSettings::CompletionNone: + case TDEGlobalSettings::CompletionNone: default: // fall through break; } @@ -594,7 +594,7 @@ void AddresseeLineEdit::loadContacts() int idx = addCompletionSource( i18n( "Distribution Lists" ) ); for ( listIt = distLists.begin(); listIt != distLists.end(); ++listIt ) { - //for KGlobalSettings::CompletionAuto + //for TDEGlobalSettings::CompletionAuto addCompletionItem( (*listIt).simplifyWhiteSpace(), weight, idx ); //for CompletionShell, CompletionPopup @@ -773,9 +773,9 @@ void AddresseeLineEdit::addCompletionItem( const TQString& string, int weight, i void AddresseeLineEdit::slotStartLDAPLookup() { - KGlobalSettings::Completion mode = completionMode(); + TDEGlobalSettings::Completion mode = completionMode(); - if ( mode == KGlobalSettings::CompletionNone ) + if ( mode == TDEGlobalSettings::CompletionNone ) return; if ( !s_LDAPSearch->isAvailable() ) { @@ -828,8 +828,8 @@ void AddresseeLineEdit::slotLDAPSearchData( const KPIM::LdapResultList& adrs ) } if ( (hasFocus() || completionBox()->hasFocus() ) - && completionMode() != KGlobalSettings::CompletionNone - && completionMode() != KGlobalSettings::CompletionShell ) { + && completionMode() != TDEGlobalSettings::CompletionNone + && completionMode() != TDEGlobalSettings::CompletionShell ) { setText( m_previousAddresses + m_searchString ); // only complete again if the user didn't change the selection while we were waiting // otherwise the completion box will be closed diff --git a/libtdepim/addresseeselector.cpp b/libtdepim/addresseeselector.cpp index c763545a..38bec42d 100644 --- a/libtdepim/addresseeselector.cpp +++ b/libtdepim/addresseeselector.cpp @@ -288,8 +288,8 @@ void AddresseeSelector::initGUI() int row = 1; - TQIconSet moveSet = KGlobal::iconLoader()->loadIconSet( "next", KIcon::Small ); - TQIconSet removeSet = KGlobal::iconLoader()->loadIconSet( "previous", KIcon::Small ); + TQIconSet moveSet = TDEGlobal::iconLoader()->loadIconSet( "next", KIcon::Small ); + TQIconSet removeSet = TDEGlobal::iconLoader()->loadIconSet( "previous", KIcon::Small ); uint count = mSelection->fieldCount(); for ( uint i = 0; i < count; ++i, ++row ) { diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp index b3bccffa..5be001a6 100644 --- a/libtdepim/addresseeview.cpp +++ b/libtdepim/addresseeview.cpp @@ -62,7 +62,7 @@ AddresseeView::AddresseeView( TQWidget *parent, const char *name, TQStyleSheet *sheet = styleSheet(); TQStyleSheetItem *link = sheet->item( "a" ); - link->setColor( KGlobalSettings::linkColor() ); + link->setColor( TDEGlobalSettings::linkColor() ); connect( this, TQT_SIGNAL( mailClick( const TQString&, const TQString& ) ), this, TQT_SLOT( slotMailClicked( const TQString&, const TQString& ) ) ); @@ -160,13 +160,13 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr // placeholder where we fill in something else (in this case, // the global background color). // - TQString backgroundColor = KGlobalSettings::alternateBackgroundColor().name(); + TQString backgroundColor = TDEGlobalSettings::alternateBackgroundColor().name(); TQString cellStyle = TQString::fromLatin1( "style=\"" "padding-right: 2px; " "border-right: #000 dashed 1px; " "background: %1;\"").arg(backgroundColor); - TQString backgroundColor2 = KGlobalSettings::baseColor().name(); + TQString backgroundColor2 = TDEGlobalSettings::baseColor().name(); TQString cellStyle2 = TQString::fromLatin1( "style=\"" "padding-left: 2px; " @@ -207,7 +207,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr } else if ( !pic.url().isEmpty() ) { image = (pic.url().startsWith( "http://" ) || pic.url().startsWith( "https://" ) ? pic.url() : "http://" + pic.url()); } else { - image = "file:" + KGlobal::iconLoader()->iconPath( "personal", KIcon::Desktop ); + image = "file:" + TDEGlobal::iconLoader()->iconPath( "personal", KIcon::Desktop ); } } @@ -217,7 +217,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr if ( date.isValid() ) dynamicPart += rowFmtStr .arg( KABC::Addressee::birthdayLabel() ) - .arg( KGlobal::locale()->formatDate( date, true ) ); + .arg( TDEGlobal::locale()->formatDate( date, true ) ); } if ( fieldMask & PhoneFields ) { @@ -532,8 +532,8 @@ void AddresseeView::updateView() "%3" // dynamic part "" "" ) - .arg( KGlobalSettings::textColor().name() ) - .arg( KGlobalSettings::baseColor().name() ) + .arg( TDEGlobalSettings::textColor().name() ) + .arg( TDEGlobalSettings::baseColor().name() ) .arg( strAddr ); TQString imageURL = TQString( "contact_%1_image" ).arg( mAddressee.uid() ); @@ -554,7 +554,7 @@ void AddresseeView::updateView() } } else { TQMimeSourceFactory::defaultFactory()->setPixmap( imageURL, - KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, 128 ) ); + TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, 128 ) ); } } diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp index 667ae97b..4e46705b 100644 --- a/libtdepim/addressesdialog.cpp +++ b/libtdepim/addressesdialog.cpp @@ -105,11 +105,11 @@ AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const KABC::Add if ( addr.photo().url().isEmpty() ) { if ( addr.photo().data().isNull() ) - setPixmap( 0, KGlobal::iconLoader()->loadIcon( "personal", KIcon::Small ) ); + setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Small ) ); else setPixmap( 0, addr.photo().data().smoothScale( 16, 16 ) ); } else { - setPixmap( 0, KGlobal::iconLoader()->loadIcon( addr.photo().url(), KIcon::Small ) ); + setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( addr.photo().url(), KIcon::Small ) ); } } @@ -135,7 +135,7 @@ AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const TQString d = new AddresseeViewItemPrivate; d->category = DistList; - setPixmap( 0, KGlobal::iconLoader()->loadIcon( "tdmconfig", KIcon::Small ) ); + setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "tdmconfig", KIcon::Small ) ); } AddresseeViewItem::~AddresseeViewItem() @@ -321,7 +321,7 @@ AddressesDialog::setRecentAddresses( const KABC::Addressee::List& list ) void AddressesDialog::updateRecentAddresses() { - static const TQString &recentGroup = KGlobal::staticQString( i18n( "Recent Addresses" ) ); + static const TQString &recentGroup = TDEGlobal::staticQString( i18n( "Recent Addresses" ) ); if ( !d->recent ) { d->recent = new AddresseeViewItem( d->ui->mAvailableView, recentGroup ); @@ -461,7 +461,7 @@ AddressesDialog::updateAvailableAddressees() d->ui->mAvailableView->clear(); d->groupDict.clear(); - static const TQString &personalGroup = KGlobal::staticQString( i18n( "Other Addresses" ) ); + static const TQString &personalGroup = TDEGlobal::staticQString( i18n( "Other Addresses" ) ); d->ui->mAvailableView->setRootIsDecorated( true ); d->personal = new AddresseeViewItem( d->ui->mAvailableView, personalGroup ); //connect(d->personal, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), diff --git a/libtdepim/alarmclient.cpp b/libtdepim/alarmclient.cpp index 5616cd02..da1ef891 100644 --- a/libtdepim/alarmclient.cpp +++ b/libtdepim/alarmclient.cpp @@ -41,7 +41,7 @@ void AlarmClient::startDaemon() return; } - KGlobal::dirs()->addResourceType("autostart", "share/autostart"); + TDEGlobal::dirs()->addResourceType("autostart", "share/autostart"); TQString desktopFile = locate( "autostart", "korgac.desktop" ); if ( desktopFile.isEmpty() ) { kdWarning() << "Couldn't find autostart/korgac.desktop!" << endl; diff --git a/libtdepim/broadcaststatus.cpp b/libtdepim/broadcaststatus.cpp index c48d7f41..45a7b51c 100644 --- a/libtdepim/broadcaststatus.cpp +++ b/libtdepim/broadcaststatus.cpp @@ -55,7 +55,7 @@ void BroadcastStatus::setStatusMsg( const TQString& message ) void BroadcastStatus::setStatusMsgWithTimestamp( const TQString& message ) { - KLocale* locale = KGlobal::locale(); + KLocale* locale = TDEGlobal::locale(); setStatusMsg( i18n( "%1 is a time, %2 is a status message", "[%1] %2" ) .arg( locale->formatTime( TQTime::currentTime(), true /* with seconds */ ) ) diff --git a/libtdepim/collectingprocess.cpp b/libtdepim/collectingprocess.cpp index 58cdcb5e..e9d640ce 100644 --- a/libtdepim/collectingprocess.cpp +++ b/libtdepim/collectingprocess.cpp @@ -50,7 +50,7 @@ struct CollectingProcess::Private { CollectingProcess::CollectingProcess( TQObject * parent, const char * name ) - : KProcess( parent, name ) + : TDEProcess( parent, name ) { d = new Private(); } @@ -61,23 +61,23 @@ CollectingProcess::~CollectingProcess() { bool CollectingProcess::start( RunMode runmode, Communication comm ) { // prevent duplicate connection - disconnect( this, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStdout( KProcess *, char *, int ) ) ); + disconnect( this, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); if ( comm & Stdout ) { - connect( this, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStdout( KProcess *, char *, int ) ) ); + connect( this, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); } // prevent duplicate connection - disconnect( this, TQT_SIGNAL( receivedStderr( KProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStderr( KProcess *, char *, int ) ) ); + disconnect( this, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); if ( comm & Stderr ) { - connect( this, TQT_SIGNAL( receivedStderr( KProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStderr( KProcess *, char *, int ) ) ); + connect( this, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); } - return KProcess::start( runmode, comm ); + return TDEProcess::start( runmode, comm ); } -void CollectingProcess::slotReceivedStdout( KProcess *, char *buf, int len ) +void CollectingProcess::slotReceivedStdout( TDEProcess *, char *buf, int len ) { TQByteArray b; b.duplicate( buf, len ); @@ -85,7 +85,7 @@ void CollectingProcess::slotReceivedStdout( KProcess *, char *buf, int len ) d->stdoutSize += len; } -void CollectingProcess::slotReceivedStderr( KProcess *, char *buf, int len ) +void CollectingProcess::slotReceivedStderr( TDEProcess *, char *buf, int len ) { TQByteArray b; b.duplicate( buf, len ); @@ -134,7 +134,7 @@ TQByteArray CollectingProcess::collectedStderr() } void CollectingProcess::virtual_hook( int id, void * data ) { - KProcess::virtual_hook( id, data ); + TDEProcess::virtual_hook( id, data ); } #include "collectingprocess.moc" diff --git a/libtdepim/collectingprocess.h b/libtdepim/collectingprocess.h index 69550ddd..962fe15d 100644 --- a/libtdepim/collectingprocess.h +++ b/libtdepim/collectingprocess.h @@ -39,14 +39,14 @@ namespace KPIM { /** - * @short An output collecting KProcess class. + * @short An output collecting TDEProcess class. * - * This class simplifies the usage of KProcess by collecting all output + * This class simplifies the usage of TDEProcess by collecting all output * (stdout/stderr) of the process. * * @author Ingo Kloecker */ -class KDE_EXPORT CollectingProcess : public KProcess { +class KDE_EXPORT CollectingProcess : public TDEProcess { Q_OBJECT public: @@ -64,8 +64,8 @@ public: TQByteArray collectedStderr(); private slots: - void slotReceivedStdout( KProcess *, char *, int ); - void slotReceivedStderr( KProcess *, char *, int ); + void slotReceivedStdout( TDEProcess *, char *, int ); + void slotReceivedStderr( TDEProcess *, char *, int ); private: class Private; diff --git a/libtdepim/csshelper.cpp b/libtdepim/csshelper.cpp index d773c7d6..20de40de 100644 --- a/libtdepim/csshelper.cpp +++ b/libtdepim/csshelper.cpp @@ -74,8 +74,8 @@ namespace KPIM { { // initialize with defaults - should match the corresponding application defaults mForegroundColor = TQApplication::palette().active().text(); - mLinkColor = KGlobalSettings::linkColor(); - mVisitedLinkColor = KGlobalSettings::visitedLinkColor(); + mLinkColor = TDEGlobalSettings::linkColor(); + mVisitedLinkColor = TDEGlobalSettings::visitedLinkColor(); mBackgroundColor = TQApplication::palette().active().base(); cHtmlWarning = TQColor( 0xFF, 0x40, 0x40 ); // warning frame color: light red @@ -89,8 +89,8 @@ namespace KPIM { mQuoteColor[i] = TQColor( 0x00, 0x80 - i * 0x10, 0x00 ); // shades of green mRecycleQuoteColors = false; - TQFont defaultFont = KGlobalSettings::generalFont(); - TQFont defaultFixedFont = KGlobalSettings::fixedFont(); + TQFont defaultFont = TDEGlobalSettings::generalFont(); + TQFont defaultFixedFont = TDEGlobalSettings::fixedFont(); mBodyFont = mPrintFont = defaultFont; mFixedFont = mFixedPrintFont = defaultFixedFont; defaultFont.setItalic( true ); diff --git a/libtdepim/htmldiffalgodisplay.cpp b/libtdepim/htmldiffalgodisplay.cpp index 4be6b6cd..03553c6d 100644 --- a/libtdepim/htmldiffalgodisplay.cpp +++ b/libtdepim/htmldiffalgodisplay.cpp @@ -45,8 +45,8 @@ void HTMLDiffAlgoDisplay::begin() mText.append( "" ); mText.append( TQString( "" ) - .arg( KGlobalSettings::textColor().name() ) - .arg( KGlobalSettings::baseColor().name() ) ); + .arg( TDEGlobalSettings::textColor().name() ) + .arg( TDEGlobalSettings::baseColor().name() ) ); mText.append( "
%1 %2
" << KGlobal::locale()->calendar()->weekDayName( start.addDays(i) ) << "" << TDEGlobal::locale()->calendar()->weekDayName( start.addDays(i) ) << "
" - << KGlobal::locale()->formatDate(dt) + << TDEGlobal::locale()->formatDate(dt) << "
Busy periods given in this free/busy object:
" ); mText.append( TQString( "" ) diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp index d99128ec..a96a88e7 100644 --- a/libtdepim/kcmdesignerfields.cpp +++ b/libtdepim/kcmdesignerfields.cpp @@ -196,7 +196,7 @@ void KCMDesignerFields::importFile() void KCMDesignerFields::loadUiFiles() { - TQStringList list = KGlobal::dirs()->findAllResources( "data", uiPath() + "/*.ui", true, true ); + TQStringList list = TDEGlobal::dirs()->findAllResources( "data", uiPath() + "/*.ui", true, true ); for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it ) { new PageItem( mPageView, *it ); } @@ -411,7 +411,7 @@ void KCMDesignerFields::startDesigner() // check if path exists and create one if not. TQString cepPath = localUiDir(); - if( !KGlobal::dirs()->exists(cepPath) ) { + if( !TDEGlobal::dirs()->exists(cepPath) ) { KIO::NetAccess::mkdir( cepPath, this ); } @@ -421,7 +421,7 @@ void KCMDesignerFields::startDesigner() TQListViewItem *item = mPageView->selectedItem(); if ( item ) { PageItem *pageItem = static_cast( item->parent() ? item->parent() : item ); - cmdLine += " " + KProcess::quote( pageItem->path() ); + cmdLine += " " + TDEProcess::quote( pageItem->path() ); } KRun::runCommand( cmdLine ); diff --git a/libtdepim/kdateedit.cpp b/libtdepim/kdateedit.cpp index df2b98c9..73f0586a 100644 --- a/libtdepim/kdateedit.cpp +++ b/libtdepim/kdateedit.cpp @@ -53,7 +53,7 @@ class DateValidator : public TQValidator return Acceptable; bool ok = false; - KGlobal::locale()->readDate( str, &ok ); + TDEGlobal::locale()->readDate( str, &ok ); if ( ok ) return Acceptable; else @@ -73,7 +73,7 @@ KDateEdit::KDateEdit( TQWidget *parent, const char *name ) setMaxCount( 1 ); mDate = TQDate::currentDate(); - TQString today = KGlobal::locale()->formatDate( mDate, true ); + TQString today = TDEGlobal::locale()->formatDate( mDate, true ); insertItem( today ); setCurrentItem( 0 ); @@ -134,7 +134,7 @@ void KDateEdit::popup() if ( mReadOnly ) return; - TQRect desk = KGlobalSettings::desktopGeometry( this ); + TQRect desk = TDEGlobalSettings::desktopGeometry( this ); TQPoint popupPoint = mapToGlobal( TQPoint( 0,0 ) ); @@ -238,7 +238,7 @@ TQDate KDateEdit::parseDate( bool *replaced ) const if ( replaced ) (*replaced) = true; } else { - result = KGlobal::locale()->readDate( text ); + result = TDEGlobal::locale()->readDate( text ); } return result; @@ -335,7 +335,7 @@ void KDateEdit::setupKeywords() TQString dayName; for ( int i = 1; i <= 7; ++i ) { - dayName = KGlobal::locale()->calendar()->weekDayName( i ).lower(); + dayName = TDEGlobal::locale()->calendar()->weekDayName( i ).lower(); mKeywordMap.insert( dayName, i + 100 ); } } @@ -351,7 +351,7 @@ void KDateEdit::updateView() { TQString dateString; if ( mDate.isValid() ) - dateString = KGlobal::locale()->formatDate( mDate, true ); + dateString = TDEGlobal::locale()->formatDate( mDate, true ); // We do not want to generate a signal here, // since we explicitly setting the date diff --git a/libtdepim/kimportdialog.cpp b/libtdepim/kimportdialog.cpp index 60d5c24f..d3603e19 100644 --- a/libtdepim/kimportdialog.cpp +++ b/libtdepim/kimportdialog.cpp @@ -572,7 +572,7 @@ void KImportDialog::assignTemplate() TQStringList templates; // load all template files - TQStringList list = KGlobal::dirs()->findAllResources( "data" , TQString( kapp->name() ) + + TQStringList list = TDEGlobal::dirs()->findAllResources( "data" , TQString( kapp->name() ) + "/csv-templates/*.desktop", true, true ); for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it ) diff --git a/libtdepim/kincidencechooser.cpp b/libtdepim/kincidencechooser.cpp index 68ac5854..f1c43daa 100644 --- a/libtdepim/kincidencechooser.cpp +++ b/libtdepim/kincidencechooser.cpp @@ -201,7 +201,7 @@ void KIncidenceChooser::setLabels() if ( mDiffBut ) mDiffBut->setEnabled( false ); } - mMod1lab->setText( KGlobal::locale()->formatDateTime(inc->lastModified() )); + mMod1lab->setText( TDEGlobal::locale()->formatDateTime(inc->lastModified() )); inc = mInc2; des = mInc2lab; sum = mInc2Sumlab; @@ -219,7 +219,7 @@ void KIncidenceChooser::setLabels() sum->setText( inc->description().left( 30 )); } - mMod2lab->setText( KGlobal::locale()->formatDateTime(inc->lastModified() )); + mMod2lab->setText( TDEGlobal::locale()->formatDateTime(inc->lastModified() )); } void KIncidenceChooser::showIncidence1() diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp index 1a64a675..b19ead44 100644 --- a/libtdepim/komposer/core/pluginmanager.cpp +++ b/libtdepim/komposer/core/pluginmanager.cpp @@ -78,7 +78,7 @@ PluginManager::PluginManager( TQObject *parent ) kapp->ref(); d->shutdownMode = Private::StartingUp; - KSettings::Dispatcher::self()->registerInstance( KGlobal::instance(), + KSettings::Dispatcher::self()->registerInstance( TDEGlobal::instance(), this, TQT_SLOT( loadAllPlugins() ) ); d->plugins = KPluginInfo::fromServices( diff --git a/libtdepim/kscoring.cpp b/libtdepim/kscoring.cpp index fc156436..4fcc9774 100644 --- a/libtdepim/kscoring.cpp +++ b/libtdepim/kscoring.cpp @@ -785,9 +785,9 @@ KScoringManager::KScoringManager(const TQString& appName) allRules.setAutoDelete(true); // determine filename of the scorefile if(appName.isEmpty()) - mFilename = KGlobal::dirs()->saveLocation("appdata") + "/scorefile"; + mFilename = TDEGlobal::dirs()->saveLocation("appdata") + "/scorefile"; else - mFilename = KGlobal::dirs()->saveLocation("data") + "/" + appName + "/scorefile"; + mFilename = TDEGlobal::dirs()->saveLocation("data") + "/" + appName + "/scorefile"; // open the score file load(); } diff --git a/libtdepim/ksubscription.cpp b/libtdepim/ksubscription.cpp index 2a2347ed..5829d63a 100644 --- a/libtdepim/ksubscription.cpp +++ b/libtdepim/ksubscription.cpp @@ -223,7 +223,7 @@ KSubscription::KSubscription( TQWidget *parent, const TQString &caption, i18n("Manage which mail folders you want to see in your folder view") + "

", page); TQToolButton *clearButton = new TQToolButton( page ); - clearButton->setIconSet( KGlobal::iconLoader()->loadIconSet( + clearButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet( TDEApplication::reverseLayout() ? "clear_left":"locationbar_erase", KIcon::Small, 0 ) ); filterEdit = new KLineEdit(page); TQLabel *l = new TQLabel(filterEdit,i18n("S&earch:"), page); diff --git a/libtdepim/ktimeedit.cpp b/libtdepim/ktimeedit.cpp index c968f235..2a58fc54 100644 --- a/libtdepim/ktimeedit.cpp +++ b/libtdepim/ktimeedit.cpp @@ -53,7 +53,7 @@ public: return Intermediate; bool ok = false; - /*TQTime time =*/ KGlobal::locale()->readTime(str, KLocale::WithoutSeconds, &ok); + /*TQTime time =*/ TDEGlobal::locale()->readTime(str, KLocale::WithoutSeconds, &ok); if ( ok ) return Acceptable; // kdDebug(5300)<<"Time "<readTime( input, KLocale::WithoutSeconds, &ok ); + TDEGlobal::locale()->readTime( input, KLocale::WithoutSeconds, &ok ); if ( !ok ) { // Also try to accept times in "military format", i.e. no delimiter, like 1200 int tm = input.toInt( &ok ); if ( ( 0 <= tm ) && ( tm < 2400 ) && ( tm%100 < 60 ) && ok ) { - input = KGlobal::locale()->formatTime( TQTime( tm / 100, tm % 100, 0 ) ); + input = TDEGlobal::locale()->formatTime( TQTime( tm / 100, tm % 100, 0 ) ); } } } @@ -119,11 +119,11 @@ KTimeEdit::KTimeEdit( TQWidget *parent, TQTime qt, const char *name ) // Fill combo box with selection of times in localized format. TQTime timeEntry(0,0,0); do { - insertItem(KGlobal::locale()->formatTime(timeEntry)); + insertItem(TDEGlobal::locale()->formatTime(timeEntry)); timeEntry = timeEntry.addSecs(60*15); } while (!timeEntry.isNull()); // Add end of day. - insertItem( KGlobal::locale()->formatTime( TQTime( 23, 59, 59 ) ) ); + insertItem( TDEGlobal::locale()->formatTime( TQTime( 23, 59, 59 ) ) ); updateText(); setFocusPolicy(TQ_StrongFocus); @@ -151,7 +151,7 @@ TQTime KTimeEdit::getTime() const //kdDebug(5300) << "KTimeEdit::getTime(), currentText() = " << currentText() << endl; // TODO use KLocale::WithoutSeconds in HEAD bool ok = false; - TQTime time = KGlobal::locale()->readTime( currentText(), KLocale::WithoutSeconds, &ok ); + TQTime time = TDEGlobal::locale()->readTime( currentText(), KLocale::WithoutSeconds, &ok ); if ( !ok ) { // Also try to accept times in "military format", i.e. no delimiter, like 1200 int tm = currentText().toInt( &ok ); @@ -257,7 +257,7 @@ void KTimeEdit::keyPressEvent(TQKeyEvent *qke) void KTimeEdit::updateText() { // kdDebug(5300) << "KTimeEdit::updateText() " << endl; - TQString s = KGlobal::locale()->formatTime(mTime); + TQString s = TDEGlobal::locale()->formatTime(mTime); // Set the text but without emitting signals, nor losing the cursor position TQLineEdit *line = lineEdit(); line->blockSignals(true); diff --git a/libtdepim/pluginloaderbase.cpp b/libtdepim/pluginloaderbase.cpp index 7bf768fd..5d0a89f6 100644 --- a/libtdepim/pluginloaderbase.cpp +++ b/libtdepim/pluginloaderbase.cpp @@ -66,7 +66,7 @@ namespace KPIM { mPluginMap.clear(); const TQStringList list = - KGlobal::dirs()->findAllResources( "data", path, true, true ); + TDEGlobal::dirs()->findAllResources( "data", path, true, true ); for ( TQStringList::const_iterator it = list.begin() ; it != list.end() ; ++it ) { KSimpleConfig config( *it, true ); diff --git a/libtdepim/progressdialog.cpp b/libtdepim/progressdialog.cpp index b058194b..947c0ce8 100644 --- a/libtdepim/progressdialog.cpp +++ b/libtdepim/progressdialog.cpp @@ -260,7 +260,7 @@ ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const c pbClose->setAutoRaise(true); pbClose->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); pbClose->setFixedSize( 16, 16 ); - pbClose->setIconSet( KGlobal::iconLoader()->loadIconSet( "fileclose", KIcon::Small, 14 ) ); + pbClose->setIconSet( TDEGlobal::iconLoader()->loadIconSet( "fileclose", KIcon::Small, 14 ) ); TQToolTip::add( pbClose, i18n( "Hide detailed progress window" ) ); connect(pbClose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose())); TQWidget* spacer = new TQWidget( rightBox ); // don't let the close button take up all the height diff --git a/libtdepim/recentaddresses.cpp b/libtdepim/recentaddresses.cpp index df7a4549..066ba27b 100644 --- a/libtdepim/recentaddresses.cpp +++ b/libtdepim/recentaddresses.cpp @@ -57,7 +57,7 @@ RecentAddresses * RecentAddresses::self( KConfig *config) RecentAddresses::RecentAddresses(KConfig * config) { if ( !config ) - load( KGlobal::config() ); + load( TDEGlobal::config() ); else load( config ); } diff --git a/libtdepim/recentaddresses.h b/libtdepim/recentaddresses.h index 446f6c68..8d649e81 100644 --- a/libtdepim/recentaddresses.h +++ b/libtdepim/recentaddresses.h @@ -106,7 +106,7 @@ public: /** * Saves the list of recently used addresses to the configfile. - * Make sure to call KGlobal::config()->sync() afterwards, to really save. + * Make sure to call TDEGlobal::config()->sync() afterwards, to really save. */ void save( KConfig * ); diff --git a/libtdepim/ssllabel.cpp b/libtdepim/ssllabel.cpp index 8068aa00..6e4717cd 100644 --- a/libtdepim/ssllabel.cpp +++ b/libtdepim/ssllabel.cpp @@ -67,7 +67,7 @@ void SSLLabel::setState( State state ) case Encrypted: TQToolTip::remove( this ); TQToolTip::add( this, i18n("Connection is encrypted") ); - setPixmap( SmallIcon( "encrypted", KGlobal::instance() ) ); + setPixmap( SmallIcon( "encrypted", TDEGlobal::instance() ) ); show(); break; case Unencrypted: diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp index 2acfdc2d..843c01f1 100644 --- a/plugins/kmail/bodypartformatter/text_calendar.cpp +++ b/plugins/kmail/bodypartformatter/text_calendar.cpp @@ -971,6 +971,6 @@ extern "C" KDE_EXPORT KMail::Interface::BodyPartFormatterPlugin * libkmail_bodypartformatter_text_calendar_create_bodypart_formatter_plugin() { - KGlobal::locale()->insertCatalogue( "kmail_text_calendar_plugin" ); + TDEGlobal::locale()->insertCatalogue( "kmail_text_calendar_plugin" ); return new Plugin(); } diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp index ec3a3bfe..bc1c4e58 100644 --- a/plugins/kmail/bodypartformatter/text_vcard.cpp +++ b/plugins/kmail/bodypartformatter/text_vcard.cpp @@ -270,7 +270,7 @@ namespace { extern "C" KDE_EXPORT KMail::Interface::BodyPartFormatterPlugin * libkmail_bodypartformatter_text_vcard_create_bodypart_formatter_plugin() { - KGlobal::locale()->insertCatalogue( "kmail_text_vcard_plugin" ); + TDEGlobal::locale()->insertCatalogue( "kmail_text_vcard_plugin" ); return new Plugin(); } diff --git a/wizards/egroupwaremain.cpp b/wizards/egroupwaremain.cpp index a5fd9c67..aa115cc8 100644 --- a/wizards/egroupwaremain.cpp +++ b/wizards/egroupwaremain.cpp @@ -44,7 +44,7 @@ int main(int argc,char **argv) TDEApplication app; - KGlobal::locale()->insertCatalogue( "libtdepim" ); + TDEGlobal::locale()->insertCatalogue( "libtdepim" ); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/wizards/exchangemain.cpp b/wizards/exchangemain.cpp index 627467b6..a3d78909 100644 --- a/wizards/exchangemain.cpp +++ b/wizards/exchangemain.cpp @@ -44,7 +44,7 @@ int main(int argc,char **argv) TDEApplication app; - KGlobal::locale()->insertCatalogue( "libtdepim" ); + TDEGlobal::locale()->insertCatalogue( "libtdepim" ); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/wizards/groupwisemain.cpp b/wizards/groupwisemain.cpp index 86d2eae9..f7eab0be 100644 --- a/wizards/groupwisemain.cpp +++ b/wizards/groupwisemain.cpp @@ -45,7 +45,7 @@ int main(int argc,char **argv) TDEApplication app; - KGlobal::locale()->insertCatalogue( "libtdepim" ); + TDEGlobal::locale()->insertCatalogue( "libtdepim" ); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/wizards/kolabmain.cpp b/wizards/kolabmain.cpp index e24f7ac5..8b316a45 100644 --- a/wizards/kolabmain.cpp +++ b/wizards/kolabmain.cpp @@ -44,7 +44,7 @@ int main(int argc,char **argv) TDEApplication app; - KGlobal::locale()->insertCatalogue( "libtdepim" ); + TDEGlobal::locale()->insertCatalogue( "libtdepim" ); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/wizards/main.cpp b/wizards/main.cpp index ac9275a6..4b66356c 100644 --- a/wizards/main.cpp +++ b/wizards/main.cpp @@ -23,7 +23,7 @@ int main( int argc, char **argv ) TDEApplication app; - KGlobal::locale()->insertCatalogue( "libtdepim" ); + TDEGlobal::locale()->insertCatalogue( "libtdepim" ); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/wizards/overviewpage.cpp b/wizards/overviewpage.cpp index 1d2ef06c..d1a12db9 100644 --- a/wizards/overviewpage.cpp +++ b/wizards/overviewpage.cpp @@ -51,7 +51,7 @@ OverViewPage::OverViewPage( TQWidget *parent, const char *name ) layout->addMultiCellWidget( label, 0, 0, 0, 2 ); label = new TQLabel( this ); - label->setPixmap( KGlobal::iconLoader()->loadIcon( "network", KIcon::Desktop ) ); + label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "network", KIcon::Desktop ) ); layout->addWidget( label, 0, 3 ); label = new TQLabel( "", this ); diff --git a/wizards/scalixmain.cpp b/wizards/scalixmain.cpp index 70243870..06fa5341 100644 --- a/wizards/scalixmain.cpp +++ b/wizards/scalixmain.cpp @@ -44,7 +44,7 @@ int main(int argc,char **argv) TDEApplication app; - KGlobal::locale()->insertCatalogue( "libtdepim" ); + TDEGlobal::locale()->insertCatalogue( "libtdepim" ); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/wizards/sloxmain.cpp b/wizards/sloxmain.cpp index 3eab6b69..d63c43ae 100644 --- a/wizards/sloxmain.cpp +++ b/wizards/sloxmain.cpp @@ -44,7 +44,7 @@ int main(int argc,char **argv) TDEApplication app; - KGlobal::locale()->insertCatalogue( "libtdepim" ); + TDEGlobal::locale()->insertCatalogue( "libtdepim" ); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
%1 %2