diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:27:15 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:27:15 -0600 |
| commit | 5b6d393e0a2c88cce8f433607c091ae883ef54f9 (patch) | |
| tree | 3c54f3e4a9d6fc2ac30a58e96c19ea878fa08459 | |
| parent | eb52f16dcfba98b043537ea3da6a1b08b8d51b19 (diff) | |
| download | tellico-5b6d393e0a2c88cce8f433607c091ae883ef54f9.tar.gz tellico-5b6d393e0a2c88cce8f433607c091ae883ef54f9.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
33 files changed, 245 insertions, 245 deletions
diff --git a/src/configdialog.cpp b/src/configdialog.cpp index 993fd80..c5bdfac 100644 --- a/src/configdialog.cpp +++ b/src/configdialog.cpp @@ -281,7 +281,7 @@ void ConfigDialog::setupGeneralPage() { void ConfigDialog::setupPrintingPage() { // SuSE changed the icon name on me TQPixmap pix; - KIconLoader* loader = KGlobal::iconLoader(); + KIconLoader* loader = TDEGlobal::iconLoader(); if(loader) { pix = loader->loadIcon(TQString::fromLatin1("printer1"), KIcon::Desktop, KIcon::SizeMedium, KIcon::DefaultState, 0, true /*canReturnNull */); @@ -696,7 +696,7 @@ void ConfigDialog::saveConfiguration() { } m_removedConfigWidgets.clear(); - KConfig* masterConfig = KGlobal::config(); + KConfig* masterConfig = TDEGlobal::config(); bool reloadFetchers = false; int count = 0; // start group numbering at 0 @@ -990,7 +990,7 @@ void ConfigDialog::slotShowTemplatePreview() { } void ConfigDialog::loadTemplateList() { - TQStringList files = KGlobal::dirs()->findAllResources("appdata", TQString::fromLatin1("entry-templates/*.xsl"), + TQStringList files = TDEGlobal::dirs()->findAllResources("appdata", TQString::fromLatin1("entry-templates/*.xsl"), false, true); KSortableValueList<TQString, TQString> templates; for(TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it) { diff --git a/src/core/tellico_config.cpp b/src/core/tellico_config.cpp index 50ab877..c41fdc9 100644 --- a/src/core/tellico_config.cpp +++ b/src/core/tellico_config.cpp @@ -176,19 +176,19 @@ Config::Config( ) itemTemplateBook = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateBook, TQString::fromLatin1( "Fancy" ) ); addItem( itemTemplateBook, TQString::fromLatin1( "templateBook" ) ); KConfigSkeleton::ItemFont *itemFontBook; - itemFontBook = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontBook, KGlobalSettings::generalFont() ); + itemFontBook = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontBook, TDEGlobalSettings::generalFont() ); addItem( itemFontBook, TQString::fromLatin1( "fontBook" ) ); KConfigSkeleton::ItemColor *itemBaseColorBook; - itemBaseColorBook = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorBook, KGlobalSettings::baseColor() ); + itemBaseColorBook = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorBook, TDEGlobalSettings::baseColor() ); addItem( itemBaseColorBook, TQString::fromLatin1( "baseColorBook" ) ); KConfigSkeleton::ItemColor *itemTextColorBook; - itemTextColorBook = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorBook, KGlobalSettings::textColor() ); + itemTextColorBook = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorBook, TDEGlobalSettings::textColor() ); addItem( itemTextColorBook, TQString::fromLatin1( "textColorBook" ) ); KConfigSkeleton::ItemColor *itemHighlightedBaseColorBook; - itemHighlightedBaseColorBook = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorBook, KGlobalSettings::highlightColor() ); + itemHighlightedBaseColorBook = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorBook, TDEGlobalSettings::highlightColor() ); addItem( itemHighlightedBaseColorBook, TQString::fromLatin1( "highlightedBaseColorBook" ) ); KConfigSkeleton::ItemColor *itemHighlightedTextColorBook; - itemHighlightedTextColorBook = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorBook, KGlobalSettings::highlightedTextColor() ); + itemHighlightedTextColorBook = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorBook, TDEGlobalSettings::highlightedTextColor() ); addItem( itemHighlightedTextColorBook, TQString::fromLatin1( "highlightedTextColorBook" ) ); setCurrentGroup( TQString::fromLatin1( "Options - video" ) ); @@ -197,19 +197,19 @@ Config::Config( ) itemTemplateVideo = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateVideo, TQString::fromLatin1( "Video" ) ); addItem( itemTemplateVideo, TQString::fromLatin1( "templateVideo" ) ); KConfigSkeleton::ItemFont *itemFontVideo; - itemFontVideo = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontVideo, KGlobalSettings::generalFont() ); + itemFontVideo = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontVideo, TDEGlobalSettings::generalFont() ); addItem( itemFontVideo, TQString::fromLatin1( "fontVideo" ) ); KConfigSkeleton::ItemColor *itemBaseColorVideo; - itemBaseColorVideo = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorVideo, KGlobalSettings::baseColor() ); + itemBaseColorVideo = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorVideo, TDEGlobalSettings::baseColor() ); addItem( itemBaseColorVideo, TQString::fromLatin1( "baseColorVideo" ) ); KConfigSkeleton::ItemColor *itemTextColorVideo; - itemTextColorVideo = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorVideo, KGlobalSettings::textColor() ); + itemTextColorVideo = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorVideo, TDEGlobalSettings::textColor() ); addItem( itemTextColorVideo, TQString::fromLatin1( "textColorVideo" ) ); KConfigSkeleton::ItemColor *itemHighlightedBaseColorVideo; - itemHighlightedBaseColorVideo = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorVideo, KGlobalSettings::highlightColor() ); + itemHighlightedBaseColorVideo = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorVideo, TDEGlobalSettings::highlightColor() ); addItem( itemHighlightedBaseColorVideo, TQString::fromLatin1( "highlightedBaseColorVideo" ) ); KConfigSkeleton::ItemColor *itemHighlightedTextColorVideo; - itemHighlightedTextColorVideo = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorVideo, KGlobalSettings::highlightedTextColor() ); + itemHighlightedTextColorVideo = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorVideo, TDEGlobalSettings::highlightedTextColor() ); addItem( itemHighlightedTextColorVideo, TQString::fromLatin1( "highlightedTextColorVideo" ) ); setCurrentGroup( TQString::fromLatin1( "Options - album" ) ); @@ -218,19 +218,19 @@ Config::Config( ) itemTemplateAlbum = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateAlbum, TQString::fromLatin1( "Album" ) ); addItem( itemTemplateAlbum, TQString::fromLatin1( "templateAlbum" ) ); KConfigSkeleton::ItemFont *itemFontAlbum; - itemFontAlbum = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontAlbum, KGlobalSettings::generalFont() ); + itemFontAlbum = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontAlbum, TDEGlobalSettings::generalFont() ); addItem( itemFontAlbum, TQString::fromLatin1( "fontAlbum" ) ); KConfigSkeleton::ItemColor *itemBaseColorAlbum; - itemBaseColorAlbum = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorAlbum, KGlobalSettings::baseColor() ); + itemBaseColorAlbum = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorAlbum, TDEGlobalSettings::baseColor() ); addItem( itemBaseColorAlbum, TQString::fromLatin1( "baseColorAlbum" ) ); KConfigSkeleton::ItemColor *itemTextColorAlbum; - itemTextColorAlbum = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorAlbum, KGlobalSettings::textColor() ); + itemTextColorAlbum = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorAlbum, TDEGlobalSettings::textColor() ); addItem( itemTextColorAlbum, TQString::fromLatin1( "textColorAlbum" ) ); KConfigSkeleton::ItemColor *itemHighlightedBaseColorAlbum; - itemHighlightedBaseColorAlbum = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorAlbum, KGlobalSettings::highlightColor() ); + itemHighlightedBaseColorAlbum = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorAlbum, TDEGlobalSettings::highlightColor() ); addItem( itemHighlightedBaseColorAlbum, TQString::fromLatin1( "highlightedBaseColorAlbum" ) ); KConfigSkeleton::ItemColor *itemHighlightedTextColorAlbum; - itemHighlightedTextColorAlbum = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorAlbum, KGlobalSettings::highlightedTextColor() ); + itemHighlightedTextColorAlbum = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorAlbum, TDEGlobalSettings::highlightedTextColor() ); addItem( itemHighlightedTextColorAlbum, TQString::fromLatin1( "highlightedTextColorAlbum" ) ); setCurrentGroup( TQString::fromLatin1( "Options - bibtex" ) ); @@ -242,19 +242,19 @@ Config::Config( ) itemTemplateBibtex = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateBibtex, TQString::fromLatin1( "Fancy" ) ); addItem( itemTemplateBibtex, TQString::fromLatin1( "templateBibtex" ) ); KConfigSkeleton::ItemFont *itemFontBibtex; - itemFontBibtex = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontBibtex, KGlobalSettings::generalFont() ); + itemFontBibtex = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontBibtex, TDEGlobalSettings::generalFont() ); addItem( itemFontBibtex, TQString::fromLatin1( "fontBibtex" ) ); KConfigSkeleton::ItemColor *itemBaseColorBibtex; - itemBaseColorBibtex = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorBibtex, KGlobalSettings::baseColor() ); + itemBaseColorBibtex = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorBibtex, TDEGlobalSettings::baseColor() ); addItem( itemBaseColorBibtex, TQString::fromLatin1( "baseColorBibtex" ) ); KConfigSkeleton::ItemColor *itemTextColorBibtex; - itemTextColorBibtex = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorBibtex, KGlobalSettings::textColor() ); + itemTextColorBibtex = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorBibtex, TDEGlobalSettings::textColor() ); addItem( itemTextColorBibtex, TQString::fromLatin1( "textColorBibtex" ) ); KConfigSkeleton::ItemColor *itemHighlightedBaseColorBibtex; - itemHighlightedBaseColorBibtex = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorBibtex, KGlobalSettings::highlightColor() ); + itemHighlightedBaseColorBibtex = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorBibtex, TDEGlobalSettings::highlightColor() ); addItem( itemHighlightedBaseColorBibtex, TQString::fromLatin1( "highlightedBaseColorBibtex" ) ); KConfigSkeleton::ItemColor *itemHighlightedTextColorBibtex; - itemHighlightedTextColorBibtex = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorBibtex, KGlobalSettings::highlightedTextColor() ); + itemHighlightedTextColorBibtex = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorBibtex, TDEGlobalSettings::highlightedTextColor() ); addItem( itemHighlightedTextColorBibtex, TQString::fromLatin1( "highlightedTextColorBibtex" ) ); setCurrentGroup( TQString::fromLatin1( "Options - comic" ) ); @@ -263,19 +263,19 @@ Config::Config( ) itemTemplateComicBook = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateComicBook, TQString::fromLatin1( "Fancy" ) ); addItem( itemTemplateComicBook, TQString::fromLatin1( "templateComicBook" ) ); KConfigSkeleton::ItemFont *itemFontComicBook; - itemFontComicBook = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontComicBook, KGlobalSettings::generalFont() ); + itemFontComicBook = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontComicBook, TDEGlobalSettings::generalFont() ); addItem( itemFontComicBook, TQString::fromLatin1( "fontComicBook" ) ); KConfigSkeleton::ItemColor *itemBaseColorComicBook; - itemBaseColorComicBook = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorComicBook, KGlobalSettings::baseColor() ); + itemBaseColorComicBook = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorComicBook, TDEGlobalSettings::baseColor() ); addItem( itemBaseColorComicBook, TQString::fromLatin1( "baseColorComicBook" ) ); KConfigSkeleton::ItemColor *itemTextColorComicBook; - itemTextColorComicBook = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorComicBook, KGlobalSettings::textColor() ); + itemTextColorComicBook = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorComicBook, TDEGlobalSettings::textColor() ); addItem( itemTextColorComicBook, TQString::fromLatin1( "textColorComicBook" ) ); KConfigSkeleton::ItemColor *itemHighlightedBaseColorComicBook; - itemHighlightedBaseColorComicBook = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorComicBook, KGlobalSettings::highlightColor() ); + itemHighlightedBaseColorComicBook = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorComicBook, TDEGlobalSettings::highlightColor() ); addItem( itemHighlightedBaseColorComicBook, TQString::fromLatin1( "highlightedBaseColorComicBook" ) ); KConfigSkeleton::ItemColor *itemHighlightedTextColorComicBook; - itemHighlightedTextColorComicBook = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorComicBook, KGlobalSettings::highlightedTextColor() ); + itemHighlightedTextColorComicBook = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorComicBook, TDEGlobalSettings::highlightedTextColor() ); addItem( itemHighlightedTextColorComicBook, TQString::fromLatin1( "highlightedTextColorComicBook" ) ); setCurrentGroup( TQString::fromLatin1( "Options - wine" ) ); @@ -284,19 +284,19 @@ Config::Config( ) itemTemplateWine = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateWine, TQString::fromLatin1( "Fancy" ) ); addItem( itemTemplateWine, TQString::fromLatin1( "templateWine" ) ); KConfigSkeleton::ItemFont *itemFontWine; - itemFontWine = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontWine, KGlobalSettings::generalFont() ); + itemFontWine = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontWine, TDEGlobalSettings::generalFont() ); addItem( itemFontWine, TQString::fromLatin1( "fontWine" ) ); KConfigSkeleton::ItemColor *itemBaseColorWine; - itemBaseColorWine = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorWine, KGlobalSettings::baseColor() ); + itemBaseColorWine = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorWine, TDEGlobalSettings::baseColor() ); addItem( itemBaseColorWine, TQString::fromLatin1( "baseColorWine" ) ); KConfigSkeleton::ItemColor *itemTextColorWine; - itemTextColorWine = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorWine, KGlobalSettings::textColor() ); + itemTextColorWine = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorWine, TDEGlobalSettings::textColor() ); addItem( itemTextColorWine, TQString::fromLatin1( "textColorWine" ) ); KConfigSkeleton::ItemColor *itemHighlightedBaseColorWine; - itemHighlightedBaseColorWine = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorWine, KGlobalSettings::highlightColor() ); + itemHighlightedBaseColorWine = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorWine, TDEGlobalSettings::highlightColor() ); addItem( itemHighlightedBaseColorWine, TQString::fromLatin1( "highlightedBaseColorWine" ) ); KConfigSkeleton::ItemColor *itemHighlightedTextColorWine; - itemHighlightedTextColorWine = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorWine, KGlobalSettings::highlightedTextColor() ); + itemHighlightedTextColorWine = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorWine, TDEGlobalSettings::highlightedTextColor() ); addItem( itemHighlightedTextColorWine, TQString::fromLatin1( "highlightedTextColorWine" ) ); setCurrentGroup( TQString::fromLatin1( "Options - coin" ) ); @@ -305,19 +305,19 @@ Config::Config( ) itemTemplateCoin = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateCoin, TQString::fromLatin1( "Fancy" ) ); addItem( itemTemplateCoin, TQString::fromLatin1( "templateCoin" ) ); KConfigSkeleton::ItemFont *itemFontCoin; - itemFontCoin = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontCoin, KGlobalSettings::generalFont() ); + itemFontCoin = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontCoin, TDEGlobalSettings::generalFont() ); addItem( itemFontCoin, TQString::fromLatin1( "fontCoin" ) ); KConfigSkeleton::ItemColor *itemBaseColorCoin; - itemBaseColorCoin = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorCoin, KGlobalSettings::baseColor() ); + itemBaseColorCoin = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorCoin, TDEGlobalSettings::baseColor() ); addItem( itemBaseColorCoin, TQString::fromLatin1( "baseColorCoin" ) ); KConfigSkeleton::ItemColor *itemTextColorCoin; - itemTextColorCoin = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorCoin, KGlobalSettings::textColor() ); + itemTextColorCoin = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorCoin, TDEGlobalSettings::textColor() ); addItem( itemTextColorCoin, TQString::fromLatin1( "textColorCoin" ) ); KConfigSkeleton::ItemColor *itemHighlightedBaseColorCoin; - itemHighlightedBaseColorCoin = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorCoin, KGlobalSettings::highlightColor() ); + itemHighlightedBaseColorCoin = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorCoin, TDEGlobalSettings::highlightColor() ); addItem( itemHighlightedBaseColorCoin, TQString::fromLatin1( "highlightedBaseColorCoin" ) ); KConfigSkeleton::ItemColor *itemHighlightedTextColorCoin; - itemHighlightedTextColorCoin = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorCoin, KGlobalSettings::highlightedTextColor() ); + itemHighlightedTextColorCoin = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorCoin, TDEGlobalSettings::highlightedTextColor() ); addItem( itemHighlightedTextColorCoin, TQString::fromLatin1( "highlightedTextColorCoin" ) ); setCurrentGroup( TQString::fromLatin1( "Options - stamp" ) ); @@ -326,19 +326,19 @@ Config::Config( ) itemTemplateStamp = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateStamp, TQString::fromLatin1( "Fancy" ) ); addItem( itemTemplateStamp, TQString::fromLatin1( "templateStamp" ) ); KConfigSkeleton::ItemFont *itemFontStamp; - itemFontStamp = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontStamp, KGlobalSettings::generalFont() ); + itemFontStamp = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontStamp, TDEGlobalSettings::generalFont() ); addItem( itemFontStamp, TQString::fromLatin1( "fontStamp" ) ); KConfigSkeleton::ItemColor *itemBaseColorStamp; - itemBaseColorStamp = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorStamp, KGlobalSettings::baseColor() ); + itemBaseColorStamp = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorStamp, TDEGlobalSettings::baseColor() ); addItem( itemBaseColorStamp, TQString::fromLatin1( "baseColorStamp" ) ); KConfigSkeleton::ItemColor *itemTextColorStamp; - itemTextColorStamp = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorStamp, KGlobalSettings::textColor() ); + itemTextColorStamp = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorStamp, TDEGlobalSettings::textColor() ); addItem( itemTextColorStamp, TQString::fromLatin1( "textColorStamp" ) ); KConfigSkeleton::ItemColor *itemHighlightedBaseColorStamp; - itemHighlightedBaseColorStamp = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorStamp, KGlobalSettings::highlightColor() ); + itemHighlightedBaseColorStamp = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorStamp, TDEGlobalSettings::highlightColor() ); addItem( itemHighlightedBaseColorStamp, TQString::fromLatin1( "highlightedBaseColorStamp" ) ); KConfigSkeleton::ItemColor *itemHighlightedTextColorStamp; - itemHighlightedTextColorStamp = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorStamp, KGlobalSettings::highlightedTextColor() ); + itemHighlightedTextColorStamp = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorStamp, TDEGlobalSettings::highlightedTextColor() ); addItem( itemHighlightedTextColorStamp, TQString::fromLatin1( "highlightedTextColorStamp" ) ); setCurrentGroup( TQString::fromLatin1( "Options - card" ) ); @@ -347,19 +347,19 @@ Config::Config( ) itemTemplateCard = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateCard, TQString::fromLatin1( "Fancy" ) ); addItem( itemTemplateCard, TQString::fromLatin1( "templateCard" ) ); KConfigSkeleton::ItemFont *itemFontCard; - itemFontCard = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontCard, KGlobalSettings::generalFont() ); + itemFontCard = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontCard, TDEGlobalSettings::generalFont() ); addItem( itemFontCard, TQString::fromLatin1( "fontCard" ) ); KConfigSkeleton::ItemColor *itemBaseColorCard; - itemBaseColorCard = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorCard, KGlobalSettings::baseColor() ); + itemBaseColorCard = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorCard, TDEGlobalSettings::baseColor() ); addItem( itemBaseColorCard, TQString::fromLatin1( "baseColorCard" ) ); KConfigSkeleton::ItemColor *itemTextColorCard; - itemTextColorCard = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorCard, KGlobalSettings::textColor() ); + itemTextColorCard = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorCard, TDEGlobalSettings::textColor() ); addItem( itemTextColorCard, TQString::fromLatin1( "textColorCard" ) ); KConfigSkeleton::ItemColor *itemHighlightedBaseColorCard; - itemHighlightedBaseColorCard = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorCard, KGlobalSettings::highlightColor() ); + itemHighlightedBaseColorCard = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorCard, TDEGlobalSettings::highlightColor() ); addItem( itemHighlightedBaseColorCard, TQString::fromLatin1( "highlightedBaseColorCard" ) ); KConfigSkeleton::ItemColor *itemHighlightedTextColorCard; - itemHighlightedTextColorCard = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorCard, KGlobalSettings::highlightedTextColor() ); + itemHighlightedTextColorCard = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorCard, TDEGlobalSettings::highlightedTextColor() ); addItem( itemHighlightedTextColorCard, TQString::fromLatin1( "highlightedTextColorCard" ) ); setCurrentGroup( TQString::fromLatin1( "Options - game" ) ); @@ -368,19 +368,19 @@ Config::Config( ) itemTemplateGame = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateGame, TQString::fromLatin1( "Fancy" ) ); addItem( itemTemplateGame, TQString::fromLatin1( "templateGame" ) ); KConfigSkeleton::ItemFont *itemFontGame; - itemFontGame = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontGame, KGlobalSettings::generalFont() ); + itemFontGame = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontGame, TDEGlobalSettings::generalFont() ); addItem( itemFontGame, TQString::fromLatin1( "fontGame" ) ); KConfigSkeleton::ItemColor *itemBaseColorGame; - itemBaseColorGame = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorGame, KGlobalSettings::baseColor() ); + itemBaseColorGame = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorGame, TDEGlobalSettings::baseColor() ); addItem( itemBaseColorGame, TQString::fromLatin1( "baseColorGame" ) ); KConfigSkeleton::ItemColor *itemTextColorGame; - itemTextColorGame = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorGame, KGlobalSettings::textColor() ); + itemTextColorGame = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorGame, TDEGlobalSettings::textColor() ); addItem( itemTextColorGame, TQString::fromLatin1( "textColorGame" ) ); KConfigSkeleton::ItemColor *itemHighlightedBaseColorGame; - itemHighlightedBaseColorGame = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorGame, KGlobalSettings::highlightColor() ); + itemHighlightedBaseColorGame = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorGame, TDEGlobalSettings::highlightColor() ); addItem( itemHighlightedBaseColorGame, TQString::fromLatin1( "highlightedBaseColorGame" ) ); KConfigSkeleton::ItemColor *itemHighlightedTextColorGame; - itemHighlightedTextColorGame = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorGame, KGlobalSettings::highlightedTextColor() ); + itemHighlightedTextColorGame = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorGame, TDEGlobalSettings::highlightedTextColor() ); addItem( itemHighlightedTextColorGame, TQString::fromLatin1( "highlightedTextColorGame" ) ); setCurrentGroup( TQString::fromLatin1( "Options - file" ) ); @@ -389,19 +389,19 @@ Config::Config( ) itemTemplateFile = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateFile, TQString::fromLatin1( "Fancy" ) ); addItem( itemTemplateFile, TQString::fromLatin1( "templateFile" ) ); KConfigSkeleton::ItemFont *itemFontFile; - itemFontFile = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontFile, KGlobalSettings::generalFont() ); + itemFontFile = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontFile, TDEGlobalSettings::generalFont() ); addItem( itemFontFile, TQString::fromLatin1( "fontFile" ) ); KConfigSkeleton::ItemColor *itemBaseColorFile; - itemBaseColorFile = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorFile, KGlobalSettings::baseColor() ); + itemBaseColorFile = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorFile, TDEGlobalSettings::baseColor() ); addItem( itemBaseColorFile, TQString::fromLatin1( "baseColorFile" ) ); KConfigSkeleton::ItemColor *itemTextColorFile; - itemTextColorFile = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorFile, KGlobalSettings::textColor() ); + itemTextColorFile = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorFile, TDEGlobalSettings::textColor() ); addItem( itemTextColorFile, TQString::fromLatin1( "textColorFile" ) ); KConfigSkeleton::ItemColor *itemHighlightedBaseColorFile; - itemHighlightedBaseColorFile = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorFile, KGlobalSettings::highlightColor() ); + itemHighlightedBaseColorFile = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorFile, TDEGlobalSettings::highlightColor() ); addItem( itemHighlightedBaseColorFile, TQString::fromLatin1( "highlightedBaseColorFile" ) ); KConfigSkeleton::ItemColor *itemHighlightedTextColorFile; - itemHighlightedTextColorFile = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorFile, KGlobalSettings::highlightedTextColor() ); + itemHighlightedTextColorFile = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorFile, TDEGlobalSettings::highlightedTextColor() ); addItem( itemHighlightedTextColorFile, TQString::fromLatin1( "highlightedTextColorFile" ) ); setCurrentGroup( TQString::fromLatin1( "Options - boardgame" ) ); @@ -410,19 +410,19 @@ Config::Config( ) itemTemplateBoardGame = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateBoardGame, TQString::fromLatin1( "Fancy" ) ); addItem( itemTemplateBoardGame, TQString::fromLatin1( "templateBoardGame" ) ); KConfigSkeleton::ItemFont *itemFontBoardGame; - itemFontBoardGame = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontBoardGame, KGlobalSettings::generalFont() ); + itemFontBoardGame = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontBoardGame, TDEGlobalSettings::generalFont() ); addItem( itemFontBoardGame, TQString::fromLatin1( "fontBoardGame" ) ); KConfigSkeleton::ItemColor *itemBaseColorBoardGame; - itemBaseColorBoardGame = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorBoardGame, KGlobalSettings::baseColor() ); + itemBaseColorBoardGame = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorBoardGame, TDEGlobalSettings::baseColor() ); addItem( itemBaseColorBoardGame, TQString::fromLatin1( "baseColorBoardGame" ) ); KConfigSkeleton::ItemColor *itemTextColorBoardGame; - itemTextColorBoardGame = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorBoardGame, KGlobalSettings::textColor() ); + itemTextColorBoardGame = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorBoardGame, TDEGlobalSettings::textColor() ); addItem( itemTextColorBoardGame, TQString::fromLatin1( "textColorBoardGame" ) ); KConfigSkeleton::ItemColor *itemHighlightedBaseColorBoardGame; - itemHighlightedBaseColorBoardGame = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorBoardGame, KGlobalSettings::highlightColor() ); + itemHighlightedBaseColorBoardGame = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorBoardGame, TDEGlobalSettings::highlightColor() ); addItem( itemHighlightedBaseColorBoardGame, TQString::fromLatin1( "highlightedBaseColorBoardGame" ) ); KConfigSkeleton::ItemColor *itemHighlightedTextColorBoardGame; - itemHighlightedTextColorBoardGame = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorBoardGame, KGlobalSettings::highlightedTextColor() ); + itemHighlightedTextColorBoardGame = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorBoardGame, TDEGlobalSettings::highlightedTextColor() ); addItem( itemHighlightedTextColorBoardGame, TQString::fromLatin1( "highlightedTextColorBoardGame" ) ); setCurrentGroup( TQString::fromLatin1( "Options - entry" ) ); @@ -431,19 +431,19 @@ Config::Config( ) itemTemplateBase = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Entry Template" ), mTemplateBase, TQString::fromLatin1( "Fancy" ) ); addItem( itemTemplateBase, TQString::fromLatin1( "templateBase" ) ); KConfigSkeleton::ItemFont *itemFontBase; - itemFontBase = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontBase, KGlobalSettings::generalFont() ); + itemFontBase = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Template Font" ), mFontBase, TDEGlobalSettings::generalFont() ); addItem( itemFontBase, TQString::fromLatin1( "fontBase" ) ); KConfigSkeleton::ItemColor *itemBaseColorBase; - itemBaseColorBase = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorBase, KGlobalSettings::baseColor() ); + itemBaseColorBase = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Base Color" ), mBaseColorBase, TDEGlobalSettings::baseColor() ); addItem( itemBaseColorBase, TQString::fromLatin1( "baseColorBase" ) ); KConfigSkeleton::ItemColor *itemTextColorBase; - itemTextColorBase = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorBase, KGlobalSettings::textColor() ); + itemTextColorBase = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Text Color" ), mTextColorBase, TDEGlobalSettings::textColor() ); addItem( itemTextColorBase, TQString::fromLatin1( "textColorBase" ) ); KConfigSkeleton::ItemColor *itemHighlightedBaseColorBase; - itemHighlightedBaseColorBase = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorBase, KGlobalSettings::highlightColor() ); + itemHighlightedBaseColorBase = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlight Color" ), mHighlightedBaseColorBase, TDEGlobalSettings::highlightColor() ); addItem( itemHighlightedBaseColorBase, TQString::fromLatin1( "highlightedBaseColorBase" ) ); KConfigSkeleton::ItemColor *itemHighlightedTextColorBase; - itemHighlightedTextColorBase = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorBase, KGlobalSettings::highlightedTextColor() ); + itemHighlightedTextColorBase = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Template Highlighted Text Color" ), mHighlightedTextColorBase, TDEGlobalSettings::highlightedTextColor() ); addItem( itemHighlightedTextColorBase, TQString::fromLatin1( "highlightedTextColorBase" ) ); } diff --git a/src/core/tellico_config.kcfg b/src/core/tellico_config.kcfg index 8b4ed39..51ecde3 100644 --- a/src/core/tellico_config.kcfg +++ b/src/core/tellico_config.kcfg @@ -139,23 +139,23 @@ </entry> <entry key="Template Font" type="Font" name="fontBook"> <label>Template font</label> - <default code="true">KGlobalSettings::generalFont()</default> + <default code="true">TDEGlobalSettings::generalFont()</default> </entry> <entry key="Template Base Color" type="Color" name="baseColorBook"> <label>Template background color</label> - <default code="true">KGlobalSettings::baseColor()</default> + <default code="true">TDEGlobalSettings::baseColor()</default> </entry> <entry key="Template Text Color" type="Color" name="textColorBook"> <label>Template text color</label> - <default code="true">KGlobalSettings::textColor()</default> + <default code="true">TDEGlobalSettings::textColor()</default> </entry> <entry key="Template Highlight Color" type="Color" name="highlightedBaseColorBook"> <label>Template highlight color</label> - <default code="true">KGlobalSettings::highlightColor()</default> + <default code="true">TDEGlobalSettings::highlightColor()</default> </entry> <entry key="Template Highlighted Text Color" type="Color" name="highlightedTextColorBook"> <label>Template highlighted text color</label> - <default code="true">KGlobalSettings::highlightedTextColor()</default> + <default code="true">TDEGlobalSettings::highlightedTextColor()</default> </entry> </group> @@ -165,23 +165,23 @@ </entry> <entry key="Template Font" type="Font" name="fontVideo"> <label>Template font</label> - <default code="true">KGlobalSettings::generalFont()</default> + <default code="true">TDEGlobalSettings::generalFont()</default> </entry> <entry key="Template Base Color" type="Color" name="baseColorVideo"> <label>Template background color</label> - <default code="true">KGlobalSettings::baseColor()</default> + <default code="true">TDEGlobalSettings::baseColor()</default> </entry> <entry key="Template Text Color" type="Color" name="textColorVideo"> <label>Template text color</label> - <default code="true">KGlobalSettings::textColor()</default> + <default code="true">TDEGlobalSettings::textColor()</default> </entry> <entry key="Template Highlight Color" type="Color" name="highlightedBaseColorVideo"> <label>Template highlight color</label> - <default code="true">KGlobalSettings::highlightColor()</default> + <default code="true">TDEGlobalSettings::highlightColor()</default> </entry> <entry key="Template Highlighted Text Color" type="Color" name="highlightedTextColorVideo"> <label>Template highlighted text color</label> - <default code="true">KGlobalSettings::highlightedTextColor()</default> + <default code="true">TDEGlobalSettings::highlightedTextColor()</default> </entry> </group> @@ -191,23 +191,23 @@ </entry> <entry key="Template Font" type="Font" name="fontAlbum"> <label>Template font</label> - <default code="true">KGlobalSettings::generalFont()</default> + <default code="true">TDEGlobalSettings::generalFont()</default> </entry> <entry key="Template Base Color" type="Color" name="baseColorAlbum"> <label>Template background color</label> - <default code="true">KGlobalSettings::baseColor()</default> + <default code="true">TDEGlobalSettings::baseColor()</default> </entry> <entry key="Template Text Color" type="Color" name="textColorAlbum"> <label>Template text color</label> - <default code="true">KGlobalSettings::textColor()</default> + <default code="true">TDEGlobalSettings::textColor()</default> </entry> <entry key="Template Highlight Color" type="Color" name="highlightedBaseColorAlbum"> <label>Template highlight color</label> - <default code="true">KGlobalSettings::highlightColor()</default> + <default code="true">TDEGlobalSettings::highlightColor()</default> </entry> <entry key="Template Highlighted Text Color" type="Color" name="highlightedTextColorAlbum"> <label>Template highlighted text color</label> - <default code="true">KGlobalSettings::highlightedTextColor()</default> + <default code="true">TDEGlobalSettings::highlightedTextColor()</default> </entry> </group> @@ -220,23 +220,23 @@ </entry> <entry key="Template Font" type="Font" name="fontBibtex"> <label>Template font</label> - <default code="true">KGlobalSettings::generalFont()</default> + <default code="true">TDEGlobalSettings::generalFont()</default> </entry> <entry key="Template Base Color" type="Color" name="baseColorBibtex"> <label>Template background color</label> - <default code="true">KGlobalSettings::baseColor()</default> + <default code="true">TDEGlobalSettings::baseColor()</default> </entry> <entry key="Template Text Color" type="Color" name="textColorBibtex"> <label>Template text color</label> - <default code="true">KGlobalSettings::textColor()</default> + <default code="true">TDEGlobalSettings::textColor()</default> </entry> <entry key="Template Highlight Color" type="Color" name="highlightedBaseColorBibtex"> <label>Template highlight color</label> - <default code="true">KGlobalSettings::highlightColor()</default> + <default code="true">TDEGlobalSettings::highlightColor()</default> </entry> <entry key="Template Highlighted Text Color" type="Color" name="highlightedTextColorBibtex"> <label>Template highlighted text color</label> - <default code="true">KGlobalSettings::highlightedTextColor()</default> + <default code="true">TDEGlobalSettings::highlightedTextColor()</default> </entry> </group> @@ -246,23 +246,23 @@ </entry> <entry key="Template Font" type="Font" name="fontComicBook"> <label>Template font</label> - <default code="true">KGlobalSettings::generalFont()</default> + <default code="true">TDEGlobalSettings::generalFont()</default> </entry> <entry key="Template Base Color" type="Color" name="baseColorComicBook"> <label>Template background color</label> - <default code="true">KGlobalSettings::baseColor()</default> + <default code="true">TDEGlobalSettings::baseColor()</default> </entry> <entry key="Template Text Color" type="Color" name="textColorComicBook"> <label>Template text color</label> - <default code="true">KGlobalSettings::textColor()</default> + <default code="true">TDEGlobalSettings::textColor()</default> </entry> <entry key="Template Highlight Color" type="Color" name="highlightedBaseColorComicBook"> <label>Template highlight color</label> - <default code="true">KGlobalSettings::highlightColor()</default> + <default code="true">TDEGlobalSettings::highlightColor()</default> </entry> <entry key="Template Highlighted Text Color" type="Color" name="highlightedTextColorComicBook"> <label>Template highlighted text color</label> - <default code="true">KGlobalSettings::highlightedTextColor()</default> + <default code="true">TDEGlobalSettings::highlightedTextColor()</default> </entry> </group> @@ -272,23 +272,23 @@ </entry> <entry key="Template Font" type="Font" name="fontWine"> <label>Template font</label> - <default code="true">KGlobalSettings::generalFont()</default> + <default code="true">TDEGlobalSettings::generalFont()</default> </entry> <entry key="Template Base Color" type="Color" name="baseColorWine"> <label>Template background color</label> - <default code="true">KGlobalSettings::baseColor()</default> + <default code="true">TDEGlobalSettings::baseColor()</default> </entry> <entry key="Template Text Color" type="Color" name="textColorWine"> <label>Template text color</label> - <default code="true">KGlobalSettings::textColor()</default> + <default code="true">TDEGlobalSettings::textColor()</default> </entry> <entry key="Template Highlight Color" type="Color" name="highlightedBaseColorWine"> <label>Template highlight color</label> - <default code="true">KGlobalSettings::highlightColor()</default> + <default code="true">TDEGlobalSettings::highlightColor()</default> </entry> <entry key="Template Highlighted Text Color" type="Color" name="highlightedTextColorWine"> <label>Template highlighted text color</label> - <default code="true">KGlobalSettings::highlightedTextColor()</default> + <default code="true">TDEGlobalSettings::highlightedTextColor()</default> </entry> </group> @@ -298,23 +298,23 @@ </entry> <entry key="Template Font" type="Font" name="fontCoin"> <label>Template font</label> - <default code="true">KGlobalSettings::generalFont()</default> + <default code="true">TDEGlobalSettings::generalFont()</default> </entry> <entry key="Template Base Color" type="Color" name="baseColorCoin"> <label>Template background color</label> - <default code="true">KGlobalSettings::baseColor()</default> + <default code="true">TDEGlobalSettings::baseColor()</default> </entry> <entry key="Template Text Color" type="Color" name="textColorCoin"> <label>Template text color</label> - <default code="true">KGlobalSettings::textColor()</default> + <default code="true">TDEGlobalSettings::textColor()</default> </entry> <entry key="Template Highlight Color" type="Color" name="highlightedBaseColorCoin"> <label>Template highlight color</label> - <default code="true">KGlobalSettings::highlightColor()</default> + <default code="true">TDEGlobalSettings::highlightColor()</default> </entry> <entry key="Template Highlighted Text Color" type="Color" name="highlightedTextColorCoin"> <label>Template highlighted text color</label> - <default code="true">KGlobalSettings::highlightedTextColor()</default> + <default code="true">TDEGlobalSettings::highlightedTextColor()</default> </entry> </group> @@ -324,23 +324,23 @@ </entry> <entry key="Template Font" type="Font" name="fontStamp"> <label>Template font</label> - <default code="true">KGlobalSettings::generalFont()</default> + <default code="true">TDEGlobalSettings::generalFont()</default> </entry> <entry key="Template Base Color" type="Color" name="baseColorStamp"> <label>Template background color</label> - <default code="true">KGlobalSettings::baseColor()</default> + <default code="true">TDEGlobalSettings::baseColor()</default> </entry> <entry key="Template Text Color" type="Color" name="textColorStamp"> <label>Template text color</label> - <default code="true">KGlobalSettings::textColor()</default> + <default code="true">TDEGlobalSettings::textColor()</default> </entry> <entry key="Template Highlight Color" type="Color" name="highlightedBaseColorStamp"> <label>Template highlight color</label> - <default code="true">KGlobalSettings::highlightColor()</default> + <default code="true">TDEGlobalSettings::highlightColor()</default> </entry> <entry key="Template Highlighted Text Color" type="Color" name="highlightedTextColorStamp"> <label>Template highlighted text color</label> - <default code="true">KGlobalSettings::highlightedTextColor()</default> + <default code="true">TDEGlobalSettings::highlightedTextColor()</default> </entry> </group> @@ -350,23 +350,23 @@ </entry> <entry key="Template Font" type="Font" name="fontCard"> <label>Template font</label> - <default code="true">KGlobalSettings::generalFont()</default> + <default code="true">TDEGlobalSettings::generalFont()</default> </entry> <entry key="Template Base Color" type="Color" name="baseColorCard"> <label>Template background color</label> - <default code="true">KGlobalSettings::baseColor()</default> + <default code="true">TDEGlobalSettings::baseColor()</default> </entry> <entry key="Template Text Color" type="Color" name="textColorCard"> <label>Template text color</label> - <default code="true">KGlobalSettings::textColor()</default> + <default code="true">TDEGlobalSettings::textColor()</default> </entry> <entry key="Template Highlight Color" type="Color" name="highlightedBaseColorCard"> <label>Template highlight color</label> - <default code="true">KGlobalSettings::highlightColor()</default> + <default code="true">TDEGlobalSettings::highlightColor()</default> </entry> <entry key="Template Highlighted Text Color" type="Color" name="highlightedTextColorCard"> <label>Template highlighted text color</label> - <default code="true">KGlobalSettings::highlightedTextColor()</default> + <default code="true">TDEGlobalSettings::highlightedTextColor()</default> </entry> </group> @@ -376,23 +376,23 @@ </entry> <entry key="Template Font" type="Font" name="fontGame"> <label>Template font</label> - <default code="true">KGlobalSettings::generalFont()</default> + <default code="true">TDEGlobalSettings::generalFont()</default> </entry> <entry key="Template Base Color" type="Color" name="baseColorGame"> <label>Template background color</label> - <default code="true">KGlobalSettings::baseColor()</default> + <default code="true">TDEGlobalSettings::baseColor()</default> </entry> <entry key="Template Text Color" type="Color" name="textColorGame"> <label>Template text color</label> - <default code="true">KGlobalSettings::textColor()</default> + <default code="true">TDEGlobalSettings::textColor()</default> </entry> <entry key="Template Highlight Color" type="Color" name="highlightedBaseColorGame"> <label>Template highlight color</label> - <default code="true">KGlobalSettings::highlightColor()</default> + <default code="true">TDEGlobalSettings::highlightColor()</default> </entry> <entry key="Template Highlighted Text Color" type="Color" name="highlightedTextColorGame"> <label>Template highlighted text color</label> - <default code="true">KGlobalSettings::highlightedTextColor()</default> + <default code="true">TDEGlobalSettings::highlightedTextColor()</default> </entry> </group> @@ -402,23 +402,23 @@ </entry> <entry key="Template Font" type="Font" name="fontFile"> <label>Template font</label> - <default code="true">KGlobalSettings::generalFont()</default> + <default code="true">TDEGlobalSettings::generalFont()</default> </entry> <entry key="Template Base Color" type="Color" name="baseColorFile"> <label>Template background color</label> - <default code="true">KGlobalSettings::baseColor()</default> + <default code="true">TDEGlobalSettings::baseColor()</default> </entry> <entry key="Template Text Color" type="Color" name="textColorFile"> <label>Template text color</label> - <default code="true">KGlobalSettings::textColor()</default> + <default code="true">TDEGlobalSettings::textColor()</default> </entry> <entry key="Template Highlight Color" type="Color" name="highlightedBaseColorFile"> <label>Template highlight color</label> - <default code="true">KGlobalSettings::highlightColor()</default> + <default code="true">TDEGlobalSettings::highlightColor()</default> </entry> <entry key="Template Highlighted Text Color" type="Color" name="highlightedTextColorFile"> <label>Template highlighted text color</label> - <default code="true">KGlobalSettings::highlightedTextColor()</default> + <default code="true">TDEGlobalSettings::highlightedTextColor()</default> </entry> </group> @@ -428,23 +428,23 @@ </entry> <entry key="Template Font" type="Font" name="fontBoardGame"> <label>Template font</label> - <default code="true">KGlobalSettings::generalFont()</default> + <default code="true">TDEGlobalSettings::generalFont()</default> </entry> <entry key="Template Base Color" type="Color" name="baseColorBoardGame"> <label>Template background color</label> - <default code="true">KGlobalSettings::baseColor()</default> + <default code="true">TDEGlobalSettings::baseColor()</default> </entry> <entry key="Template Text Color" type="Color" name="textColorBoardGame"> <label>Template text color</label> - <default code="true">KGlobalSettings::textColor()</default> + <default code="true">TDEGlobalSettings::textColor()</default> </entry> <entry key="Template Highlight Color" type="Color" name="highlightedBaseColorBoardGame"> <label>Template highlight color</label> - <default code="true">KGlobalSettings::highlightColor()</default> + <default code="true">TDEGlobalSettings::highlightColor()</default> </entry> <entry key="Template Highlighted Text Color" type="Color" name="highlightedTextColorBoardGame"> <label>Template highlighted text color</label> - <default code="true">KGlobalSettings::highlightedTextColor()</default> + <default code="true">TDEGlobalSettings::highlightedTextColor()</default> </entry> </group> @@ -454,23 +454,23 @@ </entry> <entry key="Template Font" type="Font" name="fontBase"> <label>Template font</label> - <default code="true">KGlobalSettings::generalFont()</default> + <default code="true">TDEGlobalSettings::generalFont()</default> </entry> <entry key="Template Base Color" type="Color" name="baseColorBase"> <label>Template background color</label> - <default code="true">KGlobalSettings::baseColor()</default> + <default code="true">TDEGlobalSettings::baseColor()</default> </entry> <entry key="Template Text Color" type="Color" name="textColorBase"> <label>Template text color</label> - <default code="true">KGlobalSettings::textColor()</default> + <default code="true">TDEGlobalSettings::textColor()</default> </entry> <entry key="Template Highlight Color" type="Color" name="highlightedBaseColorBase"> <label>Template highlight color</label> - <default code="true">KGlobalSettings::highlightColor()</default> + <default code="true">TDEGlobalSettings::highlightColor()</default> </entry> <entry key="Template Highlighted Text Color" type="Color" name="highlightedTextColorBase"> <label>Template highlighted text color</label> - <default code="true">KGlobalSettings::highlightedTextColor()</default> + <default code="true">TDEGlobalSettings::highlightedTextColor()</default> </entry> </group> diff --git a/src/entryiconview.cpp b/src/entryiconview.cpp index a067a01..5b8ea67 100644 --- a/src/entryiconview.cpp +++ b/src/entryiconview.cpp @@ -97,7 +97,7 @@ const TQPixmap& EntryIconView::defaultPixmap() { if(pix) { return *pix; } - KIconLoader* loader = KGlobal::instance()->iconLoader(); + KIconLoader* loader = TDEGlobal::instance()->iconLoader(); TQPixmap tmp = loader->loadIcon(TQString::fromLatin1("nocover_") + CollectionFactory::typeName(m_coll->type()), KIcon::User, 0, KIcon::DefaultState, 0, true /*canReturnNull */); if(tmp.isNull()) { diff --git a/src/entryupdater.cpp b/src/entryupdater.cpp index bf7bfa2..846ca73 100644 --- a/src/entryupdater.cpp +++ b/src/entryupdater.cpp @@ -213,7 +213,7 @@ Tellico::EntryUpdater::UpdateResult EntryUpdater::askUser(ResultList results) { TQHBox* hbox = new TQHBox(box); hbox->setSpacing(10); TQLabel* icon = new TQLabel(hbox); - icon->setPixmap(KGlobal::iconLoader()->loadIcon(TQString::fromLatin1("network"), KIcon::Panel, 64)); + icon->setPixmap(TDEGlobal::iconLoader()->loadIcon(TQString::fromLatin1("network"), KIcon::Panel, 64)); TQString s = i18n("<qt><b>%1</b> returned multiple results which could match <b>%2</b>, " "the entry currently in the collection. Please select the correct match.</qt>") .arg(m_fetchers[m_fetchIndex]->source()) diff --git a/src/entryview.cpp b/src/entryview.cpp index 3499adc..93539cb 100644 --- a/src/entryview.cpp +++ b/src/entryview.cpp @@ -244,7 +244,7 @@ void EntryView::setXSLTFile(const TQString& file_) { } // look for a file that gets installed to know the installation directory - TQString appdir = KGlobal::dirs()->findResourceDir("appdata", TQString::fromLatin1("pics/tellico.png")); + TQString appdir = TDEGlobal::dirs()->findResourceDir("appdata", TQString::fromLatin1("pics/tellico.png")); m_handler->addStringParam("datadir", TQFile::encodeName(appdir)); // if we don't have to reload the images, then just show the entry and we're done diff --git a/src/exportdialog.cpp b/src/exportdialog.cpp index 954f4be..f2d80a0 100644 --- a/src/exportdialog.cpp +++ b/src/exportdialog.cpp @@ -101,7 +101,7 @@ TQString ExportDialog::fileFilter() { } void ExportDialog::readOptions() { - KConfigGroup config(KGlobal::config(), "ExportOptions"); + KConfigGroup config(TDEGlobal::config(), "ExportOptions"); bool format = config.readBoolEntry("FormatFields", false); m_formatFields->setChecked(format); bool selected = config.readBoolEntry("ExportSelectedOnly", false); @@ -115,7 +115,7 @@ void ExportDialog::readOptions() { } void ExportDialog::slotSaveOptions() { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); // each exporter sets its own group m_exporter->saveOptions(config); @@ -189,7 +189,7 @@ Tellico::Export::Exporter* ExportDialog::exporter(Export::Format format_) { break; } if(exporter) { - exporter->readOptions(KGlobal::config()); + exporter->readOptions(TDEGlobal::config()); } return exporter; } @@ -244,7 +244,7 @@ bool ExportDialog::exportCollection(Export::Format format_, const KURL& url_) { exp->setURL(url_); exp->setEntries(Data::Document::self()->collection()->entries()); - KConfigGroup config(KGlobal::config(), "ExportOptions"); + KConfigGroup config(TDEGlobal::config(), "ExportOptions"); long options = 0; if(config.readBoolEntry("FormatFields", false)) { options |= Export::ExportFormatted; diff --git a/src/fetch/execexternalfetcher.cpp b/src/fetch/execexternalfetcher.cpp index aecdb49..1ba084f 100644 --- a/src/fetch/execexternalfetcher.cpp +++ b/src/fetch/execexternalfetcher.cpp @@ -129,7 +129,7 @@ void ExecExternalFetcher::search(FetchKey key_, const TQString& value_) { return; } - // should KProcess::quote() be used? + // should TDEProcess::quote() be used? // %1 gets replaced by the search value, but since the arguments are going to be split // the search value needs to be enclosed in quotation marks // but first check to make sure the user didn't do that already @@ -162,12 +162,12 @@ void ExecExternalFetcher::startSearch(const TQStringList& args_) { } #endif - m_process = new KProcess(); - connect(m_process, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), TQT_SLOT(slotData(KProcess*, char*, int))); - connect(m_process, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), TQT_SLOT(slotError(KProcess*, char*, int))); - connect(m_process, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*))); + m_process = new TDEProcess(); + connect(m_process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), TQT_SLOT(slotData(TDEProcess*, char*, int))); + connect(m_process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQT_SLOT(slotError(TDEProcess*, char*, int))); + connect(m_process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); *m_process << m_path << args_; - if(!m_process->start(KProcess::NotifyOnExit, KProcess::AllOutput)) { + if(!m_process->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput)) { myDebug() << "ExecExternalFetcher::startSearch() - process failed to start" << endl; stop(); } @@ -188,12 +188,12 @@ void ExecExternalFetcher::stop() { emit signalDone(this); } -void ExecExternalFetcher::slotData(KProcess*, char* buffer_, int len_) { +void ExecExternalFetcher::slotData(TDEProcess*, char* buffer_, int len_) { TQDataStream stream(m_data, IO_WriteOnly | IO_Append); stream.writeRawBytes(buffer_, len_); } -void ExecExternalFetcher::slotError(KProcess*, char* buffer_, int len_) { +void ExecExternalFetcher::slotError(TDEProcess*, char* buffer_, int len_) { GUI::CursorSaver cs(TQt::arrowCursor); TQString msg = TQString::fromLocal8Bit(buffer_, len_); msg.prepend(source() + TQString::fromLatin1(": ")); @@ -204,7 +204,7 @@ void ExecExternalFetcher::slotError(KProcess*, char* buffer_, int len_) { m_errors << msg; } -void ExecExternalFetcher::slotProcessExited(KProcess*) { +void ExecExternalFetcher::slotProcessExited(TDEProcess*) { // myDebug() << "ExecExternalFetcher::slotProcessExited()" << endl; if(!m_process->normalExit() || m_process->exitStatus()) { myDebug() << "ExecExternalFetcher::slotProcessExited() - "<< source() << ": process did not exit successfully" << endl; diff --git a/src/fetch/execexternalfetcher.h b/src/fetch/execexternalfetcher.h index ec836d7..c81a27d 100644 --- a/src/fetch/execexternalfetcher.h +++ b/src/fetch/execexternalfetcher.h @@ -20,7 +20,7 @@ #include <tqintdict.h> -class KProcess; +class TDEProcess; class KURLRequester; class KLineEdit; class KComboBox; @@ -89,9 +89,9 @@ public: static TQString defaultName(); private slots: - void slotData(KProcess* proc, char* buffer, int len); - void slotError(KProcess* proc, char* buffer, int len); - void slotProcessExited(KProcess* proc); + void slotData(TDEProcess* proc, char* buffer, int len); + void slotError(TDEProcess* proc, char* buffer, int len); + void slotProcessExited(TDEProcess* proc); private: static TQStringList parseArguments(const TQString& str); @@ -105,7 +105,7 @@ private: TQMap<FetchKey, TQString> m_args; bool m_canUpdate : 1; TQString m_updateArgs; - KProcess* m_process; + TDEProcess* m_process; TQByteArray m_data; TQMap<int, Data::EntryPtr> m_entries; // map from search result id to entry TQStringList m_errors; diff --git a/src/fetch/fetcher.cpp b/src/fetch/fetcher.cpp index 712ea96..1996b96 100644 --- a/src/fetch/fetcher.cpp +++ b/src/fetch/fetcher.cpp @@ -22,7 +22,7 @@ using Tellico::Fetch::Fetcher; using Tellico::Fetch::SearchResult; Fetcher::~Fetcher() { - KConfigGroup config(KGlobal::config(), m_configGroup); + KConfigGroup config(TDEGlobal::config(), m_configGroup); saveConfigHook(config); } diff --git a/src/fetch/fetchmanager.cpp b/src/fetch/fetchmanager.cpp index 4a64052..7888987 100644 --- a/src/fetch/fetchmanager.cpp +++ b/src/fetch/fetchmanager.cpp @@ -60,7 +60,7 @@ #include <tqdir.h> #define LOAD_ICON(name, group, size) \ - KGlobal::iconLoader()->loadIcon(name, static_cast<KIcon::Group>(group), size_) + TDEGlobal::iconLoader()->loadIcon(name, static_cast<KIcon::Group>(group), size_) using Tellico::Fetch::Manager; Manager* Manager::s_self = 0; @@ -93,7 +93,7 @@ void Manager::loadFetchers() { m_fetchers.clear(); m_configMap.clear(); - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); if(config->hasGroup(TQString::fromLatin1("Data Sources"))) { KConfigGroup configGroup(config, TQString::fromLatin1("Data Sources")); int nSources = configGroup.readNumEntry("Sources Count", 0); @@ -359,7 +359,7 @@ Tellico::Fetch::FetcherVec Manager::defaultFetchers() { vec.append(new GoogleScholarFetcher(this)); vec.append(new DiscogsFetcher(this)); // only add IBS if user includes italian - if(KGlobal::locale()->languagesTwoAlpha().contains(TQString::fromLatin1("it"))) { + if(TDEGlobal::locale()->languagesTwoAlpha().contains(TQString::fromLatin1("it"))) { vec.append(new IBSFetcher(this)); } return vec; @@ -371,12 +371,12 @@ Tellico::Fetch::FetcherVec Manager::createUpdateFetchers(int collType_) { } FetcherVec vec; - KConfigGroup config(KGlobal::config(), "Data Sources"); + KConfigGroup config(TDEGlobal::config(), "Data Sources"); int nSources = config.readNumEntry("Sources Count", 0); for(int i = 0; i < nSources; ++i) { TQString group = TQString::fromLatin1("Data Source %1").arg(i); // needs the KConfig* - Fetcher::Ptr f = createFetcher(KGlobal::config(), group); + Fetcher::Ptr f = createFetcher(TDEGlobal::config(), group); if(f && f->canFetch(collType_) && f->canUpdate()) { vec.append(f); } @@ -440,7 +440,7 @@ Tellico::Fetch::TypePairList Manager::typeList() { list.append(TypePair(DiscogsFetcher::defaultName(), Discogs)); // now find all the scripts distributed with tellico - TQStringList files = KGlobal::dirs()->findAllResources("appdata", TQString::fromLatin1("data-sources/*.spec"), + TQStringList files = TDEGlobal::dirs()->findAllResources("appdata", TQString::fromLatin1("data-sources/*.spec"), false, true); for(TQStringList::Iterator it = files.begin(); it != files.end(); ++it) { KConfig spec(*it, false, false); diff --git a/src/fetch/gcstarpluginfetcher.cpp b/src/fetch/gcstarpluginfetcher.cpp index d28d4fc..7b363ce 100644 --- a/src/fetch/gcstarpluginfetcher.cpp +++ b/src/fetch/gcstarpluginfetcher.cpp @@ -51,7 +51,7 @@ GCstarPluginFetcher::PluginList GCstarPluginFetcher::plugins(int collType_) { KProcIO proc; proc << gcstar << TQString::fromLatin1("--version"); // wait 5 seconds at most, just a sanity thing, never want to block completely - if(proc.start(KProcess::Block) && proc.wait(5)) { + if(proc.start(TDEProcess::Block) && proc.wait(5)) { TQString output; proc.readln(output); if(!output.isEmpty()) { @@ -98,7 +98,7 @@ void GCstarPluginFetcher::readPluginsNew(int collType_, const TQString& gcstar_) << TQString::fromLatin1("--list-plugins") << TQString::fromLatin1("--collection") << gcstarCollection; - if(!proc.start(KProcess::Block)) { + if(!proc.start(TDEProcess::Block)) { myWarning() << "GCstarPluginFetcher::readPluginsNew() - can't start" << endl; return; } @@ -228,19 +228,19 @@ void GCstarPluginFetcher::search(FetchKey key_, const TQString& value_) { return; } - m_process = new KProcess(); - connect(m_process, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), TQT_SLOT(slotData(KProcess*, char*, int))); - connect(m_process, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), TQT_SLOT(slotError(KProcess*, char*, int))); - connect(m_process, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*))); + m_process = new TDEProcess(); + connect(m_process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), TQT_SLOT(slotData(TDEProcess*, char*, int))); + connect(m_process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQT_SLOT(slotError(TDEProcess*, char*, int))); + connect(m_process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); TQStringList args; args << gcstar << TQString::fromLatin1("-x") << TQString::fromLatin1("--collection") << gcstarCollection << TQString::fromLatin1("--export") << TQString::fromLatin1("Tellico") << TQString::fromLatin1("--website") << m_plugin - << TQString::fromLatin1("--download") << KProcess::quote(value_); + << TQString::fromLatin1("--download") << TDEProcess::quote(value_); myLog() << "GCstarPluginFetcher::search() - " << args.join(TQChar(' ')) << endl; *m_process << args; - if(!m_process->start(KProcess::NotifyOnExit, KProcess::AllOutput)) { + if(!m_process->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput)) { myDebug() << "GCstarPluginFetcher::startSearch() - process failed to start" << endl; stop(); } @@ -261,19 +261,19 @@ void GCstarPluginFetcher::stop() { emit signalDone(this); } -void GCstarPluginFetcher::slotData(KProcess*, char* buffer_, int len_) { +void GCstarPluginFetcher::slotData(TDEProcess*, char* buffer_, int len_) { TQDataStream stream(m_data, IO_WriteOnly | IO_Append); stream.writeRawBytes(buffer_, len_); } -void GCstarPluginFetcher::slotError(KProcess*, char* buffer_, int len_) { +void GCstarPluginFetcher::slotError(TDEProcess*, char* buffer_, int len_) { TQString msg = TQString::fromLocal8Bit(buffer_, len_); msg.prepend(source() + TQString::fromLatin1(": ")); myDebug() << "GCstarPluginFetcher::slotError() - " << msg << endl; m_errors << msg; } -void GCstarPluginFetcher::slotProcessExited(KProcess*) { +void GCstarPluginFetcher::slotProcessExited(TDEProcess*) { // myDebug() << "GCstarPluginFetcher::slotProcessExited()" << endl; if(!m_process->normalExit() || m_process->exitStatus()) { myDebug() << "GCstarPluginFetcher::slotProcessExited() - "<< source() << ": process did not exit successfully" << endl; diff --git a/src/fetch/gcstarpluginfetcher.h b/src/fetch/gcstarpluginfetcher.h index 534a274..65c33c0 100644 --- a/src/fetch/gcstarpluginfetcher.h +++ b/src/fetch/gcstarpluginfetcher.h @@ -21,7 +21,7 @@ #include <tqintdict.h> class TQLabel; -class KProcess; +class TDEProcess; namespace Tellico { namespace GUI { @@ -63,9 +63,9 @@ public: static TQString defaultName(); private slots: - void slotData(KProcess* proc, char* buffer, int len); - void slotError(KProcess* proc, char* buffer, int len); - void slotProcessExited(KProcess* proc); + void slotData(TDEProcess* proc, char* buffer, int len); + void slotError(TDEProcess* proc, char* buffer, int len); + void slotProcessExited(TDEProcess* proc); private: // map Author, Name, Lang, etc... @@ -85,7 +85,7 @@ private: bool m_started; int m_collType; TQString m_plugin; - KProcess* m_process; + TDEProcess* m_process; TQByteArray m_data; TQMap<int, Data::EntryPtr> m_entries; // map from search result id to entry TQStringList m_errors; diff --git a/src/fetch/z3950fetcher.cpp b/src/fetch/z3950fetcher.cpp index 7b6ac24..9083c17 100644 --- a/src/fetch/z3950fetcher.cpp +++ b/src/fetch/z3950fetcher.cpp @@ -720,11 +720,11 @@ void Z3950Fetcher::ConfigWidget::slotPresetChanged() { } void Z3950Fetcher::ConfigWidget::loadPresets(const TQString& current_) { - TQString lang = KGlobal::locale()->languageList().first(); + TQString lang = TDEGlobal::locale()->languageList().first(); TQString lang2A; { TQString dummy; - KGlobal::locale()->splitLocale(lang, lang2A, dummy, dummy); + TDEGlobal::locale()->splitLocale(lang, lang2A, dummy, dummy); } TQString serverFile = locate("appdata", TQString::fromLatin1("z3950-servers.cfg")); diff --git a/src/fetchdialog.cpp b/src/fetchdialog.cpp index 300bd5a..5b7222d 100644 --- a/src/fetchdialog.cpp +++ b/src/fetchdialog.cpp @@ -407,7 +407,7 @@ void FetchDialog::slotFetchDone(bool checkISBN /* = true */) { TQVBoxLayout* lay = new TQVBoxLayout(box, KDialog::marginHint(), KDialog::spacingHint()*2); TQHBoxLayout* lay2 = new TQHBoxLayout(lay); TQLabel* lab = new TQLabel(box); - lab->setPixmap(KGlobal::iconLoader()->loadIcon(TQString::fromLatin1("messagebox_info"), + lab->setPixmap(TDEGlobal::iconLoader()->loadIcon(TQString::fromLatin1("messagebox_info"), KIcon::NoGroup, KIcon::SizeMedium)); lay2->addWidget(lab); diff --git a/src/fetcherconfigdialog.cpp b/src/fetcherconfigdialog.cpp index 9fa5c53..b92ff15 100644 --- a/src/fetcherconfigdialog.cpp +++ b/src/fetcherconfigdialog.cpp @@ -66,7 +66,7 @@ void FetcherConfigDialog::init(Fetch::Type type_) { TQBoxLayout* vlay1 = new TQVBoxLayout(topLayout, KDialog::spacingHint()); m_iconLabel = new TQLabel(widget); if(type_ == Fetch::Unknown) { - m_iconLabel->setPixmap(KGlobal::iconLoader()->loadIcon(TQString::fromLatin1("network"), KIcon::Panel, 64)); + m_iconLabel->setPixmap(TDEGlobal::iconLoader()->loadIcon(TQString::fromLatin1("network"), KIcon::Panel, 64)); } else { m_iconLabel->setPixmap(Fetch::Manager::self()->fetcherIcon(type_, KIcon::Panel, 64)); } diff --git a/src/field.cpp b/src/field.cpp index 0e9b809..858abfd 100644 --- a/src/field.cpp +++ b/src/field.cpp @@ -387,7 +387,7 @@ TQString Field::formatDate(const TQString& date_) { // rather use ISO date formatting than locale formatting for now. Primarily, it makes sorting just work. return empty ? date_ : TQString(TQDate(y, m, d).toString(Qt::ISODate)); // use short form -// return KGlobal::locale()->formatDate(date, true); +// return TDEGlobal::locale()->formatDate(date, true); } TQString Field::capitalize(TQString str_) { diff --git a/src/fieldcompletion.cpp b/src/fieldcompletion.cpp index ecd208f..e05f539 100644 --- a/src/fieldcompletion.cpp +++ b/src/fieldcompletion.cpp @@ -20,7 +20,7 @@ FieldCompletion::FieldCompletion(bool multiple_) : KCompletion(), m_multiple(mul } TQString FieldCompletion::makeCompletion(const TQString& string_) { - if(completionMode() == KGlobalSettings::CompletionNone) { + if(completionMode() == TDEGlobalSettings::CompletionNone) { m_beginText.truncate(0); return TQString(); } diff --git a/src/gui/datewidget.cpp b/src/gui/datewidget.cpp index 7c9345a..375f825 100644 --- a/src/gui/datewidget.cpp +++ b/src/gui/datewidget.cpp @@ -43,7 +43,7 @@ SpinBox::SpinBox(int min, int max, TQWidget *parent) : TQSpinBox(min, max, 1, pa DateWidget::DateWidget(TQWidget* parent_, const char* name_) : TQWidget(parent_, name_) { TQHBoxLayout* l = new TQHBoxLayout(this, 0, 4); - KLocale* locale = KGlobal::locale(); + KLocale* locale = TDEGlobal::locale(); // 0 allows empty value m_daySpin = new SpinBox(0, 31, this); @@ -151,7 +151,7 @@ void DateWidget::setDate(const TQDate& date_) { m_monthCombo->blockSignals(true); m_yearSpin->blockSignals(true); - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); m_daySpin->setMaxValue(calendar->daysInMonth(date_)); m_daySpin->setValue(calendar->day(date_)); m_monthCombo->setCurrentItem(calendar->month(date_)); // don't subtract 1 since there's the blank first item @@ -189,7 +189,7 @@ void DateWidget::setDate(const TQString& date_) { // for now set date to 1 TQDate date(y, (m == 0 ? 1 : m), 1); m_daySpin->blockSignals(true); - m_daySpin->setMaxValue(KGlobal::locale()->calendar()->daysInMonth(date)); + m_daySpin->setMaxValue(TDEGlobal::locale()->calendar()->daysInMonth(date)); m_daySpin->blockSignals(false); int day = s.count() > 2 ? s[2].toInt(&ok) : m_daySpin->minValue(); @@ -230,7 +230,7 @@ void DateWidget::clear() { } void DateWidget::slotShowPicker() { - TQRect desk = KGlobalSettings::desktopGeometry(this); + TQRect desk = TDEGlobalSettings::desktopGeometry(this); TQPoint popupPoint = mapToGlobal(TQPoint(0, 0)); int dateFrameHeight = m_frame->sizeHint().height(); diff --git a/src/importdialog.cpp b/src/importdialog.cpp index 09e3a58..928c53f 100644 --- a/src/importdialog.cpp +++ b/src/importdialog.cpp @@ -81,7 +81,7 @@ ImportDialog::ImportDialog(Import::Format format_, const KURL::List& urls_, TQWi } TQWidget* w = m_importer->widget(widget, "importer_widget"); -// m_importer->readOptions(KGlobal::config()); +// m_importer->readOptions(TDEGlobal::config()); if(w) { topLayout->addWidget(w, 0); } diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 0f6ccd3..b5e2a4b 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -776,7 +776,7 @@ void MainWindow::initDocument() { MARK; Data::Document* doc = Data::Document::self(); - KConfigGroup config(KGlobal::config(), "General Options"); + KConfigGroup config(TDEGlobal::config(), "General Options"); doc->setLoadAllImages(config.readBoolEntry("Load All Images", false)); // allow status messages from the document @@ -884,13 +884,13 @@ void MainWindow::initFileOpen(bool nofile_) { void MainWindow::saveOptions() { // myDebug() << "MainWindow::saveOptions()" << endl; - saveMainWindowSettings(KGlobal::config(), TQString::fromLatin1("Main Window Options")); + saveMainWindowSettings(TDEGlobal::config(), TQString::fromLatin1("Main Window Options")); Config::setShowGroupWidget(m_toggleGroupWidget->isChecked()); Config::setShowEditWidget(m_toggleEntryEditor->isChecked()); Config::setShowEntryView(m_toggleEntryView->isChecked()); - m_fileOpenRecent->saveEntries(KGlobal::config(), TQString::fromLatin1("Recent Files")); + m_fileOpenRecent->saveEntries(TDEGlobal::config(), TQString::fromLatin1("Recent Files")); if(!isNewDocument()) { Config::setLastOpenFile(Data::Document::self()->URL().url()); } @@ -924,7 +924,7 @@ void MainWindow::saveOptions() { } void MainWindow::readCollectionOptions(Data::CollPtr coll_) { - KConfigGroup group(KGlobal::config(), TQString::fromLatin1("Options - %1").arg(coll_->typeName())); + KConfigGroup group(TDEGlobal::config(), TQString::fromLatin1("Options - %1").arg(coll_->typeName())); TQString defaultGroup = coll_->defaultGroupField(); TQString entryGroup; @@ -966,7 +966,7 @@ void MainWindow::saveCollectionOptions(Data::CollPtr coll_) { } int configIndex = -1; - KConfigGroup config(KGlobal::config(), TQString::fromLatin1("Options - %1").arg(coll_->typeName())); + KConfigGroup config(TDEGlobal::config(), TQString::fromLatin1("Options - %1").arg(coll_->typeName())); TQString groupName; if(m_entryGrouping->currentItem() > -1 && static_cast<int>(coll_->entryGroups().count()) > m_entryGrouping->currentItem()) { @@ -1003,7 +1003,7 @@ void MainWindow::saveCollectionOptions(Data::CollPtr coll_) { void MainWindow::readOptions() { // myDebug() << "MainWindow::readOptions()" << endl; - applyMainWindowSettings(KGlobal::config(), TQString::fromLatin1("Main Window Options")); + applyMainWindowSettings(TDEGlobal::config(), TQString::fromLatin1("Main Window Options")); TQValueList<int> splitList = Config::mainSplitterSizes(); if(!splitList.empty()) { @@ -1026,7 +1026,7 @@ void MainWindow::readOptions() { slotToggleEntryView(); // initialize the recent file list - m_fileOpenRecent->loadEntries(KGlobal::config(), TQString::fromLatin1("Recent Files")); + m_fileOpenRecent->loadEntries(TDEGlobal::config(), TQString::fromLatin1("Recent Files")); // sort by count if column = 1 int sortStyle = Config::groupViewSortColumn(); @@ -1443,7 +1443,7 @@ void MainWindow::slotEditDeselect() { } void MainWindow::slotConfigToolbar() { - saveMainWindowSettings(KGlobal::config(), TQString::fromLatin1("Main Window Options")); + saveMainWindowSettings(TDEGlobal::config(), TQString::fromLatin1("Main Window Options")); #ifdef UIFILE KEditToolbar dlg(actionCollection(), UIFILE); #else @@ -1454,7 +1454,7 @@ void MainWindow::slotConfigToolbar() { } void MainWindow::slotNewToolbarConfig() { - applyMainWindowSettings(KGlobal::config(), TQString::fromLatin1("Main Window Options")); + applyMainWindowSettings(TDEGlobal::config(), TQString::fromLatin1("Main Window Options")); #ifdef UIFILE createGUI(UIFILE, false); #else @@ -1722,7 +1722,7 @@ void MainWindow::doPrint(const TQString& html_) { p->begin(printer); // mostly taken from KHTMLView::print() - TQString headerLeft = KGlobal::locale()->formatDate(TQDate::currentDate(), false); + TQString headerLeft = TDEGlobal::locale()->formatDate(TQDate::currentDate(), false); TQString headerRight = Data::Document::self()->URL().prettyURL(); TQString footerMid; diff --git a/src/newstuff/dialog.cpp b/src/newstuff/dialog.cpp index 000e782..31e41db 100644 --- a/src/newstuff/dialog.cpp +++ b/src/newstuff/dialog.cpp @@ -79,7 +79,7 @@ public: return s; } else if(col == 4) { TQString s; - TQDate date = KGlobal::locale()->readDate(text(col)); + TQDate date = TDEGlobal::locale()->readDate(text(col)); s.sprintf("%08d", date.year() * 366 + date.dayOfYear()); return s; } @@ -99,7 +99,7 @@ Dialog::Dialog(NewStuff::DataType type_, TQWidget* parent_) , m_tempPreviewImage(0) , m_lastPreviewItem(0) { - m_lang = KGlobal::locale()->language(); + m_lang = TDEGlobal::locale()->language(); TQFrame* frame = plainPage(); TQBoxLayout* boxLayout = new TQVBoxLayout(frame, 0, KDialog::spacingHint()); @@ -215,7 +215,7 @@ Dialog::Dialog(NewStuff::DataType type_, TQWidget* parent_) setMinimumHeight(TQMAX(minimumHeight(), NEW_STUFF_MIN_HEIGHT)); resize(configDialogSize(TQString::fromLatin1("NewStuff Dialog Options"))); - KConfigGroup dialogConfig(KGlobal::config(), "NewStuff Dialog Options"); + KConfigGroup dialogConfig(TDEGlobal::config(), "NewStuff Dialog Options"); TQValueList<int> splitList = dialogConfig.readIntListEntry("Splitter Sizes"); if(!splitList.empty()) { m_split->setSizes(splitList); @@ -228,7 +228,7 @@ Dialog::Dialog(NewStuff::DataType type_, TQWidget* parent_) connect(loader, TQT_SIGNAL(percent(KIO::Job*, unsigned long)), TQT_SLOT(slotShowPercent(KIO::Job*, unsigned long))); connect(loader, TQT_SIGNAL(error()), TQT_SLOT(slotProviderError())); - KConfigGroup config(KGlobal::config(), "KNewStuff"); + KConfigGroup config(TDEGlobal::config(), "KNewStuff"); TQString prov = config.readEntry("ProvidersUrl"); if(prov.isEmpty()) { if(m_type == EntryTemplate) { @@ -254,7 +254,7 @@ Dialog::~Dialog() { m_cursorSaver = 0; saveDialogSize(TQString::fromLatin1("NewStuff Dialog Options")); - KConfigGroup config(KGlobal::config(), "NewStuff Dialog Options"); + KConfigGroup config(TDEGlobal::config(), "NewStuff Dialog Options"); config.writeEntry("Splitter Sizes", m_split->sizes()); } @@ -337,7 +337,7 @@ void Dialog::addEntry(KNS::Entry* entry_) { item->setText(1, entry_->version()); item->setText(2, TQString::number(entry_->rating())); item->setText(3, TQString::number(entry_->downloads())); - item->setText(4, KGlobal::locale()->formatDate(entry_->releaseDate(), true /*short format */)); + item->setText(4, TDEGlobal::locale()->formatDate(entry_->releaseDate(), true /*short format */)); item->setStatus(NewStuff::Manager::installStatus(entry_)); m_entryMap.insert(item, entry_); diff --git a/src/newstuff/manager.cpp b/src/newstuff/manager.cpp index 7011e9c..8eabc7d 100644 --- a/src/newstuff/manager.cpp +++ b/src/newstuff/manager.cpp @@ -94,7 +94,7 @@ bool Manager::installTemplate(const KURL& url_, const TQString& entryName_) { } else { // remove ".xsl" xslFile.truncate(xslFile.length()-4); - KConfigGroup config(KGlobal::config(), "KNewStuffFiles"); + KConfigGroup config(TDEGlobal::config(), "KNewStuffFiles"); config.writeEntry(xslFile, allFiles); m_urlNameMap.insert(url_, xslFile); } @@ -106,7 +106,7 @@ bool Manager::installTemplate(const KURL& url_, const TQString& entryName_) { } bool Manager::removeTemplate(const TQString& name_) { - KConfigGroup fileGroup(KGlobal::config(), "KNewStuffFiles"); + KConfigGroup fileGroup(TDEGlobal::config(), "KNewStuffFiles"); TQStringList files = fileGroup.readListEntry(name_); // at least, delete xsl file if(files.isEmpty()) { @@ -130,7 +130,7 @@ bool Manager::removeTemplate(const TQString& name_) { // remove config entries even if unsuccessful fileGroup.deleteEntry(name_); - KConfigGroup statusGroup(KGlobal::config(), "KNewStuffStatus"); + KConfigGroup statusGroup(TDEGlobal::config(), "KNewStuffStatus"); TQString entryName = statusGroup.readEntry(name_); statusGroup.deleteEntry(name_); statusGroup.deleteEntry(entryName); @@ -209,7 +209,7 @@ bool Manager::installScript(const KURL& url_) { } { - KConfigGroup config(KGlobal::config(), "KNewStuffFiles"); + KConfigGroup config(TDEGlobal::config(), "KNewStuffFiles"); config.writeEntry(info->sourceName, archiveFiles(archiveDir)); m_urlNameMap.insert(url_, info->sourceName); } @@ -225,7 +225,7 @@ bool Manager::installScript(const KURL& url_) { } bool Manager::removeScript(const TQString& name_) { - KConfigGroup fileGroup(KGlobal::config(), "KNewStuffFiles"); + KConfigGroup fileGroup(TDEGlobal::config(), "KNewStuffFiles"); TQStringList files = fileGroup.readListEntry(name_); bool success = true; @@ -244,7 +244,7 @@ bool Manager::removeScript(const TQString& name_) { // remove config entries even if unsuccessful fileGroup.deleteEntry(name_); - KConfigGroup statusGroup(KGlobal::config(), "KNewStuffStatus"); + KConfigGroup statusGroup(TDEGlobal::config(), "KNewStuffStatus"); TQString entryName = statusGroup.readEntry(name_); statusGroup.deleteEntry(name_); statusGroup.deleteEntry(entryName); @@ -253,7 +253,7 @@ bool Manager::removeScript(const TQString& name_) { } Tellico::NewStuff::InstallStatus Manager::installStatus(KNS::Entry* entry_) { - KConfigGroup config(KGlobal::config(), "KNewStuffStatus"); + KConfigGroup config(TDEGlobal::config(), "KNewStuffStatus"); TQString datestring = config.readEntry(entry_->name()); if(datestring.isEmpty()) { return NotInstalled; @@ -268,7 +268,7 @@ Tellico::NewStuff::InstallStatus Manager::installStatus(KNS::Entry* entry_) { } // also check that executable files exists - KConfigGroup fileGroup(KGlobal::config(), "KNewStuffFiles"); + KConfigGroup fileGroup(TDEGlobal::config(), "KNewStuffFiles"); TQStringList files = fileGroup.readListEntry(entry_->name()); TQString path = Tellico::saveLocation(TQString::fromLatin1("data-sources/")); for(TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it) { @@ -394,7 +394,7 @@ void Manager::slotInstallFinished() { if(newScript && newScript->successfulInstall()) { const TQString name = m_urlNameMap[newScript->url()]; KNS::Entry* entry = m_scriptEntryMap[newScript]; - KConfigGroup config(KGlobal::config(), "KNewStuffStatus"); + KConfigGroup config(TDEGlobal::config(), "KNewStuffStatus"); // have to keep a config entry that maps the name of the file to the name // of the newstuff entry, so we can track which entries are installed // name and entry-name() are probably the same for scripts, but not a problem @@ -418,7 +418,7 @@ bool Manager::checkCommonFile() { if(TQFile::exists(userCommonFile)) { // check timestamps // pics/tellico.png is not likely to be in a user directory - TQString installDir = KGlobal::dirs()->findResourceDir("appdata", TQString::fromLatin1("pics/tellico.png")); + TQString installDir = TDEGlobal::dirs()->findResourceDir("appdata", TQString::fromLatin1("pics/tellico.png")); TQString installCommonFile = installDir + '/' + TQString::fromLatin1("tellico-common.xsl"); #ifndef NDEBUG if(userCommonFile == installCommonFile) { @@ -438,7 +438,7 @@ bool Manager::checkCommonFile() { } } KURL src, dest; - src.setPath(KGlobal::dirs()->findResource("appdata", TQString::fromLatin1("tellico-common.xsl"))); + src.setPath(TDEGlobal::dirs()->findResource("appdata", TQString::fromLatin1("tellico-common.xsl"))); dest.setPath(userCommonFile); return KIO::NetAccess::file_copy(src, dest); } diff --git a/src/newstuff/providerloader.h b/src/newstuff/providerloader.h index 60b174a..a3dfed1 100644 --- a/src/newstuff/providerloader.h +++ b/src/newstuff/providerloader.h @@ -51,7 +51,7 @@ public: * * @param type data type such as 'kdesktop/wallpaper'. * @param providerList the URl to the list of providers; if empty - * we first try the ProvidersUrl from KGlobal::config, then we + * we first try the ProvidersUrl from TDEGlobal::config, then we * fall back to a hardcoded value. */ void load( const TQString &type, const TQString &providerList = TQString() ); diff --git a/src/reportdialog.cpp b/src/reportdialog.cpp index 3267a39..0600950 100644 --- a/src/reportdialog.cpp +++ b/src/reportdialog.cpp @@ -61,7 +61,7 @@ ReportDialog::ReportDialog(TQWidget* parent_, const char* name_/*=0*/) hlay->addWidget(l); // KStandardDirs::findAllResources(const char *type, const TQString &filter, bool recursive, bool uniq) - TQStringList files = KGlobal::dirs()->findAllResources("appdata", TQString::fromLatin1("report-templates/*.xsl"), + TQStringList files = TDEGlobal::dirs()->findAllResources("appdata", TQString::fromLatin1("report-templates/*.xsl"), false, true); KSortableValueList<TQString, TQString> templates; for(TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it) { @@ -195,7 +195,7 @@ void ReportDialog::slotSaveAs() { TQString filter = i18n("*.html|HTML Files (*.html)") + TQChar('\n') + i18n("*|All Files"); KURL u = KFileDialog::getSaveURL(TQString(), filter, this); if(!u.isEmpty() && u.isValid()) { - KConfigGroup config(KGlobal::config(), "ExportOptions"); + KConfigGroup config(TDEGlobal::config(), "ExportOptions"); bool encode = config.readBoolEntry("EncodeUTF8", true); int oldOpt = m_exporter->options(); diff --git a/src/tellico_utils.cpp b/src/tellico_utils.cpp index 275c096..15920a7 100644 --- a/src/tellico_utils.cpp +++ b/src/tellico_utils.cpp @@ -199,7 +199,7 @@ TQString Tellico::minutes(int seconds) { } TQString Tellico::saveLocation(const TQString& dir_) { - return KGlobal::dirs()->saveLocation("appdata", dir_, true); + return TDEGlobal::dirs()->saveLocation("appdata", dir_, true); } Tellico::GUI::CursorSaver::CursorSaver(const TQCursor& cursor_) : m_restored(false) { diff --git a/src/translators/csvimporter.cpp b/src/translators/csvimporter.cpp index 68e4789..ca3e7aa 100644 --- a/src/translators/csvimporter.cpp +++ b/src/translators/csvimporter.cpp @@ -202,7 +202,7 @@ Tellico::Data::CollPtr CSVImporter::collection() { } { - KConfigGroup config(KGlobal::config(), TQString::fromLatin1("ImportOptions - CSV")); + KConfigGroup config(TDEGlobal::config(), TQString::fromLatin1("ImportOptions - CSV")); config.writeEntry("Delimiter", m_delimiter); config.writeEntry("First Row Titles", m_firstRowHeader); } @@ -320,7 +320,7 @@ TQWidget* CSVImporter::widget(TQWidget* parent_, const char* name_) { l->addStretch(1); - KConfigGroup config(KGlobal::config(), TQString::fromLatin1("ImportOptions - CSV")); + KConfigGroup config(TDEGlobal::config(), TQString::fromLatin1("ImportOptions - CSV")); m_delimiter = config.readEntry("Delimiter", m_delimiter); m_firstRowHeader = config.readBoolEntry("First Row Titles", m_firstRowHeader); diff --git a/src/translators/freedbimporter.cpp b/src/translators/freedbimporter.cpp index 9ee128f..480bf07 100644 --- a/src/translators/freedbimporter.cpp +++ b/src/translators/freedbimporter.cpp @@ -96,7 +96,7 @@ void FreeDBImporter::readCDROM() { } { - KConfigGroup config(KGlobal::config(), TQString::fromLatin1("ImportOptions - FreeDB")); + KConfigGroup config(TDEGlobal::config(), TQString::fromLatin1("ImportOptions - FreeDB")); config.writeEntry("CD-ROM Devices", drives); config.writeEntry("Last Device", drivePath); config.writeEntry("Cache Files Only", false); @@ -291,7 +291,7 @@ void FreeDBImporter::readCache() { #ifdef HAVE_KCDDB { // remember the import options - KConfigGroup config(KGlobal::config(), TQString::fromLatin1("ImportOptions - FreeDB")); + KConfigGroup config(TDEGlobal::config(), TQString::fromLatin1("ImportOptions - FreeDB")); config.writeEntry("Cache Files Only", true); } @@ -515,7 +515,7 @@ TQWidget* FreeDBImporter::widget(TQWidget* parent_, const char* name_/*=0*/) { l->addStretch(1); // now read config options - KConfigGroup config(KGlobal::config(), TQString::fromLatin1("ImportOptions - FreeDB")); + KConfigGroup config(TDEGlobal::config(), TQString::fromLatin1("ImportOptions - FreeDB")); TQStringList devices = config.readListEntry("CD-ROM Devices"); if(devices.isEmpty()) { #if defined(__OpenBSD__) diff --git a/src/translators/griffithimporter.cpp b/src/translators/griffithimporter.cpp index ea4da5e..d5693e1 100644 --- a/src/translators/griffithimporter.cpp +++ b/src/translators/griffithimporter.cpp @@ -46,18 +46,18 @@ Tellico::Data::CollPtr GriffithImporter::collection() { return 0; } - TQString griffith = KGlobal::dirs()->findResource("appdata", TQString::fromLatin1("griffith2tellico.py")); + TQString griffith = TDEGlobal::dirs()->findResource("appdata", TQString::fromLatin1("griffith2tellico.py")); if(griffith.isEmpty()) { myWarning() << "GriffithImporter::collection() - griffith2tellico.py not found!" << endl; return 0; } - m_process = new KProcess(); - connect(m_process, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), TQT_SLOT(slotData(KProcess*, char*, int))); - connect(m_process, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), TQT_SLOT(slotError(KProcess*, char*, int))); - connect(m_process, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*))); + m_process = new TDEProcess(); + connect(m_process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), TQT_SLOT(slotData(TDEProcess*, char*, int))); + connect(m_process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQT_SLOT(slotError(TDEProcess*, char*, int))); + connect(m_process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); *m_process << python << griffith; - if(!m_process->start(KProcess::Block, KProcess::AllOutput)) { + if(!m_process->start(TDEProcess::Block, TDEProcess::AllOutput)) { myDebug() << "ExecExternalFetcher::startSearch() - process failed to start" << endl; return 0; } @@ -65,19 +65,19 @@ Tellico::Data::CollPtr GriffithImporter::collection() { return m_coll; } -void GriffithImporter::slotData(KProcess*, char* buffer_, int len_) { +void GriffithImporter::slotData(TDEProcess*, char* buffer_, int len_) { TQDataStream stream(m_data, IO_WriteOnly | IO_Append); stream.writeRawBytes(buffer_, len_); } -void GriffithImporter::slotError(KProcess*, char* buffer_, int len_) { +void GriffithImporter::slotError(TDEProcess*, char* buffer_, int len_) { TQString msg = TQString::fromLocal8Bit(buffer_, len_); myDebug() << "GriffithImporter::slotError() - " << msg << endl; setStatusMessage(msg); } -void GriffithImporter::slotProcessExited(KProcess*) { +void GriffithImporter::slotProcessExited(TDEProcess*) { // myDebug() << "GriffithImporter::slotProcessExited()" << endl; if(!m_process->normalExit() || m_process->exitStatus()) { myDebug() << "GriffithImporter::slotProcessExited() - process did not exit successfully" << endl; diff --git a/src/translators/griffithimporter.h b/src/translators/griffithimporter.h index 39b5aa8..265a308 100644 --- a/src/translators/griffithimporter.h +++ b/src/translators/griffithimporter.h @@ -17,7 +17,7 @@ #include "importer.h" #include "../datavectors.h" -class KProcess; +class TDEProcess; namespace Tellico { namespace Import { @@ -48,14 +48,14 @@ public: virtual bool canImport(int type) const; private slots: - void slotData(KProcess* proc, char* buffer, int len); - void slotError(KProcess* proc, char* buffer, int len); - void slotProcessExited(KProcess* proc); + void slotData(TDEProcess* proc, char* buffer, int len); + void slotError(TDEProcess* proc, char* buffer, int len); + void slotProcessExited(TDEProcess* proc); private: Data::CollPtr m_coll; - KProcess* m_process; + TDEProcess* m_process; TQByteArray m_data; }; diff --git a/src/translators/htmlexporter.cpp b/src/translators/htmlexporter.cpp index 2db0fc4..6cb38b4 100644 --- a/src/translators/htmlexporter.cpp +++ b/src/translators/htmlexporter.cpp @@ -209,7 +209,7 @@ bool HTMLExporter::loadXSLTFile() { // if parseDOM, that means we want the locations to be the actual location // otherwise, we assume it'll be relative if(m_parseDOM && m_dataDir.isEmpty()) { - m_dataDir = KGlobal::dirs()->findResourceDir("appdata", TQString::fromLatin1("pics/tellico.png")); + m_dataDir = TDEGlobal::dirs()->findResourceDir("appdata", TQString::fromLatin1("pics/tellico.png")); } else if(!m_parseDOM) { m_dataDir.truncate(0); } @@ -279,7 +279,7 @@ void HTMLExporter::setFormattingOptions(Data::CollPtr coll) { if(file != i18n("Untitled")) { m_handler->addStringParam("filename", TQFile::encodeName(file)); } - m_handler->addStringParam("cdate", KGlobal::locale()->formatDate(TQDate::currentDate()).utf8()); + m_handler->addStringParam("cdate", TDEGlobal::locale()->formatDate(TQDate::currentDate()).utf8()); m_handler->addParam("show-headers", m_printHeaders ? "true()" : "false()"); m_handler->addParam("group-entries", m_printGrouped ? "true()" : "false()"); @@ -375,7 +375,7 @@ void HTMLExporter::setFormattingOptions(Data::CollPtr coll) { m_handler->addStringParam("color2", TQString(Config::templateHighlightedBaseColor(type).name()).latin1()); // add locale code to stylesheet (for sorting) - m_handler->addStringParam("lang", KGlobal::locale()->languagesTwoAlpha().first().utf8()); + m_handler->addStringParam("lang", TDEGlobal::locale()->languagesTwoAlpha().first().utf8()); } void HTMLExporter::writeImages(Data::CollPtr coll_) { @@ -738,7 +738,7 @@ bool HTMLExporter::writeEntryFiles() { dataImages << TQString::fromLatin1("stars%1.png").arg(i); } KURL dataDir; - dataDir.setPath(KGlobal::dirs()->findResourceDir("appdata", TQString::fromLatin1("pics/tellico.png")) + "pics/"); + dataDir.setPath(TDEGlobal::dirs()->findResourceDir("appdata", TQString::fromLatin1("pics/tellico.png")) + "pics/"); KURL target = fileDir(); target.addPath(TQString::fromLatin1("pics/")); KIO::NetAccess::mkdir(target, m_widget); diff --git a/src/translators/pilotdbexporter.cpp b/src/translators/pilotdbexporter.cpp index 5d4fc16..5d7b40f 100644 --- a/src/translators/pilotdbexporter.cpp +++ b/src/translators/pilotdbexporter.cpp @@ -58,8 +58,8 @@ bool PilotDBExporter::exec() { TQTextCodec* codec = 0; { // Latin1 is default - KConfigGroup group(KGlobal::config(), TQString::fromLatin1("ExportOptions - %1").arg(formatString())); - codec = KGlobal::charsets()->codecForName(group.readEntry("Charset")); + KConfigGroup group(TDEGlobal::config(), TQString::fromLatin1("ExportOptions - %1").arg(formatString())); + codec = TDEGlobal::charsets()->codecForName(group.readEntry("Charset")); } if(!codec) { kdWarning() << "PilotDBExporter::exec() - no TQTextCodec!" << endl; diff --git a/src/translators/tellicoxmlexporter.cpp b/src/translators/tellicoxmlexporter.cpp index 0a7d1af..be7404b 100644 --- a/src/translators/tellicoxmlexporter.cpp +++ b/src/translators/tellicoxmlexporter.cpp @@ -298,7 +298,7 @@ void TellicoXMLExporter::exportEntryXML(TQDomDocument& dom_, TQDomElement& paren entryElem.appendChild(fieldElem); // Date fields get special treatment if(fIt->type() == Data::Field::Date) { - fieldElem.setAttribute(TQString::fromLatin1("calendar"), KGlobal::locale()->calendar()->calendarName()); + fieldElem.setAttribute(TQString::fromLatin1("calendar"), TDEGlobal::locale()->calendar()->calendarName()); TQStringList s = TQStringList::split('-', fieldValue, true); if(s.count() > 0 && !s[0].isEmpty()) { TQDomElement e = dom_.createElement(TQString::fromLatin1("year")); |