diff --git a/blinken/src/main.cpp b/blinken/src/main.cpp index ff84f46c..9cb36827 100644 --- a/blinken/src/main.cpp +++ b/blinken/src/main.cpp @@ -29,7 +29,7 @@ int main(int argc, char *argv[]) TQFont f("Steve", 12, TQFont::Normal, true); if (!fontChecker::checkInstalled(f, locate("appdata", "fonts/steve.ttf"))) { - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; for (int i = 0; i < argc; i++) *proc << argv[i]; proc->start(); } diff --git a/kalzium/src/detailedgraphicaloverview.cpp b/kalzium/src/detailedgraphicaloverview.cpp index 0b7c8076..00424746 100644 --- a/kalzium/src/detailedgraphicaloverview.cpp +++ b/kalzium/src/detailedgraphicaloverview.cpp @@ -83,9 +83,9 @@ void DetailedGraphicalOverview::paintEvent( TQPaintEvent* ) p.setBrush( TQt::black ); p.setBrush(TQt::NoBrush); - TQFont fA = KGlobalSettings::generalFont(); - TQFont fB = KGlobalSettings::generalFont(); - TQFont fC = KGlobalSettings::generalFont(); + TQFont fA = TDEGlobalSettings::generalFont(); + TQFont fB = TDEGlobalSettings::generalFont(); + TQFont fC = TDEGlobalSettings::generalFont(); TQString strLocalizedMass = KalziumUtils::localizedValue( m_element->mass(), 6 ); diff --git a/kalzium/src/detailinfodlg.cpp b/kalzium/src/detailinfodlg.cpp index 8a1ace69..c9791771 100644 --- a/kalzium/src/detailinfodlg.cpp +++ b/kalzium/src/detailinfodlg.cpp @@ -53,11 +53,11 @@ DetailedInfoDlg::DetailedInfoDlg( Element *el , TQWidget *parent, const char *na { m_element = el; - m_baseHtml = KGlobal::dirs()->findResourceDir("data", "kalzium/data/" ); + m_baseHtml = TDEGlobal::dirs()->findResourceDir("data", "kalzium/data/" ); m_baseHtml.append("kalzium/data/htmlview/"); m_baseHtml.append("style.css"); - m_picsdir = KGlobal::dirs()->findResourceDir( "appdata", "elempics/" ) + "elempics/"; + m_picsdir = TDEGlobal::dirs()->findResourceDir( "appdata", "elempics/" ) + "elempics/"; ( actionButton( KDialogBase::Close ) )->setFocus(); @@ -176,7 +176,7 @@ TQString DetailedInfoDlg::getHtml(DATATYPE type) if ( m_element->abundance() > 0 ){ html.append( "\"icon\"/" ); - html.append( i18n( "Abundance in crustal rocks: %1 ppm" ).arg( KGlobal::locale()->formatLong( m_element->abundance() ) ) ); + html.append( i18n( "Abundance in crustal rocks: %1 ppm" ).arg( TDEGlobal::locale()->formatLong( m_element->abundance() ) ) ); html.append( "" ); } @@ -319,7 +319,7 @@ TQString DetailedInfoDlg::isotopeTable() html.append( ( *it )->spin() ); html.append( "" ); if ( !( *it )->magmoment().isEmpty() ) { - TQString v = KGlobal::locale()->formatNumber( ( *it )->magmoment(), false, 6 ); + TQString v = TDEGlobal::locale()->formatNumber( ( *it )->magmoment(), false, 6 ); html.append( i18n( "%1 %2n" ).arg( v ).arg( TQChar( 956 ) ) ); } html.append( "" ); diff --git a/kalzium/src/eqchemview.cpp b/kalzium/src/eqchemview.cpp index fee6e9c7..d2fa73c7 100644 --- a/kalzium/src/eqchemview.cpp +++ b/kalzium/src/eqchemview.cpp @@ -60,7 +60,7 @@ eqchemView::eqchemView(TQWidget *parent) : TQWidget(parent) l->addWidget(m_eqedit, 1, 1); l->addWidget(m_eqclear, 1, 0); - m_eqclear->setIconSet( KGlobal::instance()->iconLoader()->loadIconSet("locationbar_erase", + m_eqclear->setIconSet( TDEGlobal::instance()->iconLoader()->loadIconSet("locationbar_erase", KIcon::NoGroup, 22 /*KIcon::SizeSmallMedium*/) ); connect(m_eqclear, TQT_SIGNAL(clicked()), m_eqedit, TQT_SLOT(clear()) ); diff --git a/kalzium/src/kalzium.cpp b/kalzium/src/kalzium.cpp index 8ff66e4d..53470b2e 100644 --- a/kalzium/src/kalzium.cpp +++ b/kalzium/src/kalzium.cpp @@ -85,11 +85,11 @@ Kalzium::Kalzium() setupActions(); // adding the libtdeedu catalog - KGlobal::locale()->insertCatalogue( "libtdeedu" ); + TDEGlobal::locale()->insertCatalogue( "libtdeedu" ); // creating the glossary dialog and loading the glossaries we have m_glossarydlg = new GlossaryDialog( true, this, "glossary" ); - TQString dir = KGlobal::dirs()->findResourceDir( "data", "kalzium/data/" ); + TQString dir = TDEGlobal::dirs()->findResourceDir( "data", "kalzium/data/" ); TQString picturepath = dir + "kalzium/data/bg.jpg"; KURL u = dir + "kalzium/data/knowledge.xml"; Glossary *g = Glossary::readFromXML( u ); diff --git a/kalzium/src/kalziumtip.cpp b/kalzium/src/kalziumtip.cpp index 462d76f8..aaef4e7e 100644 --- a/kalzium/src/kalziumtip.cpp +++ b/kalzium/src/kalziumtip.cpp @@ -45,7 +45,7 @@ KalziumTip::KalziumTip( TQWidget * parent, const char * name, WFlags f ) : TQWid resize(0,0); hide(); //initailly hide it m_richText = 0; - m_noElemIcon = KGlobal::iconLoader()->loadIcon( "orbits", KIcon::NoGroup, 64 ); + m_noElemIcon = TDEGlobal::iconLoader()->loadIcon( "orbits", KIcon::NoGroup, 64 ); setMouseTracking(true); // receice mouse move events connect(&m_frameTimer, TQT_SIGNAL(timeout()), TQT_SLOT(internalUpdate())); diff --git a/kalzium/src/kalziumutils.cpp b/kalzium/src/kalziumutils.cpp index 38dd9786..8498962b 100644 --- a/kalzium/src/kalziumutils.cpp +++ b/kalzium/src/kalziumutils.cpp @@ -76,10 +76,10 @@ double KalziumUtils::strippedValue( double num ) TQString KalziumUtils::localizedValue( double val, int precision, unsigned long options ) { - TQString str = KGlobal::locale()->formatNumber( val, precision ); + TQString str = TDEGlobal::locale()->formatNumber( val, precision ); while( str.endsWith("0") ) str.truncate( str.length()-1); - if ( str.endsWith( KGlobal::locale()->decimalSymbol() ) ) + if ( str.endsWith( TDEGlobal::locale()->decimalSymbol() ) ) { // we do not want trailing ',' values so readd trailing 0 str.append( '0' ); // diff --git a/kalzium/src/periodictableview.cpp b/kalzium/src/periodictableview.cpp index 1f4ed64d..548974d1 100644 --- a/kalzium/src/periodictableview.cpp +++ b/kalzium/src/periodictableview.cpp @@ -461,7 +461,7 @@ void PerodicTableView::drawLegendToolTip( TQPainter* p ) static const int padding = 3; - TQFont fB = KGlobalSettings::generalFont(); + TQFont fB = TDEGlobalSettings::generalFont(); fB.setPointSize( fB.pointSize() + 4 ); p->setFont( fB ); @@ -545,7 +545,7 @@ void PerodicTableView::drawLegend( TQPainter* p ) * does not collide with the elements */ - TQFont legendFont = KGlobalSettings::generalFont(); + TQFont legendFont = TDEGlobalSettings::generalFont(); legendFont.setPointSize( legendFont.pointSize() + 1 ); p->setFont( legendFont ); diff --git a/kanagram/src/kanagram.cpp b/kanagram/src/kanagram.cpp index bc3c8f21..4e762921 100644 --- a/kanagram/src/kanagram.cpp +++ b/kanagram/src/kanagram.cpp @@ -128,7 +128,7 @@ Kanagram::Kanagram() : TQWidget(0, 0, WStaticContents | WNoAutoErase), m_overNex m_inputBox->setFont(f); m_inputBox->show(); - m_font = KGlobalSettings::generalFont(); + m_font = TDEGlobalSettings::generalFont(); //Initialize the sound server #ifndef WITHOUT_ARTS @@ -155,7 +155,7 @@ void Kanagram::loadSettings() if(m_useStandardFonts) { - m_blackboardFont = KGlobalSettings::generalFont(); + m_blackboardFont = TDEGlobalSettings::generalFont(); m_arrow = new TQPixmap(locate("appdata", "images/basicarrow.png")); m_arrowOver = new TQPixmap(locate("appdata", "images/basicarrowover.png")); } diff --git a/kanagram/src/kanagramgame.cpp b/kanagram/src/kanagramgame.cpp index 67212168..d922dc30 100644 --- a/kanagram/src/kanagramgame.cpp +++ b/kanagram/src/kanagramgame.cpp @@ -78,7 +78,7 @@ void KanagramGame::loadDefaultVocab() void KanagramGame::refreshVocabList() { - m_fileList = KGlobal::dirs()->findAllResources("appdata", "data/" + KanagramSettings::dataLanguage() + "/*.kvtml"); + m_fileList = TDEGlobal::dirs()->findAllResources("appdata", "data/" + KanagramSettings::dataLanguage() + "/*.kvtml"); //nextVocab(); m_index = findIndex(); } diff --git a/kanagram/src/leitnersystemview.cpp b/kanagram/src/leitnersystemview.cpp index cbbb0400..847d6312 100644 --- a/kanagram/src/leitnersystemview.cpp +++ b/kanagram/src/leitnersystemview.cpp @@ -45,13 +45,13 @@ void LeitnerSystemView::drawSystem(TQPainter* p) { if(i == m_highlightedBox) { - //p->drawPixmap(12 + i * 64 + i*10, m_imageY, KGlobal::iconLoader()->loadIcon("leitnerbox", KIcon::Panel)); + //p->drawPixmap(12 + i * 64 + i*10, m_imageY, TDEGlobal::iconLoader()->loadIcon("leitnerbox", KIcon::Panel)); p->drawRect(12 + i * 64 + i*10, m_imageY,64,64); p->fillRect(12 + i * 64 + i*10, m_imageY,64,64, TQBrush(red)); } else { //for each box 74 = 64(pixmap) + 10(distance between two boxes) - //p->drawPixmap(12 + i * 74, m_imageY, KGlobal::iconLoader()->loadIcon("leitnerbox", KIcon::Panel)); + //p->drawPixmap(12 + i * 74, m_imageY, TDEGlobal::iconLoader()->loadIcon("leitnerbox", KIcon::Panel)); p->drawRect(12 + i * 64 + i*10, m_imageY,64,64); } } diff --git a/kanagram/src/main.cpp b/kanagram/src/main.cpp index 07fdd0ff..00da5276 100644 --- a/kanagram/src/main.cpp +++ b/kanagram/src/main.cpp @@ -45,12 +45,12 @@ int main(int argc, char *argv[]) } if (KanagramSettings::dataLanguage().isEmpty()) { - TQStringList userLanguagesCode = KGlobal::locale()->languageList(); + TQStringList userLanguagesCode = TDEGlobal::locale()->languageList(); TQStringList::const_iterator itEnd = userLanguagesCode.end(); TQStringList::const_iterator it = userLanguagesCode.begin(); for ( ; it != itEnd; ++it) { - TQStringList mdirs = KGlobal::dirs()->findDirs("appdata", "data/" + *it); + TQStringList mdirs = TDEGlobal::dirs()->findDirs("appdata", "data/" + *it); if (!mdirs.isEmpty()) break; } if (it == itEnd) KanagramSettings::setDataLanguage("en"); diff --git a/kanagram/src/mainsettings.cpp b/kanagram/src/mainsettings.cpp index 1e026758..eb3a83d3 100644 --- a/kanagram/src/mainsettings.cpp +++ b/kanagram/src/mainsettings.cpp @@ -97,7 +97,7 @@ void MainSettings::setupTranslations() TQStringList languages, temp_languages; //the program scans in kdereview/data/ to see what languages data is found - TQStringList mdirs = KGlobal::dirs()->findDirs("appdata", "data/"); + TQStringList mdirs = TDEGlobal::dirs()->findDirs("appdata", "data/"); if (mdirs.isEmpty()) return; diff --git a/kanagram/src/newstuffdialog.cpp b/kanagram/src/newstuffdialog.cpp index 302059df..a9558de1 100644 --- a/kanagram/src/newstuffdialog.cpp +++ b/kanagram/src/newstuffdialog.cpp @@ -26,7 +26,7 @@ TQString NewStuffDialog::downloadDestination(KNS::Entry *entry) { TQString fileName = entry->payload().path(); fileName = fileName.section('/', -1); - return KGlobal::dirs()->saveLocation("data", "kanagram/data/" + KanagramSettings::dataLanguage()) + fileName; + return TDEGlobal::dirs()->saveLocation("data", "kanagram/data/" + KanagramSettings::dataLanguage()) + fileName; } bool NewStuffDialog::createUploadFile(const TQString &fileName) diff --git a/kanagram/src/vocabedit.cpp b/kanagram/src/vocabedit.cpp index 2e964065..df3bee35 100644 --- a/kanagram/src/vocabedit.cpp +++ b/kanagram/src/vocabedit.cpp @@ -94,7 +94,7 @@ void VocabEdit::slotSave() TQString fileName; if(m_fileName == "") { - fileName = KGlobal::dirs()->saveLocation("data", "kanagram/data/" + KanagramSettings::dataLanguage()) + txtVocabName->text().lower().replace(" ", "") + ".kvtml"; + fileName = TDEGlobal::dirs()->saveLocation("data", "kanagram/data/" + KanagramSettings::dataLanguage()) + txtVocabName->text().lower().replace(" ", "") + ".kvtml"; } else { diff --git a/kanagram/src/vocabsettings.cpp b/kanagram/src/vocabsettings.cpp index fd66b194..77b21966 100644 --- a/kanagram/src/vocabsettings.cpp +++ b/kanagram/src/vocabsettings.cpp @@ -34,7 +34,7 @@ void VocabSettings::refreshView() { lviewVocab->clear(); - m_fileList = KGlobal::dirs()->findAllResources("appdata", "data/" + KanagramSettings::dataLanguage() + "/" + "*.kvtml"); + m_fileList = TDEGlobal::dirs()->findAllResources("appdata", "data/" + KanagramSettings::dataLanguage() + "/" + "*.kvtml"); for(uint i = 0; i < m_fileList.size(); i++) { KEduVocDocument *doc = new KEduVocDocument(TQT_TQOBJECT(this)); diff --git a/kbruch/src/exerciseconvert.cpp b/kbruch/src/exerciseconvert.cpp index a3b61ab1..cb3843e5 100644 --- a/kbruch/src/exerciseconvert.cpp +++ b/kbruch/src/exerciseconvert.cpp @@ -224,98 +224,98 @@ void ExerciseConvert::createTask() // rational numbers to fractions, but it is not worth the effort here switch(int((double(rand()) / RAND_MAX) * 18 + 1)) { - case 0 : m_number = KGlobal::locale()->formatNumber(0.5, 1); + case 0 : m_number = TDEGlobal::locale()->formatNumber(0.5, 1); m_periodStart = 2; m_periodLength = 0; m_result = ratio(1, 2); break; - case 1 : m_number = KGlobal::locale()->formatNumber(0.3, 1); + case 1 : m_number = TDEGlobal::locale()->formatNumber(0.3, 1); m_periodStart = 2; m_periodLength = 1; m_result = ratio(1, 3); break; - case 2 : m_number = KGlobal::locale()->formatNumber(0.6, 1); + case 2 : m_number = TDEGlobal::locale()->formatNumber(0.6, 1); m_periodStart = 2; m_periodLength = 1; m_result = ratio(2, 3); break; - case 3 : m_number = KGlobal::locale()->formatNumber(0.25, 2); + case 3 : m_number = TDEGlobal::locale()->formatNumber(0.25, 2); m_periodStart = 2; m_periodLength = 0; m_result = ratio(1, 4); break; - case 4 : m_number = KGlobal::locale()->formatNumber(0.75, 2); + case 4 : m_number = TDEGlobal::locale()->formatNumber(0.75, 2); m_periodStart = 2; m_periodLength = 0; m_result = ratio(3, 4); break; - case 5 : m_number = KGlobal::locale()->formatNumber(0.2, 1); + case 5 : m_number = TDEGlobal::locale()->formatNumber(0.2, 1); m_periodStart = 2; m_periodLength = 0; m_result = ratio(1, 5); break; - case 6 : m_number = KGlobal::locale()->formatNumber(0.4, 1); + case 6 : m_number = TDEGlobal::locale()->formatNumber(0.4, 1); m_periodStart = 2; m_periodLength = 0; m_result = ratio(2, 5); break; - case 7 : m_number = KGlobal::locale()->formatNumber(0.6, 1); + case 7 : m_number = TDEGlobal::locale()->formatNumber(0.6, 1); m_periodStart = 2; m_periodLength = 0; m_result = ratio(3, 5); break; - case 8 : m_number = KGlobal::locale()->formatNumber(0.8, 1); + case 8 : m_number = TDEGlobal::locale()->formatNumber(0.8, 1); m_periodStart = 2; m_periodLength = 0; m_result = ratio(4, 5); break; - case 9 : m_number = KGlobal::locale()->formatNumber(0.16, 2); + case 9 : m_number = TDEGlobal::locale()->formatNumber(0.16, 2); m_periodStart = 3; m_periodLength = 1; m_result = ratio(1, 6); break; - case 10 : m_number = KGlobal::locale()->formatNumber(0.142857, 6); + case 10 : m_number = TDEGlobal::locale()->formatNumber(0.142857, 6); m_periodStart = 2; m_periodLength = 6; m_result = ratio(1, 7); break; - case 11 : m_number = KGlobal::locale()->formatNumber(0.125, 3); + case 11 : m_number = TDEGlobal::locale()->formatNumber(0.125, 3); m_periodStart = 2; m_periodLength = 0; m_result = ratio(1, 8); break; - case 12 : m_number = KGlobal::locale()->formatNumber(0.375, 3); + case 12 : m_number = TDEGlobal::locale()->formatNumber(0.375, 3); m_periodStart = 2; m_periodLength = 0; m_result = ratio(3, 8); break; - case 13 : m_number = KGlobal::locale()->formatNumber(0.1, 1); + case 13 : m_number = TDEGlobal::locale()->formatNumber(0.1, 1); m_periodStart = 2; m_periodLength = 1; m_result = ratio(1, 9); break; - case 14 : m_number = KGlobal::locale()->formatNumber(0.1, 1); + case 14 : m_number = TDEGlobal::locale()->formatNumber(0.1, 1); m_periodStart = 2; m_periodLength = 0; m_result = ratio(1, 10); break; - case 15 : m_number = KGlobal::locale()->formatNumber(0.05, 2); + case 15 : m_number = TDEGlobal::locale()->formatNumber(0.05, 2); m_periodStart = 2; m_periodLength = 0; m_result = ratio(1, 20); break; - case 16 : m_number = KGlobal::locale()->formatNumber(0.01, 2); + case 16 : m_number = TDEGlobal::locale()->formatNumber(0.01, 2); m_periodStart = 2; m_periodLength = 0; m_result = ratio(1, 100); break; - case 17 : m_number = KGlobal::locale()->formatNumber(0.83, 2); + case 17 : m_number = TDEGlobal::locale()->formatNumber(0.83, 2); m_periodStart = 3; m_periodLength = 1; m_result = ratio(5, 6); break; default : - case 18 : m_number = KGlobal::locale()->formatNumber(0.001, 3); + case 18 : m_number = TDEGlobal::locale()->formatNumber(0.001, 3); m_periodStart = 2; m_periodLength = 0; m_result = ratio(1, 1000); diff --git a/kbruch/src/kbruch.kcfg b/kbruch/src/kbruch.kcfg index 98103a2a..ae13463d 100644 --- a/kbruch/src/kbruch.kcfg +++ b/kbruch/src/kbruch.kcfg @@ -68,7 +68,7 @@ Font used for the task view - KGlobalSettings::generalFont() + TDEGlobalSettings::generalFont() diff --git a/keduca/keduca/keduca.cpp b/keduca/keduca/keduca.cpp index 508a137a..63a96d27 100644 --- a/keduca/keduca/keduca.cpp +++ b/keduca/keduca/keduca.cpp @@ -97,7 +97,7 @@ bool Keduca::queryClose() void Keduca::configRead() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "keduca" ); applyMainWindowSettings( config, "keduca" ); _recentFiles->loadEntries(config); @@ -105,7 +105,7 @@ void Keduca::configRead() void Keduca::configWrite() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "keduca" ); saveMainWindowSettings( config, "keduca" ); diff --git a/keduca/keduca/keducaprefs.cpp b/keduca/keduca/keducaprefs.cpp index 16eb6ff7..3bddf2e7 100644 --- a/keduca/keduca/keducaprefs.cpp +++ b/keduca/keduca/keducaprefs.cpp @@ -82,7 +82,7 @@ void KEducaPrefs::setPageGeneral() /** Read settings */ void KEducaPrefs::configRead() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Options"); TQSize defaultSize(500,400); resize( config->readSizeEntry("Geometry", &defaultSize ) ); @@ -94,7 +94,7 @@ void KEducaPrefs::configRead() /** Write settings */ void KEducaPrefs::configWrite() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Options"); config->writeEntry("Geometry", size() ); config->writeEntry("ResultFinish", _resultAfterFinish->isChecked() ); diff --git a/keduca/keducabuilder/kcontroladdedit.cpp b/keduca/keducabuilder/kcontroladdedit.cpp index eb023a79..0e539d56 100644 --- a/keduca/keducabuilder/kcontroladdedit.cpp +++ b/keduca/keducabuilder/kcontroladdedit.cpp @@ -225,7 +225,7 @@ void KControlAddEdit::addQuestion() /** Read config settings */ void KControlAddEdit::configRead() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("AddModify Window"); TQSize defaultSize(500,400); resize( config->readSizeEntry("Geometry", &defaultSize ) ); @@ -234,7 +234,7 @@ void KControlAddEdit::configRead() /** Write config settings */ void KControlAddEdit::configWrite() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("AddModify Window"); config->writeEntry("Geometry", size() ); config->sync(); diff --git a/keduca/keducabuilder/kcontrolheader.cpp b/keduca/keducabuilder/kcontrolheader.cpp index 5c323c3c..bcd1eaa0 100644 --- a/keduca/keducabuilder/kcontrolheader.cpp +++ b/keduca/keducabuilder/kcontrolheader.cpp @@ -226,7 +226,7 @@ void KControlHeader::insertHeader() TQStringList tmpResult = _defaultCategories.grep( _headerCategory->currentText() ); if( tmpResult.count() == 0 ) { - KConfig *appconfig = KGlobal::config(); + KConfig *appconfig = TDEGlobal::config(); _defaultCategories.append( _headerCategory->currentText() ); appconfig->setGroup("General"); appconfig->writeEntry( "Categories", _defaultCategories); @@ -251,7 +251,7 @@ void KControlHeader::loadCountryList(KLanguageCombo *combo) // clear the list combo->clear(); - TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*.desktop")); + TQStringList regionlist = TDEGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*.desktop")); regionlist.sort(); for ( TQStringList::ConstIterator it = regionlist.begin(); @@ -275,7 +275,7 @@ void KControlHeader::loadCountryList(KLanguageCombo *combo) } // add all languages to the list - TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*/entry.desktop")); + TQStringList countrylist = TDEGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*/entry.desktop")); countrylist.sort(); for ( TQStringList::ConstIterator it = countrylist.begin(); @@ -307,7 +307,7 @@ void KControlHeader::slotOk() void KControlHeader::configRead() { KConfig *config = new KConfig("emaildefaults"); - KConfig *appconfig = KGlobal::config(); + KConfig *appconfig = TDEGlobal::config(); config->setGroup("UserInfo"); @@ -369,7 +369,7 @@ void KControlHeader::configRead() /** Write settings */ void KControlHeader::configWrite() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("kcontrolheader"); config->writeEntry("Geometry", size() ); config->sync(); diff --git a/keduca/keducabuilder/keducabuilder.cpp b/keduca/keducabuilder/keducabuilder.cpp index 0aeb4ba4..485a09cc 100644 --- a/keduca/keducabuilder/keducabuilder.cpp +++ b/keduca/keducabuilder/keducabuilder.cpp @@ -68,7 +68,7 @@ KEducaBuilder::KEducaBuilder(TQWidget* parent, const char *name, WFlags f ) initMenuBar(); init(); configRead(); - setIcon( KGlobal::iconLoader()->loadIcon("control.png", + setIcon( TDEGlobal::iconLoader()->loadIcon("control.png", KIcon::Small) ); _isOpenFile = false; } @@ -257,7 +257,7 @@ void KEducaBuilder::slotPreview( TQListBoxItem *item ) /** Read config data */ void KEducaBuilder::configRead() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "keducacontrol" ); applyMainWindowSettings( config, "keducacontrol" ); @@ -268,7 +268,7 @@ void KEducaBuilder::configRead() /** Write settings */ void KEducaBuilder::configWrite() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "keducacontrol" ); saveMainWindowSettings( config, "keducacontrol" ); diff --git a/keduca/keducabuilder/keducaeditorstartdialog.cpp b/keduca/keducabuilder/keducaeditorstartdialog.cpp index 22e196e7..7878e6c3 100644 --- a/keduca/keducabuilder/keducaeditorstartdialog.cpp +++ b/keduca/keducabuilder/keducaeditorstartdialog.cpp @@ -53,7 +53,7 @@ void KEducaEditorStartDialog::buildRecentFilesList() TQString key; TQString value; TQString oldGroup; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); oldGroup = config->group(); diff --git a/keduca/libkeduca/kgallerydialog.cpp b/keduca/libkeduca/kgallerydialog.cpp index b1ec43e2..10c6ce43 100644 --- a/keduca/libkeduca/kgallerydialog.cpp +++ b/keduca/libkeduca/kgallerydialog.cpp @@ -104,7 +104,7 @@ bool KGalleryDialog::loadFile( const TQString &filename ) /** Read servers */ void KGalleryDialog::configRead() { - KConfig *appconfig = KGlobal::config(); + KConfig *appconfig = TDEGlobal::config(); TQStringList servers; TQStringList ipservers; TQStringList::Iterator it_ipservers; @@ -140,7 +140,7 @@ void KGalleryDialog::configWrite() { TQStringList servers; TQStringList ipservers; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "kgallerydialog" ); config->writeEntry("Splitter_size", _split->sizes() ); diff --git a/kgeography/src/mapchooser.cpp b/kgeography/src/mapchooser.cpp index ba8899cc..09e64bce 100644 --- a/kgeography/src/mapchooser.cpp +++ b/kgeography/src/mapchooser.cpp @@ -29,7 +29,7 @@ mapChooser::mapChooser(TQWidget *parent) : KDialogBase(parent, 0, true, i18n("Ch mainHB = new TQHBox(this); mainHB -> setSpacing(KDialog::spacingHint()); - list = KGlobal::dirs() -> findAllResources("appdata", "*.kgm"); + list = TDEGlobal::dirs() -> findAllResources("appdata", "*.kgm"); p_listBox = new TQListBox(mainHB); TQStringList::iterator it; for(it = list.begin(); it != list.end(); ++it) diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp index 9c3e54b4..7113f879 100644 --- a/khangman/khangman/khangman.cpp +++ b/khangman/khangman/khangman.cpp @@ -191,7 +191,7 @@ void KHangMan::setLanguages() m_languageNames.clear(); m_sortedNames.clear(); //the program scans in khangman/data/ to see what languages data is found - TQStringList mdirs = KGlobal::dirs()->findDirs("data", "khangman/data/"); + TQStringList mdirs = TDEGlobal::dirs()->findDirs("data", "khangman/data/"); if (mdirs.isEmpty()) return; for (TQStringList::Iterator it =mdirs.begin(); it !=mdirs.end(); ++it ) { TQDir dir(*it); @@ -284,7 +284,7 @@ void KHangMan::loadLevels() { //build the Level combobox menu dynamically depending of the data for each language levels.clear();//initialize TQStringList levels - KStandardDirs *dirs = KGlobal::dirs(); + KStandardDirs *dirs = TDEGlobal::dirs(); TQStringList mfiles = dirs->findAllResources("data","khangman/data/" + Prefs::selectedLanguage() + "/*.kvtml"); bool levelBool = false; if (!mfiles.isEmpty()) diff --git a/khangman/khangman/khangman.kcfg b/khangman/khangman/khangman.kcfg index 029b0913..40fa12cb 100644 --- a/khangman/khangman/khangman.kcfg +++ b/khangman/khangman/khangman.kcfg @@ -20,7 +20,7 @@ - KConfigBase *globalConf = KGlobal::config(); + KConfigBase *globalConf = TDEGlobal::config(); globalConf->setGroup("Locale"); QString userLanguage = globalConf->readEntry("Language", "en"); if (userLanguage.isEmpty()) diff --git a/khangman/khangman/main.cpp b/khangman/khangman/main.cpp index dcfae7f2..e81d3e8e 100644 --- a/khangman/khangman/main.cpp +++ b/khangman/khangman/main.cpp @@ -119,13 +119,13 @@ int main(int argc, char **argv) TQFont fd("Dustismo Roman", 12, TQFont::Normal, true); if (!fontChecker::checkInstalled(f, locate("appdata", "fonts/Domestic_Manners.ttf"))) { - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; for (int i = 0; i < argc; i++) *proc << argv[i]; proc->start(); } else if (!fontChecker::checkInstalled(fd, locate("appdata", "fonts/Dustismo_Roman.ttf"))) { - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; for (int i = 0; i < argc; i++) *proc << argv[i]; proc->start(); } diff --git a/kig/ChangeLog b/kig/ChangeLog index 86c22fcf..8845e357 100644 --- a/kig/ChangeLog +++ b/kig/ChangeLog @@ -893,7 +893,7 @@ * Improve Kig embedded in Konqueror experience: make translations and icons work by using the correct instanceName(), and using the - iconLoader we get from our TDEInstance instead of from KGlobal ( so + iconLoader we get from our TDEInstance instead of from TDEGlobal ( so that the kig specific dirs are checked for icons as well ). 2004-04-10 Dominique Devriese diff --git a/kig/filters/native-filter.cc b/kig/filters/native-filter.cc index a9bcc241..652e1096 100644 --- a/kig/filters/native-filter.cc +++ b/kig/filters/native-filter.cc @@ -120,7 +120,7 @@ KigDocument* KigFilterNative::load( const TQString& file ) // kig file inside it... iscompressed = true; - TQString tempdir = KGlobal::dirs()->saveLocation( "tmp" ); + TQString tempdir = TDEGlobal::dirs()->saveLocation( "tmp" ); if ( tempdir.isEmpty() ) KIG_FILTER_PARSE_ERROR; @@ -688,7 +688,7 @@ bool KigFilterNative::save07( const KigDocument& data, const TQString& outfile ) // the user wants to save a compressed file, so we have to save our kig // file to a temp file and then compress it... - TQString tempdir = KGlobal::dirs()->saveLocation( "tmp" ); + TQString tempdir = TDEGlobal::dirs()->saveLocation( "tmp" ); if ( tempdir.isEmpty() ) return false; diff --git a/kig/kfile/kfile_kig.cpp b/kig/kfile/kfile_kig.cpp index bd54a036..d44eb1fa 100644 --- a/kig/kfile/kfile_kig.cpp +++ b/kig/kfile/kfile_kig.cpp @@ -62,7 +62,7 @@ bool KigPlugin::readInfo( KFileMetaInfo& metainfo, uint /*what*/ ) { iscompressed = true; - TQString tempdir = KGlobal::dirs()->saveLocation( "tmp" ); + TQString tempdir = TDEGlobal::dirs()->saveLocation( "tmp" ); if ( tempdir.isEmpty() ) return false; diff --git a/kig/kig/kig.cpp b/kig/kig/kig.cpp index 4b37b8e1..82beb27e 100644 --- a/kig/kig/kig.cpp +++ b/kig/kig/kig.cpp @@ -199,7 +199,7 @@ void Kig::optionsConfigureKeys() void Kig::optionsConfigureToolbars() { - saveMainWindowSettings(KGlobal::config(), "MainWindow"); + saveMainWindowSettings(TDEGlobal::config(), "MainWindow"); // use the standard toolbar editor KEditToolbar dlg(factory()); @@ -210,7 +210,7 @@ void Kig::optionsConfigureToolbars() void Kig::applyNewToolbarConfig() { - applyMainWindowSettings(KGlobal::config(), "MainWindow"); + applyMainWindowSettings(TDEGlobal::config(), "MainWindow"); } bool Kig::queryClose() diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp index 8ba6820c..128eaeed 100644 --- a/kig/kig/kig_part.cpp +++ b/kig/kig/kig_part.cpp @@ -701,7 +701,7 @@ void KigPart::setupMacroTypes() // the user's saved macro types: TQStringList dataFiles = - KGlobal::dirs()->findAllResources("appdata", "kig-types/*.kigt", + TDEGlobal::dirs()->findAllResources("appdata", "kig-types/*.kigt", true, false ); std::vector macros; for ( TQStringList::iterator file = dataFiles.begin(); @@ -728,7 +728,7 @@ void KigPart::setupBuiltinMacros() // builtin macro types ( we try to make the user think these are // normal types ).. TQStringList builtinfiles = - KGlobal::dirs()->findAllResources( "appdata", "builtin-macros/*.kigt", true, false ); + TDEGlobal::dirs()->findAllResources( "appdata", "builtin-macros/*.kigt", true, false ); for ( TQStringList::iterator file = builtinfiles.begin(); file != builtinfiles.end(); ++file ) { @@ -989,7 +989,7 @@ void KigPart::coordSystemChanged( int id ) void KigPart::saveTypes() { - TQString typesDir = KGlobal::dirs()->saveLocation( "appdata", "kig-types" ); + TQString typesDir = TDEGlobal::dirs()->saveLocation( "appdata", "kig-types" ); if ( typesDir[ typesDir.length() - 1 ] != '/' ) typesDir += '/'; TQString typesFileWithPath = typesDir + typesFile; @@ -1004,7 +1004,7 @@ void KigPart::saveTypes() void KigPart::loadTypes() { - TQString typesDir = KGlobal::dirs()->saveLocation( "appdata", "kig-types" ); + TQString typesDir = TDEGlobal::dirs()->saveLocation( "appdata", "kig-types" ); if ( typesDir[ typesDir.length() - 1 ] != '/' ) typesDir += '/'; TQString typesFileWithPath = typesDir + typesFile; diff --git a/kig/misc/common.cpp b/kig/misc/common.cpp index b41b9284..287bde1f 100644 --- a/kig/misc/common.cpp +++ b/kig/misc/common.cpp @@ -356,17 +356,17 @@ double getDoubleFromUser( const TQString& caption, const TQString& label, double #endif #if KDE_IS_VERSION( 3, 1, 90 ) TQString input = KInputDialog::getText( - caption, label, KGlobal::locale()->formatNumber( value, decimals ), + caption, label, TDEGlobal::locale()->formatNumber( value, decimals ), ok, parent, "getDoubleFromUserDialog", &vtor ); #else TQString input = KLineEditDlg::getText( caption, label, - KGlobal::locale()->formatNumber( value, decimals ), + TDEGlobal::locale()->formatNumber( value, decimals ), ok, parent, &vtor ); #endif bool myok = true; - double ret = KGlobal::locale()->readNumber( input, &myok ); + double ret = TDEGlobal::locale()->readNumber( input, &myok ); if ( ! myok ) ret = input.toDouble( & myok ); if ( ok ) *ok = myok; diff --git a/kig/misc/coordinate_system.cpp b/kig/misc/coordinate_system.cpp index 36cfef0b..35269399 100644 --- a/kig/misc/coordinate_system.cpp +++ b/kig/misc/coordinate_system.cpp @@ -114,7 +114,7 @@ void CoordinateValidator::fixup( TQString & input ) const if ( sc == -1 ) { sc = input.length(); - KLocale* l = KGlobal::locale(); + KLocale* l = TDEGlobal::locale(); if ( mpolar ) input.append( TQString::fromLatin1( ";" ) + l->positiveSign() + TQString::fromLatin1( "0°" ) ); @@ -144,8 +144,8 @@ TQString EuclideanCoords::fromScreen( const Coordinate& p, const KigDocument& d Rect sr = d.suggestedRect(); double m = kigMax( sr.width(), sr.height() ); int l = kigMax( 0, (int) ( 3 - log10( m ) ) ); - TQString xs = KGlobal::locale()->formatNumber( p.x, l ); - TQString ys = KGlobal::locale()->formatNumber( p.y, l ); + TQString xs = TDEGlobal::locale()->formatNumber( p.x, l ); + TQString ys = TDEGlobal::locale()->formatNumber( p.y, l ); return TQString::fromLatin1( "( %1; %2 )" ).arg( xs ).arg( ys ); } @@ -157,7 +157,7 @@ Coordinate EuclideanCoords::toScreen(const TQString& s, bool& ok) const { TQString xs = r.cap(1); TQString ys = r.cap(2); - KLocale* l = KGlobal::locale(); + KLocale* l = TDEGlobal::locale(); double x = l->readNumber( xs, &ok ); if ( ! ok ) x = xs.toDouble( &ok ); if ( ! ok ) return Coordinate(); @@ -272,7 +272,7 @@ void EuclideanCoords::drawGrid( KigPainter& p, bool showgrid, bool showaxes ) co p.drawText( Rect( Coordinate( i, 0 ), hd, -2*vd ).normalized(), - KGlobal::locale()->formatNumber( i, hnfrac ), + TDEGlobal::locale()->formatNumber( i, hnfrac ), AlignLeft | AlignTop ); }; @@ -281,7 +281,7 @@ void EuclideanCoords::drawGrid( KigPainter& p, bool showgrid, bool showaxes ) co { if( fabs( i ) < 1e-8 ) continue; p.drawText ( Rect( Coordinate( 0, i ), 2*hd, vd ).normalized(), - KGlobal::locale()->formatNumber( i, vnfrac ), + TDEGlobal::locale()->formatNumber( i, vnfrac ), AlignBottom | AlignLeft ); }; @@ -351,8 +351,8 @@ TQString PolarCoords::fromScreen( const Coordinate& pt, const KigDocument& d ) c double r = pt.length(); double theta = Goniometry::convert( atan2( pt.y, pt.x ), Goniometry::Rad, Goniometry::Deg ); - TQString rs = KGlobal::locale()->formatNumber( r, l ); - TQString ts = KGlobal::locale()->formatNumber( theta, 0 ); + TQString rs = TDEGlobal::locale()->formatNumber( r, l ); + TQString ts = TDEGlobal::locale()->formatNumber( theta, 0 ); return TQString::fromLatin1("( %1; %2° )").arg( rs ).arg( ts ); } @@ -378,11 +378,11 @@ Coordinate PolarCoords::toScreen(const TQString& s, bool& ok) const if (ok) { TQString rs = regexp.cap( 1 ); - double r = KGlobal::locale()->readNumber( rs, &ok ); + double r = TDEGlobal::locale()->readNumber( rs, &ok ); if ( ! ok ) r = rs.toDouble( &ok ); if ( ! ok ) return Coordinate(); TQString ts = regexp.cap( 2 ); - double theta = KGlobal::locale()->readNumber( ts, &ok ); + double theta = TDEGlobal::locale()->readNumber( ts, &ok ); if ( ! ok ) theta = ts.toDouble( &ok ); if ( ! ok ) return Coordinate(); theta *= M_PI; @@ -465,7 +465,7 @@ void PolarCoords::drawGrid( KigPainter& p, bool showgrid, bool showaxes ) const // through the 0 etc. ) if( fabs( i ) < 1e-8 ) continue; - TQString is = KGlobal::locale()->formatNumber( fabs( i ), nfrac ); + TQString is = TDEGlobal::locale()->formatNumber( fabs( i ), nfrac ); p.drawText( Rect( Coordinate( i, 0 ), hd, -2*vd ).normalized(), is, AlignLeft | AlignTop ); @@ -475,7 +475,7 @@ void PolarCoords::drawGrid( KigPainter& p, bool showgrid, bool showaxes ) const { if( fabs( i ) < 1e-8 ) continue; - TQString is = KGlobal::locale()->formatNumber( fabs( i ), nfrac ); + TQString is = TDEGlobal::locale()->formatNumber( fabs( i ), nfrac ); p.drawText ( Rect( Coordinate( 0, i ), hd, vd ).normalized(), is, AlignBottom | AlignLeft diff --git a/kig/scripting/newscriptwizard.cc b/kig/scripting/newscriptwizard.cc index e2a8fe25..c02226e8 100644 --- a/kig/scripting/newscriptwizard.cc +++ b/kig/scripting/newscriptwizard.cc @@ -70,7 +70,7 @@ NewScriptWizard::NewScriptWizard( TQWidget* parent, ScriptModeBase* mode ) // there is no KDE textditor component installed, so we'll use a // simplier KTextEdit textedit = new KTextEdit( mpcode, "textedit" ); - textedit->setFont( KGlobalSettings::fixedFont() ); + textedit->setFont( TDEGlobalSettings::fixedFont() ); gridLayout->addWidget( textedit, 1, 0 ); } else diff --git a/kiten/asyndeta.cpp b/kiten/asyndeta.cpp index 4a377eb0..46bcb9fa 100644 --- a/kiten/asyndeta.cpp +++ b/kiten/asyndeta.cpp @@ -59,7 +59,7 @@ Dict::Index *Asyndeta::retrieveIndex() void Asyndeta::readKitenConfiguration() { - KStandardDirs *dirs = KGlobal::dirs(); + KStandardDirs *dirs = TDEGlobal::dirs(); KConfig config(dirs->findResource("config", "kitenrc")); TQString globaledict = dirs->findResource("data", "kiten/edict"); @@ -113,6 +113,6 @@ void Asyndeta::readKitenConfiguration() TQString Asyndeta::personalDictionaryLocation() { - return KGlobal::dirs()->saveLocation("data", "kiten/dictionaries/", true).append("personal"); + return TDEGlobal::dirs()->saveLocation("data", "kiten/dictionaries/", true).append("personal"); } diff --git a/kiten/deinf.cpp b/kiten/deinf.cpp index 52d1f8f2..e92fcd1d 100644 --- a/kiten/deinf.cpp +++ b/kiten/deinf.cpp @@ -37,7 +37,7 @@ void Deinf::Index::load() if (loaded) return; - KStandardDirs *dirs = KGlobal::dirs(); + KStandardDirs *dirs = TDEGlobal::dirs(); TQString vconj = dirs->findResource("data", "kiten/vconj"); if (vconj.isNull()) { diff --git a/kiten/dict.cpp b/kiten/dict.cpp index 1e605ac3..22aace41 100644 --- a/kiten/dict.cpp +++ b/kiten/dict.cpp @@ -69,7 +69,7 @@ File::File(TQString path, TQString n) : myName(n) , dictFile(path) , dictPtr((const unsigned char *)MAP_FAILED) - , indexFile(KGlobal::dirs()->saveLocation("data", "kiten/xjdx/", true) + TQFileInfo(path).baseName() + ".xjdx") + , indexFile(TDEGlobal::dirs()->saveLocation("data", "kiten/xjdx/", true) + TQFileInfo(path).baseName() + ".xjdx") , indexPtr((const uint32_t *)MAP_FAILED) , valid(false) { @@ -104,10 +104,10 @@ File::File(TQString path, TQString n) { //kdDebug() << "creating " << indexFile.name() << endl; // find the index generator executable - KProcess proc; + TDEProcess proc; proc << KStandardDirs::findExe("kitengen") << path << indexFile.name(); // TODO: put up a status dialog and event loop instead of blocking - proc.start(KProcess::Block, KProcess::NoCommunication); + proc.start(TDEProcess::Block, TDEProcess::NoCommunication); } if (!dictFile.open(IO_ReadOnly)) diff --git a/kiten/kiten.cpp b/kiten/kiten.cpp index 406554a8..bfff027d 100644 --- a/kiten/kiten.cpp +++ b/kiten/kiten.cpp @@ -54,10 +54,10 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) : KMainWindow(parent, nam config = Config::self(); config->readConfig(); - Accel = new KGlobalAccel(TQT_TQOBJECT(this)); + Accel = new TDEGlobalAccel(TQT_TQOBJECT(this)); (void) Accel->insert("Lookup Kanji (Kanjidic)", i18n("Lookup Kanji (Kanjidic)"), i18n("Gives detailed information about Kanji currently on clipboard."), CTRL + ALT + Key_K, CTRL + ALT + Key_K, TQT_TQOBJECT(this), TQT_SLOT(kanjiSearchAccel())); (void) Accel->insert("Lookup English/Japanese word", i18n("Lookup English/Japanese Word"), i18n("Looks up current text on clipboard in the same way as if you used Kiten's regular search."), CTRL + ALT + Key_S, CTRL + ALT + Key_S, TQT_TQOBJECT(this), TQT_SLOT(searchAccel())); - Accel->readSettings(KGlobal::config()); + Accel->readSettings(TDEGlobal::config()); Accel->updateConnections(); _ResultView = new ResultView(true, this, "_ResultView"); @@ -112,7 +112,7 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) : KMainWindow(parent, nam createLearn(); resize(600, 400); - applyMainWindowSettings(KGlobal::config(), "TopLevelWindow"); + applyMainWindowSettings(TDEGlobal::config(), "TopLevelWindow"); connect(_ResultView, TQT_SIGNAL(linkClicked(const TQString &)), TQT_SLOT(ressearch(const TQString &))); connect(kapp->clipboard(), TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(autoSearch())); @@ -163,7 +163,7 @@ bool TopLevel::queryClose() config->setDeinf(deinfCB->isChecked()); config->writeConfig(); - saveMainWindowSettings(KGlobal::config(), "TopLevelWindow"); + saveMainWindowSettings(TDEGlobal::config(), "TopLevelWindow"); return true; } @@ -728,7 +728,7 @@ void TopLevel::toggleCom() void TopLevel::configureToolBars() { - saveMainWindowSettings(KGlobal::config(), "TopLevelWindow"); + saveMainWindowSettings(TDEGlobal::config(), "TopLevelWindow"); KEditToolbar dlg(actionCollection(), "kitenui.rc"); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(newToolBarConfig())); dlg.exec(); @@ -737,7 +737,7 @@ void TopLevel::configureToolBars() void TopLevel::newToolBarConfig() { createGUI("kitenui.rc"); - applyMainWindowSettings(KGlobal::config(), "TopLevelWindow"); + applyMainWindowSettings(TDEGlobal::config(), "TopLevelWindow"); } RadWidget *TopLevel::radicalSearch() diff --git a/kiten/kiten.h b/kiten/kiten.h index 158c57c7..f82542fb 100644 --- a/kiten/kiten.h +++ b/kiten/kiten.h @@ -31,7 +31,7 @@ class Config; class ConfigureDialog; class EditAction; -class KGlobalAccel; +class TDEGlobalAccel; class KStatusBar; class KToggleAction; class KListAction; @@ -110,7 +110,7 @@ private: KAction *backAction; KAction *forwardAction; - KGlobalAccel *Accel; + TDEGlobalAccel *Accel; void doSearch(const TQString &text, TQRegExp regexp); void doSearchInResults(const TQString &text, TQRegExp regexp); diff --git a/kiten/kromajiedit.cpp b/kiten/kromajiedit.cpp index d58ff2e0..46167376 100644 --- a/kiten/kromajiedit.cpp +++ b/kiten/kromajiedit.cpp @@ -33,7 +33,7 @@ KRomajiEdit::KRomajiEdit(TQWidget *parent, const char *name) { kana = "unset"; - KStandardDirs *dirs = KGlobal::dirs(); + KStandardDirs *dirs = TDEGlobal::dirs(); TQString romkana = dirs->findResource("data", "kiten/romkana.cnv"); if (romkana.isNull()) { diff --git a/kiten/rad.cpp b/kiten/rad.cpp index ab03e0c7..20fbeae3 100644 --- a/kiten/rad.cpp +++ b/kiten/rad.cpp @@ -51,7 +51,7 @@ void Rad::load() if (loaded) return; - KStandardDirs *dirs = KGlobal::dirs(); + KStandardDirs *dirs = TDEGlobal::dirs(); TQString radkfile = dirs->findResource("data", "kiten/radkfile"); if (radkfile.isNull()) { diff --git a/kiten/widgets.cpp b/kiten/widgets.cpp index 9f65a4a4..9dbb22d5 100644 --- a/kiten/widgets.cpp +++ b/kiten/widgets.cpp @@ -403,10 +403,10 @@ void eEdit::save() f.flush(); // find the index generator executable - KProcess proc; - proc << KStandardDirs::findExe("kitengen") << filename << KGlobal::dirs()->saveLocation("data", "kiten/xjdx/", true) + TQFileInfo(filename).baseName() + ".xjdx"; + TDEProcess proc; + proc << KStandardDirs::findExe("kitengen") << filename << TDEGlobal::dirs()->saveLocation("data", "kiten/xjdx/", true) + TQFileInfo(filename).baseName() + ".xjdx"; // TODO: put up a status dialog and event loop instead of blocking - proc.start(KProcess::Block, KProcess::NoCommunication); + proc.start(TDEProcess::Block, TDEProcess::NoCommunication); statusBar()->message(i18n("Saved")); isMod = false; diff --git a/klatin/klatin/klatin.cpp b/klatin/klatin/klatin.cpp index f475859b..2a8bf4be 100644 --- a/klatin/klatin/klatin.cpp +++ b/klatin/klatin/klatin.cpp @@ -184,7 +184,7 @@ void KLatin::resetGUI() // various options that are available to choose // and setCentralWidget it. klatinchoose = new KLatinChoose(this); - klatinchoose->QuitButton->setIconSet(KGlobal::iconLoader()->loadIconSet("exit", KIcon::Small)); + klatinchoose->QuitButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("exit", KIcon::Small)); klatinchoose->show(); setCentralWidget(klatinchoose); diff --git a/klatin/klatin/klatin.kcfg b/klatin/klatin/klatin.kcfg index ec8fa52f..53ca9a55 100644 --- a/klatin/klatin/klatin.kcfg +++ b/klatin/klatin/klatin.kcfg @@ -8,7 +8,7 @@ - KConfigBase *globalConf = KGlobal::config(); + KConfigBase *globalConf = TDEGlobal::config(); globalConf->setGroup("Locale"); TQString m_language = globalConf->readEntry("Language", "en"); //keep only the first 2 characters diff --git a/klatin/klatin/klatingrammar.cpp b/klatin/klatin/klatingrammar.cpp index 0598547f..b8037c95 100644 --- a/klatin/klatin/klatingrammar.cpp +++ b/klatin/klatin/klatingrammar.cpp @@ -38,8 +38,8 @@ KLatinGrammar::KLatinGrammar(TQWidget* parent, const char *name) m_totalCorrect = 0; m_numWrong = 0; - OKButton->setIconSet(KGlobal::iconLoader()->loadIconSet("button_ok", KIcon::Small)); - BackButton->setIconSet(KGlobal::iconLoader()->loadIconSet("back", KIcon::Small)); + OKButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("button_ok", KIcon::Small)); + BackButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("back", KIcon::Small)); // Set connections connect(BackButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(goBack())); diff --git a/klatin/klatin/klatinverbs.cpp b/klatin/klatin/klatinverbs.cpp index 70d42ed8..e0ec76fa 100644 --- a/klatin/klatin/klatinverbs.cpp +++ b/klatin/klatin/klatinverbs.cpp @@ -33,9 +33,9 @@ KLatinVerbs::KLatinVerbs(TQWidget* parent, const char *name) : KLatinVerbsWidget(parent, name) { - OKButton->setIconSet(KGlobal::iconLoader()->loadIconSet("button_ok", KIcon::Small)); - BackButton->setIconSet(KGlobal::iconLoader()->loadIconSet("back", KIcon::Small)); - ChangeButton->setIconSet(KGlobal::iconLoader()->loadIconSet("apply", KIcon::Small)); + OKButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("button_ok", KIcon::Small)); + BackButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("back", KIcon::Small)); + ChangeButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("apply", KIcon::Small)); ChooseConjugation->insertItem(i18n("1st")); ChooseConjugation->insertItem(i18n("2nd")); diff --git a/klatin/klatin/klatinvocab.cpp b/klatin/klatin/klatinvocab.cpp index 8abbc0b3..5ff27ef7 100644 --- a/klatin/klatin/klatinvocab.cpp +++ b/klatin/klatin/klatinvocab.cpp @@ -35,7 +35,7 @@ KLatinVocab::KLatinVocab(TQWidget* parent, const char *name) : KLatinVocabWidget(parent, name) { - BackButton->setIconSet(KGlobal::iconLoader()->loadIconSet("back", KIcon::Small)); + BackButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("back", KIcon::Small)); m_vocabFile = TQString(); @@ -87,7 +87,7 @@ void KLatinVocab::parseVocab(TQString customFile) // Check whether file exists or not // If not then regenerate working default if (TQFile::exists(fileName) == FALSE) { - KConfigBase *globalConf = KGlobal::config(); + KConfigBase *globalConf = TDEGlobal::config(); globalConf->setGroup("Locale"); TQString language = globalConf->readEntry("Language", "en"); diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp index c777f2b0..a4836f58 100644 --- a/klettres/klettres/klettres.cpp +++ b/klettres/klettres/klettres.cpp @@ -88,7 +88,7 @@ void KLettres::findLanguages() m_languageNames.clear(); //m_sortedNames.clear(); //the program scans in khangman/data/ to see what languages data is found - TQStringList mdirs = KGlobal::dirs()->findDirs("data", "klettres/"); + TQStringList mdirs = TDEGlobal::dirs()->findDirs("data", "klettres/"); if (mdirs.isEmpty()) return; for (TQStringList::Iterator it =mdirs.begin(); it !=mdirs.end(); ++it ) { TQDir dir(*it); @@ -152,7 +152,7 @@ void KLettres::findLanguages() TQString Prefs::defaultLanguage() { //see what is the user language for KDE - TQStringList defaultLanguages = KGlobal::locale()->languagesTwoAlpha(); + TQStringList defaultLanguages = TDEGlobal::locale()->languagesTwoAlpha(); if (!defaultLanguages.isEmpty()) { //scan to see if defaultLanguages[0] belongs to m_languages. If not, en is default. int i = Prefs::self()->m_languages.findIndex(defaultLanguages[0]); diff --git a/klettres/klettres/klettres.kcfg b/klettres/klettres/klettres.kcfg index b79d220f..59562169 100644 --- a/klettres/klettres/klettres.kcfg +++ b/klettres/klettres/klettres.kcfg @@ -43,7 +43,7 @@ - TQFont defaultFont = KGlobalSettings::largeFont(); + TQFont defaultFont = TDEGlobalSettings::largeFont(); defaultFont.setPointSize(48); defaultFont.setBold(true); diff --git a/kmplot/kmplot/editfunctionpage.ui b/kmplot/kmplot/editfunctionpage.ui index a1ac0f46..2b6da892 100644 --- a/kmplot/kmplot/editfunctionpage.ui +++ b/kmplot/kmplot/editfunctionpage.ui @@ -402,7 +402,7 @@ Example: f(x)=x^2 completion(const TQString&) substringCompletion(const TQString&) textRotation(KCompletionBase::KeyBindingType) - completionModeChanged(KGlobalSettings::Completion) + completionModeChanged(TDEGlobalSettings::Completion) aboutToShowContextMenu(TQPopupMenu*) deleteLater() cleanupEventFilter(TQObject*) diff --git a/kmplot/kmplot/kmplot.cpp b/kmplot/kmplot/kmplot.cpp index 47161609..b8dd8cdb 100644 --- a/kmplot/kmplot/kmplot.cpp +++ b/kmplot/kmplot/kmplot.cpp @@ -207,7 +207,7 @@ void KmPlot::optionsConfigureKeys() void KmPlot::optionsConfigureToolbars() { - saveMainWindowSettings(KGlobal::config() ); + saveMainWindowSettings(TDEGlobal::config() ); // use the standard toolbar editor KEditToolbar dlg(factory()); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(applyNewToolbarConfig())); @@ -216,7 +216,7 @@ void KmPlot::optionsConfigureToolbars() void KmPlot::applyNewToolbarConfig() { - applyMainWindowSettings(KGlobal::config()); + applyMainWindowSettings(TDEGlobal::config()); } void KmPlot::fileOpen() diff --git a/kmplot/kmplot/kmplot.kcfg b/kmplot/kmplot/kmplot.kcfg index 1963aac3..df9eba38 100644 --- a/kmplot/kmplot/kmplot.kcfg +++ b/kmplot/kmplot/kmplot.kcfg @@ -121,7 +121,7 @@ Choose a font name for the axis labels. - KGlobalSettings::generalFont().family() + TDEGlobalSettings::generalFont().family() @@ -131,7 +131,7 @@ Choose a font name for the table printed at the top of the page. - KGlobalSettings::generalFont().family() + TDEGlobalSettings::generalFont().family() diff --git a/kmplot/kmplot/xparser.cpp b/kmplot/kmplot/xparser.cpp index e7b84fb8..7b5317dc 100644 --- a/kmplot/kmplot/xparser.cpp +++ b/kmplot/kmplot/xparser.cpp @@ -37,7 +37,7 @@ XParser::XParser(bool &mo) : DCOPObject("Parser"), Parser(), m_modified(mo) { // setup slider support - setDecimalSymbol( KGlobal::locale()->decimalSymbol() ); + setDecimalSymbol( TDEGlobal::locale()->decimalSymbol() ); } XParser::~XParser() diff --git a/kpercentage/kpercentage/kpercentage.cpp b/kpercentage/kpercentage/kpercentage.cpp index 53b0b374..8e2c1ae1 100644 --- a/kpercentage/kpercentage/kpercentage.cpp +++ b/kpercentage/kpercentage/kpercentage.cpp @@ -86,7 +86,7 @@ KPercentage::KPercentage( const char *name ) : KPushButton *button_random = new KPushButton( i18n( "??" ), this ); KPushButton *button_help = new KPushButton( KStdGuiItem::help().text(), this ); button_help->setIconSet( TQIconSet( icon_loader.loadIcon( "help", KIcon::NoGroup, 32 ) ) ); - KHelpMenu *help_menu = new KHelpMenu( this, KGlobal::instance()->aboutData(), true ); + KHelpMenu *help_menu = new KHelpMenu( this, TDEGlobal::instance()->aboutData(), true ); button_help->setPopup( ( TQPopupMenu* ) ( help_menu->menu() ) ); KPushButton *button_close = new KPushButton( i18n( "E&xit" ), this ); button_close->setIconSet( TQIconSet( icon_loader.loadIcon( "exit", KIcon::NoGroup, 32 ) ) ); diff --git a/kstars/kstars/ccdpreviewwg.cpp b/kstars/kstars/ccdpreviewwg.cpp index abe0ae21..edbc9006 100644 --- a/kstars/kstars/ccdpreviewwg.cpp +++ b/kstars/kstars/ccdpreviewwg.cpp @@ -65,7 +65,7 @@ FILE *CCDwfp; brightnessChanged(brightnessBar->value()); contrastChanged(contrastBar->value()); - KIconLoader *icons = KGlobal::iconLoader(); + KIconLoader *icons = TDEGlobal::iconLoader(); playPix = icons->loadIcon( "player_play", KIcon::Toolbar ); pausePix = icons->loadIcon( "player_pause", KIcon::Toolbar ); diff --git a/kstars/kstars/detaildialog.cpp b/kstars/kstars/detaildialog.cpp index 7e178278..b4fd1b75 100644 --- a/kstars/kstars/detaildialog.cpp +++ b/kstars/kstars/detaildialog.cpp @@ -136,7 +136,7 @@ void DetailDialog::createGeneralTab() Data->Names->setText( s->longname() ); Data->Type->setText( s->sptype() + " " + i18n("star") ); Data->Mag->setText( i18n( "number in magnitudes", "%1 mag" ).arg( - KGlobal::locale()->formatNumber( s->mag(), 1 ) ) ); //show to tenths place + TDEGlobal::locale()->formatNumber( s->mag(), 1 ) ) ); //show to tenths place //distance if ( s->distance() > 2000. || s->distance() < 0. ) // parallax < 0.5 mas @@ -146,10 +146,10 @@ void DetailDialog::createGeneralTab() TQString::number( int( s->distance() + 0.5 ) ) ) ); else if ( s->distance() > 10.0 ) //show to tenths place Data->Distance->setText( i18n( "number in parsecs", "%1 pc" ).arg( - KGlobal::locale()->formatNumber( s->distance(), 1 ) ) ); + TDEGlobal::locale()->formatNumber( s->distance(), 1 ) ) ); else //show to hundredths place Data->Distance->setText( i18n( "number in parsecs", "%1 pc" ).arg( - KGlobal::locale()->formatNumber( s->distance(), 2 ) ) ); + TDEGlobal::locale()->formatNumber( s->distance(), 2 ) ) ); //Note multiplicity/variablility in angular size label Data->AngSizeLabel->setText( "" ); @@ -186,26 +186,26 @@ void DetailDialog::createGeneralTab() Data->Mag->setText( TQString("%1 %").arg( int( ((KSMoon *)selectedObject)->illum()*100. ) ) ); } else { Data->Mag->setText( i18n( "number in magnitudes", "%1 mag" ).arg( - KGlobal::locale()->formatNumber( ps->mag(), 1 ) ) ); //show to tenths place + TDEGlobal::locale()->formatNumber( ps->mag(), 1 ) ) ); //show to tenths place } //Distance from Earth. The moon requires a unit conversion if ( ps->name() == "Moon" ) { Data->Distance->setText( i18n("distance in kilometers", "%1 km").arg( - KGlobal::locale()->formatNumber( ps->rearth()*AU_KM ) ) ); + TDEGlobal::locale()->formatNumber( ps->rearth()*AU_KM ) ) ); } else { Data->Distance->setText( i18n("distance in Astronomical Units", "%1 AU").arg( - KGlobal::locale()->formatNumber( ps->rearth() ) ) ); + TDEGlobal::locale()->formatNumber( ps->rearth() ) ) ); } //Angular size; moon and sun in arcmin, others in arcsec if ( ps->angSize() ) { if ( ps->name() == "Sun" || ps->name() == "Moon" ) Data->AngSize->setText( i18n("angular size in arcminutes", "%1 arcmin").arg( - KGlobal::locale()->formatNumber( ps->angSize() ) ) ); + TDEGlobal::locale()->formatNumber( ps->angSize() ) ) ); else Data->AngSize->setText( i18n("angular size in arcseconds", "%1 arcsec").arg( - KGlobal::locale()->formatNumber( ps->angSize()*60.0 ) ) ); + TDEGlobal::locale()->formatNumber( ps->angSize()*60.0 ) ) ); } else { Data->AngSize->setText( "--" ); } @@ -246,7 +246,7 @@ void DetailDialog::createGeneralTab() Data->Mag->setText( "--" ); else Data->Mag->setText( i18n( "number in magnitudes", "%1 mag" ).arg( - KGlobal::locale()->formatNumber( dso->mag(), 1 ) ) ); //show to tenths place + TDEGlobal::locale()->formatNumber( dso->mag(), 1 ) ) ); //show to tenths place //No distances at this point... Data->Distance->setText( "--" ); @@ -257,7 +257,7 @@ void DetailDialog::createGeneralTab() int( dso->a() ) ) ); else if ( dso->a() ) Data->AngSize->setText( i18n("angular size in arcminutes", "%1 arcmin").arg( - KGlobal::locale()->formatNumber( dso->a(), 1 ) ) ); + TDEGlobal::locale()->formatNumber( dso->a(), 1 ) ) ); else Data->AngSize->setText( "--" ); @@ -313,7 +313,7 @@ void DetailDialog::createPositionTab( const KStarsDateTime &ut, GeoLocation *geo //because we don't want a thousands-place separator! TQString sEpoch = TQString::number( ut.epoch(), 'f', 1 ); //Replace the decimal point with localized decimal symbol - sEpoch.replace( ".", KGlobal::locale()->decimalSymbol() ); + sEpoch.replace( ".", TDEGlobal::locale()->decimalSymbol() ); Pos->RALabel->setText( i18n( "RA (%1):" ).arg( sEpoch ) ); Pos->DecLabel->setText( i18n( "Dec (%1):" ).arg( sEpoch ) ); @@ -336,7 +336,7 @@ void DetailDialog::createPositionTab( const KStarsDateTime &ut, GeoLocation *geo //Airmass is approximated as the secant of the zenith distance, //equivalent to 1./sin(Alt). Beware of Inf at Alt=0! if ( selectedObject->alt()->Degrees() > 0.0 ) - Pos->Airmass->setText( KGlobal::locale()->formatNumber( + Pos->Airmass->setText( TDEGlobal::locale()->formatNumber( 1./sin( selectedObject->alt()->radians() ), 2 ) ); else Pos->Airmass->setText( "--" ); diff --git a/kstars/kstars/dms.cpp b/kstars/kstars/dms.cpp index d5a69d8f..e8a29fc6 100644 --- a/kstars/kstars/dms.cpp +++ b/kstars/kstars/dms.cpp @@ -71,7 +71,7 @@ bool dms::setFromString( const TQString &str, bool isDeg ) { //Account for localized decimal-point settings //TQString::toDouble() requires that the decimal symbol is "." - entry.replace( KGlobal::locale()->decimalSymbol(), "." ); + entry.replace( TDEGlobal::locale()->decimalSymbol(), "." ); //empty entry returns false if ( entry.isEmpty() ) { diff --git a/kstars/kstars/fitsimage.cpp b/kstars/kstars/fitsimage.cpp index 1a42a1a7..76fccfa5 100644 --- a/kstars/kstars/fitsimage.cpp +++ b/kstars/kstars/fitsimage.cpp @@ -162,7 +162,7 @@ void FITSImage::contentsMouseMoveEvent ( TQMouseEvent * e ) if (validPoint) { viewer->statusBar()->changeItem(TQString("%1 , %2").arg( (int) x).arg( (int) y), 0); - viewer->statusBar()->changeItem( KGlobal::locale()->formatNumber( viewer->imgBuffer[(int) (y * width + x)], 3 ), 1 ); + viewer->statusBar()->changeItem( TDEGlobal::locale()->formatNumber( viewer->imgBuffer[(int) (y * width + x)], 3 ), 1 ); setCursor(TQt::CrossCursor); } else diff --git a/kstars/kstars/fovdialog.cpp b/kstars/kstars/fovdialog.cpp index dedf6dd9..6021c495 100644 --- a/kstars/kstars/fovdialog.cpp +++ b/kstars/kstars/fovdialog.cpp @@ -134,7 +134,7 @@ void FOVDialog::paintEvent( TQPaintEvent * ) { TQFont smallFont = p.font(); smallFont.setPointSize( p.font().pointSize() - 2 ); p.setFont( smallFont ); - p.drawText( 0, fov->ViewBox->contentsRect().height(), i18n("angular size in arcminutes", "%1 arcmin").arg( KGlobal::locale()->formatNumber( f->size() ), 3 ) ); + p.drawText( 0, fov->ViewBox->contentsRect().height(), i18n("angular size in arcminutes", "%1 arcmin").arg( TDEGlobal::locale()->formatNumber( f->size() ), 3 ) ); } } @@ -162,7 +162,7 @@ void FOVDialog::slotEditFOV() { return; newfdlg.ui->FOVName->setText( f->name() ); - newfdlg.ui->FOVEdit->setText( KGlobal::locale()->formatNumber( f->size(), 3 ) ); + newfdlg.ui->FOVEdit->setText( TDEGlobal::locale()->formatNumber( f->size(), 3 ) ); newfdlg.ui->ColorButton->setColor( TQColor( f->color() ) ); newfdlg.ui->ShapeBox->setCurrentItem( f->shape() ); newfdlg.slotUpdateFOV(); @@ -231,7 +231,7 @@ void NewFOV::paintEvent( TQPaintEvent * ) { p.begin( ui->ViewBox ); p.fillRect( ui->ViewBox->contentsRect(), TQColor( "black" ) ); f.draw( p, (float)( 0.3*ui->ViewBox->contentsRect().width() ) ); - p.drawText( 0, 0, i18n("angular size in arcminutes", "%1 arcmin").arg( KGlobal::locale()->formatNumber( f.size() ), 3 ) ); + p.drawText( 0, 0, i18n("angular size in arcminutes", "%1 arcmin").arg( TDEGlobal::locale()->formatNumber( f.size() ), 3 ) ); p.end(); } @@ -242,11 +242,11 @@ void NewFOV::slotComputeFOV() { if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "ComputeEyeFOV" ) && ui->TLength1->value() > 0.0 ) kdDebug() << "B" << endl; if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "ComputeEyeFOV" ) && ui->TLength1->value() > 0.0 ) - ui->FOVEdit->setText( KGlobal::locale()->formatNumber( ui->EyeFOV->value() * ui->EyeLength->value() / ui->TLength1->value() ) ); + ui->FOVEdit->setText( TDEGlobal::locale()->formatNumber( ui->EyeFOV->value() * ui->EyeLength->value() / ui->TLength1->value() ) ); else if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "ComputeCameraFOV" ) && ui->TLength2->value() > 0.0 ) - ui->FOVEdit->setText( KGlobal::locale()->formatNumber( ui->ChipSize->value() * 3438.0 / ui->TLength2->value() ) ); + ui->FOVEdit->setText( TDEGlobal::locale()->formatNumber( ui->ChipSize->value() * 3438.0 / ui->TLength2->value() ) ); else if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "ComputeHPBW" ) && ui->RTDiameter->value() > 0.0 && ui->WaveLength->value() > 0.0 ) { - ui->FOVEdit->setText( KGlobal::locale()->formatNumber( 34.34 * 1.2 * ui->WaveLength->value() / ui->RTDiameter->value() ) ); + ui->FOVEdit->setText( TDEGlobal::locale()->formatNumber( 34.34 * 1.2 * ui->WaveLength->value() / ui->RTDiameter->value() ) ); // Beam width for an antenna is usually a circle on the sky. ui->ShapeBox->setCurrentItem(4); slotUpdateFOV(); diff --git a/kstars/kstars/indidriver.cpp b/kstars/kstars/indidriver.cpp index 64624f8a..e34b83f6 100644 --- a/kstars/kstars/indidriver.cpp +++ b/kstars/kstars/indidriver.cpp @@ -63,7 +63,7 @@ INDIDriver::INDIDriver(TQWidget *parent) : devManager( parent ) localListView->setSorting(-1); clientListView->setSorting(-1); - KIconLoader *icons = KGlobal::iconLoader(); + KIconLoader *icons = TDEGlobal::iconLoader(); runningPix = icons->loadIcon( "exec", KIcon::Small); stopPix = icons->loadIcon( "button_cancel", KIcon::Small); localMode = icons->loadIcon( "network_local", KIcon::Small); @@ -402,7 +402,7 @@ bool INDIDriver::runDevice(IDevice *dev) return false; } - dev->proc = new KProcess; + dev->proc = new TDEProcess; *dev->proc << "indiserver"; *dev->proc << "-v" << "-r" << "0" << "-p" << TQString("%1").arg(dev->indiPort) << dev->driver; @@ -415,9 +415,9 @@ bool INDIDriver::runDevice(IDevice *dev) else localListView->selectedItem()->setPixmap(2, serverMode); - connect(dev->proc, TQT_SIGNAL(receivedStderr (KProcess *, char *, int)), dev, TQT_SLOT(processstd(KProcess *, char*, int))); + connect(dev->proc, TQT_SIGNAL(receivedStderr (TDEProcess *, char *, int)), dev, TQT_SLOT(processstd(TDEProcess *, char*, int))); - dev->proc->start(KProcess::NotifyOnExit, KProcess::Stderr); + dev->proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr); //dev->proc->start(); return (dev->proc->isRunning()); @@ -935,7 +935,7 @@ IDevice::IDevice(TQString inLabel, TQString inDriver, TQString inVersion) } -void IDevice::processstd(KProcess* /*proc*/, char* buffer, int /*buflen*/) +void IDevice::processstd(TDEProcess* /*proc*/, char* buffer, int /*buflen*/) { serverBuffer.append(buffer); emit newServerInput(); diff --git a/kstars/kstars/indidriver.h b/kstars/kstars/indidriver.h index f62f06a0..8ecf6e2e 100644 --- a/kstars/kstars/indidriver.h +++ b/kstars/kstars/indidriver.h @@ -29,7 +29,7 @@ class KStars; class KListView; class KPopupMenu; -class KProcess; +class TDEProcess; struct INDIHostsInfo { @@ -60,7 +60,7 @@ class IDevice : public TQObject bool managed; int mgrID; int deviceType; - KProcess *proc; + TDEProcess *proc; /* Telescope specific attributes */ double focal_length; @@ -69,7 +69,7 @@ class IDevice : public TQObject void restart(); public slots: - void processstd(KProcess *proc, char* buffer, int buflen); + void processstd(TDEProcess *proc, char* buffer, int buflen); signals: void newServerInput(); diff --git a/kstars/kstars/indifitsconf.cpp b/kstars/kstars/indifitsconf.cpp index 5c4cddae..d6d9ce02 100644 --- a/kstars/kstars/indifitsconf.cpp +++ b/kstars/kstars/indifitsconf.cpp @@ -27,7 +27,7 @@ INDIFITSConf::INDIFITSConf(TQWidget* parent, const char* name, bool modal, WFlag : INDIConf(parent,name, modal,fl) { - KIconLoader *icons = KGlobal::iconLoader(); + KIconLoader *icons = TDEGlobal::iconLoader(); selectDirB->setPixmap( icons->loadIcon( "fileopen", KIcon::Toolbar ) ); connect(selectDirB, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveFITSDirectory())); connect(filterCombo, TQT_SIGNAL(activated (int)), this, TQT_SLOT(comboUpdate(int))); diff --git a/kstars/kstars/infoboxes.cpp b/kstars/kstars/infoboxes.cpp index dff865e4..922380da 100644 --- a/kstars/kstars/infoboxes.cpp +++ b/kstars/kstars/infoboxes.cpp @@ -351,7 +351,7 @@ bool InfoBoxes::timeChanged( const KStarsDateTime &ut, const KStarsDateTime <, //Don't use KLocale::formatNumber() for Julian Day because we don't want //thousands-place separators TQString JDString = TQString::number( ut.djd(), 'f', 2 ); - JDString.replace( ".", KGlobal::locale()->decimalSymbol() ); + JDString.replace( ".", TDEGlobal::locale()->decimalSymbol() ); TimeBox->setText3( i18n( "Sidereal Time", "ST: " ) + STString + i18n( "Julian Day", "JD: " ) + JDString ); @@ -375,9 +375,9 @@ bool InfoBoxes::geoChanged(const GeoLocation *geo) { GeoBox->setText1( name ); GeoBox->setText2( i18n( "Longitude", "Long:" ) + " " + - KGlobal::locale()->formatNumber( geo->lng()->Degrees(),3) + " " + + TDEGlobal::locale()->formatNumber( geo->lng()->Degrees(),3) + " " + i18n( "Latitude", "Lat:" ) + " " + - KGlobal::locale()->formatNumber( geo->lat()->Degrees(),3) ); + TDEGlobal::locale()->formatNumber( geo->lat()->Degrees(),3) ); if ( ot1 == GeoBox->text1() && ot2 == GeoBox->text2() ) return false; diff --git a/kstars/kstars/ksnewstuff.cpp b/kstars/kstars/ksnewstuff.cpp index 3c14c73f..3332b58c 100644 --- a/kstars/kstars/ksnewstuff.cpp +++ b/kstars/kstars/ksnewstuff.cpp @@ -42,7 +42,7 @@ KSNewStuff::KSNewStuff( TQWidget *parent ) : { ks = (KStars*)parent; kdw = new KDirWatch( this ); - kdw->addDir( KGlobal::dirs()->saveLocation("data", kapp->instanceName(), true) ); + kdw->addDir( TDEGlobal::dirs()->saveLocation("data", kapp->instanceName(), true) ); } bool KSNewStuff::install( const TQString &fileName ) @@ -54,7 +54,7 @@ bool KSNewStuff::install( const TQString &fileName ) return false; const KArchiveDirectory *archiveDir = archive.directory(); - const TQString destDir = KGlobal::dirs()->saveLocation("data", kapp->instanceName(), true); + const TQString destDir = TDEGlobal::dirs()->saveLocation("data", kapp->instanceName(), true); KStandardDirs::makeDir( destDir ); //monitor destDir for changes; inform updateData when files are created. diff --git a/kstars/kstars/kstarsactions.cpp b/kstars/kstars/kstarsactions.cpp index 8a7959f2..4e28a5ab 100644 --- a/kstars/kstars/kstarsactions.cpp +++ b/kstars/kstars/kstarsactions.cpp @@ -565,9 +565,9 @@ void KStars::slotRunScript() { //Add statusbar message that script is running //ks->statusBar()->changeItem( i18n( "Running script: %1" ).arg( fileURL.fileName() ), 0 ); - KProcess p; + TDEProcess p; p << f.name(); - p.start( KProcess::DontCare ); + p.start( TDEProcess::DontCare ); while ( p.isRunning() ) kapp->processEvents( 50 ); //otherwise tempfile may get deleted before script completes. } diff --git a/kstars/kstars/kstarsdata.cpp b/kstars/kstars/kstarsdata.cpp index d8084480..5bd888e7 100644 --- a/kstars/kstars/kstarsdata.cpp +++ b/kstars/kstars/kstarsdata.cpp @@ -947,7 +947,7 @@ bool KStarsData::openURLFile(TQString urlfile, TQFile & file) { //Find global file(s) in findAllResources() list. TQFileInfo fi_local( file.name() ); - TQStringList flist = KGlobal::instance()->dirs()->findAllResources( "appdata", urlfile ); + TQStringList flist = TDEGlobal::instance()->dirs()->findAllResources( "appdata", urlfile ); for ( unsigned int i=0; i< flist.count(); i++ ) { if ( flist[i] != file.name() ) { TQFileInfo fi_global( flist[i] ); diff --git a/kstars/kstars/locationdialog.cpp b/kstars/kstars/locationdialog.cpp index 2ba14da1..546694c7 100644 --- a/kstars/kstars/locationdialog.cpp +++ b/kstars/kstars/locationdialog.cpp @@ -109,7 +109,7 @@ LocationDialog::LocationDialog( TQWidget* parent ) TZBox->setDuplicatesEnabled( false ); for ( int i=0; i<25; ++i ) - TZBox->insertItem( KGlobal::locale()->formatNumber( (double)(i-12) ) ); + TZBox->insertItem( TDEGlobal::locale()->formatNumber( (double)(i-12) ) ); TQMap::Iterator it = p->data()->Rulebook.begin(); TQMap::Iterator itEnd = p->data()->Rulebook.end(); @@ -224,10 +224,10 @@ void LocationDialog::initCityList( void ) { filteredCityList.append( loc ); //If TZ is not even integer value, add it to listbox - if ( loc->TZ0() - int( loc->TZ0() ) && ! TZBox->listBox()->findItem( KGlobal::locale()->formatNumber( loc->TZ0() ) ) ) { + if ( loc->TZ0() - int( loc->TZ0() ) && ! TZBox->listBox()->findItem( TDEGlobal::locale()->formatNumber( loc->TZ0() ) ) ) { for ( unsigned int i=0; i<((unsigned int) TZBox->count()); ++i ) { if ( TZBox->text( i ).toDouble() > loc->TZ0() ) { - TZBox->insertItem( KGlobal::locale()->formatNumber( loc->TZ0() ), i-1 ); + TZBox->insertItem( TDEGlobal::locale()->formatNumber( loc->TZ0() ), i-1 ); break; } } @@ -308,7 +308,7 @@ void LocationDialog::changeCity( void ) { NewCountryName->setText( SelectedCity->translatedCountry() ); NewLong->showInDegrees( SelectedCity->lng() ); NewLat->showInDegrees( SelectedCity->lat() ); - TZBox->setCurrentText( KGlobal::locale()->formatNumber( SelectedCity->TZ0() ) ); + TZBox->setCurrentText( TDEGlobal::locale()->formatNumber( SelectedCity->TZ0() ) ); //Pick the City's rule from the rulebook for ( int i=0; icount(); ++i ) { @@ -464,7 +464,7 @@ void LocationDialog::clearFields( void ) { NewCountryName->clear(); NewLong->clearFields(); NewLat->clearFields(); - TZBox->lineEdit()->setText( KGlobal::locale()->formatNumber( 0.0 ) ); + TZBox->lineEdit()->setText( TDEGlobal::locale()->formatNumber( 0.0 ) ); TZRuleBox->setCurrentItem( 0 ); nameModified = true; dataModified = false; diff --git a/kstars/kstars/simclock.cpp b/kstars/kstars/simclock.cpp index 0e7c467a..54c97b45 100644 --- a/kstars/kstars/simclock.cpp +++ b/kstars/kstars/simclock.cpp @@ -73,7 +73,7 @@ void SimClock::tick() { long double scaledsec = (long double)mselapsed * (long double)Scale / 1000.0; UTC.setDJD( julianmark + scaledsec / (24. * 3600.) ); -// kdDebug() << "tick() : JD = " << KGlobal::locale()->formatNumber( UTC.djd(), 7 ) << +// kdDebug() << "tick() : JD = " << TDEGlobal::locale()->formatNumber( UTC.djd(), 7 ) << // " mselapsed = " << mselapsed << " scale = " << Scale << // " scaledsec = " << double(scaledsec) << endl; @@ -163,7 +163,7 @@ void SimClock::setUTC(const KStarsDateTime &newtime) { } kdDebug() << i18n( "Setting clock: UTC: %1 JD: %2" ) - .arg( UTC.toString() ).arg( KGlobal::locale()->formatNumber( UTC.djd() ) ) << endl; + .arg( UTC.toString() ).arg( TDEGlobal::locale()->formatNumber( UTC.djd() ) ) << endl; emit timeChanged(); } else { kdDebug() << i18n( "Cannot set SimClock: Invalid Date/Time." ) << endl; diff --git a/kstars/kstars/streamwg.cpp b/kstars/kstars/streamwg.cpp index 53d19fc7..e6796bcb 100644 --- a/kstars/kstars/streamwg.cpp +++ b/kstars/kstars/streamwg.cpp @@ -52,7 +52,7 @@ FILE *wfp; //videoFrameLayout = new TQVBoxLayout(videoFrame, 0, 0); streamFrame = new VideoWG(videoFrame); - KIconLoader *icons = KGlobal::iconLoader(); + KIconLoader *icons = TDEGlobal::iconLoader(); playPix = icons->loadIcon( "player_play", KIcon::Toolbar ); pausePix = icons->loadIcon( "player_pause", KIcon::Toolbar ); diff --git a/kstars/kstars/tools/kstarsplotwidget.cpp b/kstars/kstars/tools/kstarsplotwidget.cpp index 750eb85a..3e2e2ee6 100644 --- a/kstars/kstars/tools/kstarsplotwidget.cpp +++ b/kstars/kstars/tools/kstarsplotwidget.cpp @@ -361,7 +361,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString( "%1" ).arg( lab, 0, 'g', 2 ); int idot = str.find( '.' ); if ( idot >= 0 ) - str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() ); + str = str.replace( idot, 1, TDEGlobal::locale()->decimalSymbol() ); if ( px > 0 && px < pW ) { TQRect r( px - BIGTICKSIZE, pH+BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE ); @@ -429,7 +429,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString( "%1" ).arg( lab, 0, 'g', 2 ); int idot = str.find( '.' ); if ( idot >= 0 ) - str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() ); + str = str.replace( idot, 1, TDEGlobal::locale()->decimalSymbol() ); if ( py > 0 && py < pH ) { TQRect r( -2*BIGTICKSIZE, py-SMALLTICKSIZE, 2*BIGTICKSIZE, 2*SMALLTICKSIZE ); @@ -495,7 +495,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString( "%1" ).arg( lab, 0, 'g', 2 ); int idot = str.find( '.' ); if ( idot >= 0 ) - str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() ); + str = str.replace( idot, 1, TDEGlobal::locale()->decimalSymbol() ); if ( px > 0 && px < pW ) { TQRect r( px - BIGTICKSIZE, -2*BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE ); @@ -559,7 +559,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString( "%1" ).arg( lab, 0, 'g', 2 ); int idot = str.find( '.' ); if ( idot >= 0 ) - str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() ); + str = str.replace( idot, 1, TDEGlobal::locale()->decimalSymbol() ); if ( py > 0 && py < pH ) { TQRect r( pW + 2*BIGTICKSIZE, py-SMALLTICKSIZE, 2*BIGTICKSIZE, 2*SMALLTICKSIZE ); diff --git a/kstars/kstars/tools/modcalcazel.cpp b/kstars/kstars/tools/modcalcazel.cpp index 9ddafb37..e2eb527e 100644 --- a/kstars/kstars/tools/modcalcazel.cpp +++ b/kstars/kstars/tools/modcalcazel.cpp @@ -165,8 +165,8 @@ void modCalcAzel::showEpoch( const KStarsDateTime &dt ) { double epochN = dt.epoch(); // Localization -// epochName->setText(KGlobal::locale()->formatNumber(epochN,3)); - epochName->setText( KGlobal::locale()->formatNumber( epochN ) ); +// epochName->setText(TDEGlobal::locale()->formatNumber(epochN,3)); + epochName->setText( TDEGlobal::locale()->formatNumber( epochN ) ); } diff --git a/kstars/kstars/tools/modcalcgeodcoord.cpp b/kstars/kstars/tools/modcalcgeodcoord.cpp index 1c4f9110..892b08e9 100644 --- a/kstars/kstars/tools/modcalcgeodcoord.cpp +++ b/kstars/kstars/tools/modcalcgeodcoord.cpp @@ -73,9 +73,9 @@ void modCalcGeodCoord::setEllipsoid(int index) { void modCalcGeodCoord::getCartGeoCoords (void) { - geoPlace->setXPos( KGlobal::locale()->readNumber(xGeoName->text())*1000. ); - geoPlace->setYPos( KGlobal::locale()->readNumber(yGeoName->text())*1000. ); - geoPlace->setZPos( KGlobal::locale()->readNumber(zGeoName->text())*1000. ); + geoPlace->setXPos( TDEGlobal::locale()->readNumber(xGeoName->text())*1000. ); + geoPlace->setYPos( TDEGlobal::locale()->readNumber(yGeoName->text())*1000. ); + geoPlace->setZPos( TDEGlobal::locale()->readNumber(zGeoName->text())*1000. ); //geoPlace->setXPos( xGeoName->text().toDouble()*1000. ); //geoPlace->setYPos( yGeoName->text().toDouble()*1000. ); //geoPlace->setZPos( zGeoName->text().toDouble()*1000. ); @@ -118,15 +118,15 @@ void modCalcGeodCoord::showSpheGeoCoords(void) { lonGeoBox->show( geoPlace->lng() ); latGeoBox->show( geoPlace->lat() ); - altGeoBox->setText( KGlobal::locale()->formatNumber( geoPlace->height(), 3) ); + altGeoBox->setText( TDEGlobal::locale()->formatNumber( geoPlace->height(), 3) ); } void modCalcGeodCoord::showCartGeoCoords(void) { - xGeoName->setText( KGlobal::locale()->formatNumber( geoPlace->xPos()/1000. ,6)); - yGeoName->setText( KGlobal::locale()->formatNumber( geoPlace->yPos()/1000. ,6)); - zGeoName->setText( KGlobal::locale()->formatNumber( geoPlace->zPos()/1000. ,6)); + xGeoName->setText( TDEGlobal::locale()->formatNumber( geoPlace->xPos()/1000. ,6)); + yGeoName->setText( TDEGlobal::locale()->formatNumber( geoPlace->yPos()/1000. ,6)); + zGeoName->setText( TDEGlobal::locale()->formatNumber( geoPlace->zPos()/1000. ,6)); } void modCalcGeodCoord::geoCheck(void) { @@ -297,7 +297,7 @@ void modCalcGeodCoord::processLines( TQTextStream &istream ) { xB = fields[i].toDouble(); i++; } else - xB = KGlobal::locale()->readNumber(xBoxBatch->text()) ; + xB = TDEGlobal::locale()->readNumber(xBoxBatch->text()) ; if ( allRadioBatch->isChecked() ) ostream << xB << space; @@ -311,7 +311,7 @@ void modCalcGeodCoord::processLines( TQTextStream &istream ) { yB = fields[i].toDouble(); i++; } else - yB = KGlobal::locale()->readNumber( yBoxBatch->text()) ; + yB = TDEGlobal::locale()->readNumber( yBoxBatch->text()) ; if ( allRadioBatch->isChecked() ) ostream << yB << space; @@ -324,7 +324,7 @@ void modCalcGeodCoord::processLines( TQTextStream &istream ) { zB = fields[i].toDouble(); i++; } else - zB = KGlobal::locale()->readNumber( zBoxBatch->text()); + zB = TDEGlobal::locale()->readNumber( zBoxBatch->text()); if ( allRadioBatch->isChecked() ) ostream << zB << space; diff --git a/kstars/kstars/tools/modcalcjd.cpp b/kstars/kstars/tools/modcalcjd.cpp index 8b87b998..9b982664 100644 --- a/kstars/kstars/tools/modcalcjd.cpp +++ b/kstars/kstars/tools/modcalcjd.cpp @@ -71,7 +71,7 @@ void modCalcJD::computeFromMjd (void) { long double julianDay, modjulianDay; - modjulianDay = KGlobal::locale()->readNumber( MjdName->text() ); + modjulianDay = TDEGlobal::locale()->readNumber( MjdName->text() ); julianDay = MJD0 + modjulianDay; showJd( julianDay ); computeFromJd(); @@ -80,7 +80,7 @@ void modCalcJD::computeFromMjd (void) void modCalcJD::computeFromJd (void) { long double julianDay, modjulianDay; - julianDay = KGlobal::locale()->readNumber( JdName->text() ); + julianDay = TDEGlobal::locale()->readNumber( JdName->text() ); KStarsDateTime dt( julianDay ); datBox->setDate( dt.date() ); @@ -116,10 +116,10 @@ KStarsDateTime modCalcJD::getDateTime (void) void modCalcJD::showJd(long double julianDay) { - JdName->setText(KGlobal::locale()->formatNumber( (double)julianDay, 5 ) ); + JdName->setText(TDEGlobal::locale()->formatNumber( (double)julianDay, 5 ) ); } void modCalcJD::showMjd(long double modjulianDay) { - MjdName->setText(KGlobal::locale()->formatNumber( (double)modjulianDay, 5 ) ); + MjdName->setText(TDEGlobal::locale()->formatNumber( (double)modjulianDay, 5 ) ); } diff --git a/kstars/kstars/tools/modcalcplanets.cpp b/kstars/kstars/tools/modcalcplanets.cpp index d149d5a3..977b47bf 100644 --- a/kstars/kstars/tools/modcalcplanets.cpp +++ b/kstars/kstars/tools/modcalcplanets.cpp @@ -220,14 +220,14 @@ void modCalcPlanets::showHeliocentricEclipticCoords(const dms *hLong, const dms { helLongBox->show( hLong ); helLatBox->show( hLat ); - sunDistBox->setText( KGlobal::locale()->formatNumber( dist,6)); + sunDistBox->setText( TDEGlobal::locale()->formatNumber( dist,6)); } void modCalcPlanets::showGeocentricEclipticCoords(const dms *eLong, const dms *eLat, double dist) { geoLongBox->show( eLong ); geoLatBox->show( eLat ); - earthDistBox->setText( KGlobal::locale()->formatNumber( dist,6)); + earthDistBox->setText( TDEGlobal::locale()->formatNumber( dist,6)); } void modCalcPlanets::showEquatorialCoords(const dms *ra, const dms *dec) diff --git a/kstars/kstars/tools/modcalcvlsr.cpp b/kstars/kstars/tools/modcalcvlsr.cpp index f55525b7..4f553554 100644 --- a/kstars/kstars/tools/modcalcvlsr.cpp +++ b/kstars/kstars/tools/modcalcvlsr.cpp @@ -172,30 +172,30 @@ void modCalcVlsr::showLongLat(void) void modCalcVlsr::showVlsr (const double vlsr ) { - vlsrBox->setText( KGlobal::locale()->formatNumber( vlsr ) ); + vlsrBox->setText( TDEGlobal::locale()->formatNumber( vlsr ) ); } void modCalcVlsr::showHelVel (const double vhel ) { - vHelioBox->setText( KGlobal::locale()->formatNumber( vhel ) ); + vHelioBox->setText( TDEGlobal::locale()->formatNumber( vhel ) ); } void modCalcVlsr::showGeoVel (const double vgeo ) { - vGeoBox->setText( KGlobal::locale()->formatNumber( vgeo ) ); + vGeoBox->setText( TDEGlobal::locale()->formatNumber( vgeo ) ); } void modCalcVlsr::showTopoVel (const double vtop ) { - vTopoBox->setText( KGlobal::locale()->formatNumber( vtop ) ); + vTopoBox->setText( TDEGlobal::locale()->formatNumber( vtop ) ); } void modCalcVlsr::showEpoch( const KStarsDateTime &dt ) { double epochN = dt.epoch(); // Localization -// epochName->setText(KGlobal::locale()->formatNumber(epochN,3)); - epochName->setText( KGlobal::locale()->formatNumber( epochN ) ); +// epochName->setText(TDEGlobal::locale()->formatNumber(epochN,3)); + epochName->setText( TDEGlobal::locale()->formatNumber( epochN ) ); } diff --git a/kstars/kstars/tools/observinglist.cpp b/kstars/kstars/tools/observinglist.cpp index 2e6be24d..17fa8cce 100644 --- a/kstars/kstars/tools/observinglist.cpp +++ b/kstars/kstars/tools/observinglist.cpp @@ -105,7 +105,7 @@ ObservingList::ObservingList( KStars *_ks, TQWidget* parent ) obsList.setAutoDelete( false ); //do NOT delete removed pointers! //Add icons to Push Buttons - KIconLoader *icons = KGlobal::iconLoader(); + KIconLoader *icons = TDEGlobal::iconLoader(); ui->OpenButton->setPixmap( icons->loadIcon( "fileopen", KIcon::Toolbar ) ); ui->SaveButton->setPixmap( icons->loadIcon( "filesave", KIcon::Toolbar ) ); ui->SaveAsButton->setPixmap( icons->loadIcon( "filesaveas", KIcon::Toolbar ) ); @@ -676,7 +676,7 @@ void ObservingList::slotWizard() { void ObservingList::slotToggleSize() { if ( isLarge() ) { - ui->MiniButton->setPixmap( KGlobal::iconLoader()->loadIcon( "window_fullscreen", KIcon::Toolbar ) ); + ui->MiniButton->setPixmap( TDEGlobal::iconLoader()->loadIcon( "window_fullscreen", KIcon::Toolbar ) ); //switch widget stack to show TinyTable ui->TableStack->raiseWidget( ui->TinyTable ); @@ -697,7 +697,7 @@ void ObservingList::slotToggleSize() { bIsLarge = false; } else { - ui->MiniButton->setPixmap( KGlobal::iconLoader()->loadIcon( "window_nofullscreen", KIcon::Toolbar ) ); + ui->MiniButton->setPixmap( TDEGlobal::iconLoader()->loadIcon( "window_nofullscreen", KIcon::Toolbar ) ); //switch widget stack to show FullTable ui->TableStack->raiseWidget( ui->FullTable ); diff --git a/kstars/kstars/tools/planetviewer.cpp b/kstars/kstars/tools/planetviewer.cpp index bde44c2c..49cc6d28 100644 --- a/kstars/kstars/tools/planetviewer.cpp +++ b/kstars/kstars/tools/planetviewer.cpp @@ -48,7 +48,7 @@ PlanetViewer::PlanetViewer(TQWidget *parent, const char *name) pw->timeStep->setDaysOnly( true ); pw->timeStep->tsbox()->setValue( 1 ); //start with 1-day timestep - pw->RunButton->setPixmap( KGlobal::iconLoader()->loadIcon( "1rightarrow", KIcon::Toolbar ) ); + pw->RunButton->setPixmap( TDEGlobal::iconLoader()->loadIcon( "1rightarrow", KIcon::Toolbar ) ); pw->dateBox->setDate( ((KStars*)parent)->data()->lt().date() ); vlay->addWidget( pw ); @@ -115,11 +115,11 @@ void PlanetViewer::slotRunClock() { isClockRunning = !isClockRunning; if ( isClockRunning ) { - pw->RunButton->setPixmap( KGlobal::iconLoader()->loadIcon( "player_pause", KIcon::Toolbar ) ); + pw->RunButton->setPixmap( TDEGlobal::iconLoader()->loadIcon( "player_pause", KIcon::Toolbar ) ); tmr.start( 100 ); // pw->dateBox->setEnabled( false ); } else { - pw->RunButton->setPixmap( KGlobal::iconLoader()->loadIcon( "1rightarrow", KIcon::Toolbar ) ); + pw->RunButton->setPixmap( TDEGlobal::iconLoader()->loadIcon( "1rightarrow", KIcon::Toolbar ) ); tmr.stop(); // pw->dateBox->setEnabled( true ); } diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp index 88279857..9e02efe0 100644 --- a/kstars/kstars/tools/scriptbuilder.cpp +++ b/kstars/kstars/tools/scriptbuilder.cpp @@ -265,7 +265,7 @@ ScriptBuilder::ScriptBuilder( TQWidget *parent, const char *name ) new TQListViewItem(INDI_filter, setINDIFilterNumFunc->prototype()); //Add icons to Push Buttons - KIconLoader *icons = KGlobal::iconLoader(); + KIconLoader *icons = TDEGlobal::iconLoader(); sb->NewButton->setIconSet( icons->loadIcon( "filenew", KIcon::Toolbar ) ); sb->OpenButton->setIconSet( icons->loadIcon( "fileopen", KIcon::Toolbar ) ); sb->SaveButton->setIconSet( icons->loadIconSet( "filesave", KIcon::Toolbar ) ); @@ -898,9 +898,9 @@ void ScriptBuilder::slotRunScript() { //set rwx for owner, rx for group, rx for other chmod( f.name().ascii(), S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH ); - KProcess p; + TDEProcess p; p << f.name(); - if ( ! p.start( KProcess::DontCare ) ) + if ( ! p.start( TDEProcess::DontCare ) ) kdDebug() << "Process did not start." << endl; while ( p.isRunning() ) kapp->processEvents( 50 ); //otherwise tempfile may get deleted before script completes. diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp index 6c9a78c8..d9ee9d9c 100644 --- a/ktouch/src/ktouch.cpp +++ b/ktouch/src/ktouch.cpp @@ -79,7 +79,7 @@ KTouch::KTouch() setupGUI(ToolBar | Keys | StatusBar | Create); setAutoSaveSettings(); // Read user statistics - KURL stat_file = KGlobal::dirs()->findResource("data", "ktouch/statistics.xml"); + KURL stat_file = TDEGlobal::dirs()->findResource("data", "ktouch/statistics.xml"); //kdDebug() << "[KTouch::KTouch] readings statistics from file '" << stat_file << "'" << endl; if (!m_stats.read(this, stat_file)) m_stats.clear(); // if we can't read it, start with empty statistics @@ -518,10 +518,10 @@ bool KTouch::queryExit() { Prefs::writeConfig(); // update and save statistics m_trainer->storeTrainingStatistics(); - KURL stat_file = KGlobal::dirs()->saveLocation("data","ktouch", true) + "statistics.xml"; + KURL stat_file = TDEGlobal::dirs()->saveLocation("data","ktouch", true) + "statistics.xml"; //kdDebug() << "[KTouch::queryExit] Writing statistics to file: '" << stat_file << "'" << endl; m_stats.write(this, stat_file); - KURL color_file = KGlobal::dirs()->saveLocation("data","ktouch", true) + "color_schemes.xml"; + KURL color_file = TDEGlobal::dirs()->saveLocation("data","ktouch", true) + "color_schemes.xml"; KTouchColorScheme::writeList(this, color_file); return true; } @@ -625,7 +625,7 @@ void KTouch::init() { if (m_keyboardFiles.contains(Prefs::currentKeyboardFile() )==0) { TQString default_keyboard; // determine locale - TQString lang = KGlobal::locale()->language(); + TQString lang = TDEGlobal::locale()->language(); TQString fname = lang + ".keyboard"; // try to find keyboard with current locale TQStringList::const_iterator it = m_keyboardFiles.constBegin(); @@ -647,7 +647,7 @@ void KTouch::init() { // create some default colour schemes KTouchColorScheme::createDefaults(); // read additional color schemes - KURL color_file = KGlobal::dirs()->findResource("data", "ktouch/color_schemes.xml"); + KURL color_file = TDEGlobal::dirs()->findResource("data", "ktouch/color_schemes.xml"); KTouchColorScheme::readList(this, color_file); } // ---------------------------------------------------------------------------- @@ -747,7 +747,7 @@ void KTouch::updateFontFromLecture() { // This function populates the file lists with the installed training, keyboard and // examination files. void KTouch::updateFileLists() { - KStandardDirs *dirs = KGlobal::dirs(); + KStandardDirs *dirs = TDEGlobal::dirs(); // first search for all installed keyboard files // TODO : search in i18n() directories @@ -772,10 +772,10 @@ void KTouch::updateFileLists() { // get everything in front of the first . TQString lang_iso = fname.section('.',0,0); // get language description of file names - TQString lang_name = KGlobal::locale()->twoAlphaToLanguageName(lang_iso); + TQString lang_name = TDEGlobal::locale()->twoAlphaToLanguageName(lang_iso); // kdDebug() << fname << " | " << lang_iso << " | " << lang_name << endl; if (lang_name.isEmpty()) - lang_name = KGlobal::locale()->twoAlphaToCountryName(lang_iso); + lang_name = TDEGlobal::locale()->twoAlphaToCountryName(lang_iso); if (!lang_name.isEmpty()) lang_name += " (" + fname + ")"; else diff --git a/ktouch/src/ktouch.kcfg b/ktouch/src/ktouch.kcfg index 829bf6fb..ab7e636f 100644 --- a/ktouch/src/ktouch.kcfg +++ b/ktouch/src/ktouch.kcfg @@ -91,7 +91,7 @@ - KGlobalSettings::generalFont() + TDEGlobalSettings::generalFont() diff --git a/ktouch/src/ktouchtrainer.cpp b/ktouch/src/ktouchtrainer.cpp index 7ed140ca..b13b3a30 100644 --- a/ktouch/src/ktouchtrainer.cpp +++ b/ktouch/src/ktouchtrainer.cpp @@ -51,9 +51,9 @@ KTouchTrainer::KTouchTrainer(KTouchStatus *status, KTouchSlideLine *slideLine, K m_sessionStats.clear(); /// \todo preload sounds and improve sound playback system - m_levelUpSound = KGlobal::dirs()->findResource("appdata","up.wav"); - m_levelDownSound = KGlobal::dirs()->findResource("appdata","down.wav"); - m_typeWriterSound = KGlobal::dirs()->findResource("appdata","typewriter.wav"); + m_levelUpSound = TDEGlobal::dirs()->findResource("appdata","up.wav"); + m_levelDownSound = TDEGlobal::dirs()->findResource("appdata","down.wav"); + m_typeWriterSound = TDEGlobal::dirs()->findResource("appdata","typewriter.wav"); connect(m_statusWidget->levelUpBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(levelUp()) ); connect(m_statusWidget->levelDownBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(levelDown()) ); diff --git a/kturtle/src/kturtle.cpp b/kturtle/src/kturtle.cpp index 0d827d88..02ecddb8 100644 --- a/kturtle/src/kturtle.cpp +++ b/kturtle/src/kturtle.cpp @@ -930,7 +930,7 @@ void MainWindow::slotSettings() TQStringList LogoLanguageList = Settings::logoLanguageList(); // Add the full language names to the items for ( TQStringList::Iterator it = LogoLanguageList.begin(); it != LogoLanguageList.end(); ++it ) { - *it = KGlobal::locale()->twoAlphaToLanguageName( (*it).left(2) ) + " (" + *it + ")"; + *it = TDEGlobal::locale()->twoAlphaToLanguageName( (*it).left(2) ) + " (" + *it + ")"; } kcfg_LanguageComboBox->insertStringList(LogoLanguageList); diff --git a/kturtle/src/kturtle.kcfg b/kturtle/src/kturtle.kcfg index dd57013a..f3fec672 100644 --- a/kturtle/src/kturtle.kcfg +++ b/kturtle/src/kturtle.kcfg @@ -26,7 +26,7 @@ // We assume keyword and highlight files come in pairs (if not there will be no highlight style) - TQStringList xmlFiles = KGlobal::dirs()->findAllResources("data", "kturtle/data/*.xml"); + TQStringList xmlFiles = TDEGlobal::dirs()->findAllResources("data", "kturtle/data/*.xml"); TQStringList LogoLanguageList; TQString xmlTranslationFiles; // for debug purposes for ( TQStringList::Iterator it = xmlFiles.begin(); it != xmlFiles.end(); ++it ) { @@ -52,7 +52,7 @@ // The KconfigXT framework makes shure the value that is saved in the kturtlerc file will be used in stead of the defaultLanguage that we find here. // Get the desktops language - KConfigBase *globalConf = KGlobal::config(); + KConfigBase *globalConf = TDEGlobal::config(); globalConf->setGroup("Locale"); TQString desktopLanguage = globalConf->readEntry("Language"); kdDebug(0) << "desktopLanguage: "<< desktopLanguage <<endl; diff --git a/kverbos/kverbos/kfeedercontrol.h b/kverbos/kverbos/kfeedercontrol.h index 635a6311..79a02cc0 100644 --- a/kverbos/kverbos/kfeedercontrol.h +++ b/kverbos/kverbos/kfeedercontrol.h @@ -39,14 +39,14 @@ public: bool addOne(); /** sends n points to the KFeeder */ bool addN(int n); - /** returns if the KProcess is still active. This is useful right after the start to + /** returns if the TDEProcess is still active. This is useful right after the start to * see if it was successful */ bool isActive() { return active; } /** returns the last result of the latest dcop operation */ bool getLastResult() { return lastResult; } private: - KProcess childFeeder; + TDEProcess childFeeder; TQCString feederID; bool active; bool lastResult; diff --git a/kverbos/kverbos/kstartuplogo.cpp b/kverbos/kverbos/kstartuplogo.cpp index b01088ec..3c5a5840 100644 --- a/kverbos/kverbos/kstartuplogo.cpp +++ b/kverbos/kverbos/kstartuplogo.cpp @@ -26,7 +26,7 @@ KStartupLogo::KStartupLogo(TQWidget * parent, const char *name) TQPixmap pm; pm.load(locate("appdata", "pics/startuplogo.png")); setBackgroundPixmap(pm); - TQRect desk = KGlobalSettings::splashScreenDesktopGeometry(); + TQRect desk = TDEGlobalSettings::splashScreenDesktopGeometry(); setGeometry(desk.center().x()-pm.width()/2, desk.center().y()-pm.height()/2, pm.width(),pm.height()); } diff --git a/kverbos/kverbos/kverbos.kcfg b/kverbos/kverbos/kverbos.kcfg index 4da6bd36..94b2cffc 100644 --- a/kverbos/kverbos/kverbos.kcfg +++ b/kverbos/kverbos/kverbos.kcfg @@ -8,7 +8,7 @@ - KConfigBase *globalConf = KGlobal::config(); + KConfigBase *globalConf = TDEGlobal::config(); globalConf->setGroup("Locale"); TQString m_language = globalConf->readEntry("Language", "en"); //keep only the first 2 characters diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg b/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg index 2aea0769..2eef8ebd 100644 --- a/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg +++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg @@ -133,11 +133,11 @@ - KGlobalSettings::generalFont() + TDEGlobalSettings::generalFont() - KGlobalSettings::generalFont() + TDEGlobalSettings::generalFont() diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp index 49f12597..ffdf44d4 100644 --- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp @@ -1007,16 +1007,16 @@ LangSet LanguageOptions::getLangSet () const void LanguageOptions::loadCountryData() { // temperary use of our locale as the global locale - KLocale *lsave = KGlobal::_locale; + KLocale *lsave = TDEGlobal::_locale; TQString curr_lang = lsave->language(); // KLocale locale("kvoctrain"); KLocale locale(TQString::null); locale.setLanguage(curr_lang); - KGlobal::_locale = &locale; + TDEGlobal::_locale = &locale; TQString sub = TQString::fromLatin1("l10n/"); - TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*.desktop")); + TQStringList regionlist = TDEGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*.desktop")); regionlist.sort(); TQMap regions; @@ -1040,7 +1040,7 @@ void LanguageOptions::loadCountryData() } // add all languages to the list - TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*/entry.desktop")); + TQStringList countrylist = TDEGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*/entry.desktop")); int idx = 0; for (TQStringList::ConstIterator sit = countrylist.begin(); sit != countrylist.end(); ++sit) @@ -1120,7 +1120,7 @@ void LanguageOptions::loadCountryData() } // restore the old global locale - KGlobal::_locale = lsave; + TDEGlobal::_locale = lsave; } diff --git a/kvoctrain/kvoctrain/kva_init.cpp b/kvoctrain/kvoctrain/kva_init.cpp index 9610355b..86cc7589 100644 --- a/kvoctrain/kvoctrain/kva_init.cpp +++ b/kvoctrain/kvoctrain/kva_init.cpp @@ -168,7 +168,7 @@ void kvoctrainApp::initActions() editRemoveSelectedArea->setWhatsThis(i18n("Delete the selected rows")); editRemoveSelectedArea->setToolTip(editRemoveSelectedArea->whatsThis()); - editSaveSelectedArea = new KAction(i18n("Save E&ntries in Query As..."), KGlobal::iconLoader()->loadIcon("filesaveas", KIcon::Small), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveSelection()), actionCollection(),"edit_save_selected_area"); + editSaveSelectedArea = new KAction(i18n("Save E&ntries in Query As..."), TDEGlobal::iconLoader()->loadIcon("filesaveas", KIcon::Small), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveSelection()), actionCollection(),"edit_save_selected_area"); editSaveSelectedArea->setWhatsThis(i18n("Save the entries in the query as a new vocabulary")); editSaveSelectedArea->setToolTip(editSaveSelectedArea->whatsThis()); diff --git a/kvoctrain/kvoctrain/kvoctraintable.cpp b/kvoctrain/kvoctrain/kvoctraintable.cpp index d432ab1b..10adff15 100644 --- a/kvoctrain/kvoctrain/kvoctraintable.cpp +++ b/kvoctrain/kvoctrain/kvoctraintable.cpp @@ -57,8 +57,8 @@ KVocTrainTable::KVocTrainTable(kvoctrainDoc *doc, const LangSet *ls, TQWidget *p triggerSect = -1; - m_pixInQuery = TQPixmap(KGlobal::iconLoader()->loadIcon("ok", KIcon::Small)); - m_pixInactive = TQPixmap(KGlobal::iconLoader()->loadIcon("no", KIcon::Small)); + m_pixInQuery = TQPixmap(TDEGlobal::iconLoader()->loadIcon("ok", KIcon::Small)); + m_pixInactive = TQPixmap(TDEGlobal::iconLoader()->loadIcon("no", KIcon::Small)); delayTimer = new TQTimer(this); connect(delayTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(menuTriggerTimeout())); @@ -288,7 +288,7 @@ void KVocTrainTable::headerPressEvent(int sec) void KVocTrainTable::setFont(const TQFont & font) { TQTable::setFont(font); - horizontalHeader()->setFont(KGlobalSettings::generalFont()); + horizontalHeader()->setFont(TDEGlobalSettings::generalFont()); for (unsigned i = 0; i < (unsigned) numRows(); ++i) setRowHeight(i, fontMetrics().lineSpacing()); } diff --git a/kvoctrain/kvoctrain/kvoctraintableitem.cpp b/kvoctrain/kvoctrain/kvoctraintableitem.cpp index 34b00912..b3d54a0b 100644 --- a/kvoctrain/kvoctrain/kvoctraintableitem.cpp +++ b/kvoctrain/kvoctrain/kvoctraintableitem.cpp @@ -60,7 +60,7 @@ TQWidget *KVocTrainTableItem::createEditor() const switch (col()) { case KV_COL_LESS: { TQComboBox *lessonbox = new TQComboBox(table()->viewport() ); - lessonbox->setFont(KGlobalSettings::generalFont()); + lessonbox->setFont(TDEGlobalSettings::generalFont()); lessonbox->insertItem (m_doc->getLessonDescr(0)); for (unsigned i = 1; i <= (unsigned) m_doc->numLessons(); ++i) lessonbox->insertItem (m_doc->getLessonDescr(i)); @@ -71,7 +71,7 @@ TQWidget *KVocTrainTableItem::createEditor() const case KV_COL_MARK: { TQComboBox *statebox = new TQComboBox(table()->viewport() ); - statebox->setFont(KGlobalSettings::generalFont()); + statebox->setFont(TDEGlobalSettings::generalFont()); statebox->insertItem (i18n("state of a row", "Active, Not in Query")); statebox->insertItem (i18n("state of a row", "In Query")); statebox->insertItem (i18n("state of a row", "Inactive")); diff --git a/kvoctrain/kvoctrain/kvoctrainview.cpp b/kvoctrain/kvoctrain/kvoctrainview.cpp index 30f19f6d..f3e9e76a 100644 --- a/kvoctrain/kvoctrain/kvoctrainview.cpp +++ b/kvoctrain/kvoctrain/kvoctrainview.cpp @@ -368,7 +368,7 @@ void kvoctrainView::newPage(TQPainter & painter, int res, int startCol, int endC TQRect cr; TQRect w = painter.window(); painter.resetXForm(); - painter.setFont(KGlobalSettings::generalFont()); + painter.setFont(TDEGlobalSettings::generalFont()); painter.drawText(marg, marg - 20, i18n("KVocTrain - %1").arg(m_doc->getTitle())); painter.translate(marg, marg); painter.drawLine(-1 , 0, -1, hh - 1); @@ -387,7 +387,7 @@ void kvoctrainView::newPage(TQPainter & painter, int res, int startCol, int endC void kvoctrainView::endOfPage(TQPainter & painter, int pageNum, int res) { painter.resetXForm(); - painter.setFont(KGlobalSettings::generalFont()); + painter.setFont(TDEGlobalSettings::generalFont()); TQRect w = painter.window(); TQRect r = painter.boundingRect(0, 0, 0, 0, AlignAuto, TQString::number(pageNum)); painter.drawText((w.width()/2) - (r.width()/2), w.height() - res + 20, TQString::number(pageNum)); diff --git a/kwordquiz/src/dlglanguage.cpp b/kwordquiz/src/dlglanguage.cpp index f142ee64..2b32ab6c 100644 --- a/kwordquiz/src/dlglanguage.cpp +++ b/kwordquiz/src/dlglanguage.cpp @@ -27,8 +27,8 @@ DlgLanguage::DlgLanguage(TQWidget *parent, const char *name, bool modal): KDialo { dlgBase = new DlgLanguageBase( this, "Dlg" ); setMainWidget(dlgBase); - dlgBase -> picLanguage1 -> setPixmap(KGlobal::iconLoader()->loadIcon("question", KIcon::Panel)); - dlgBase -> picLanguage2 -> setPixmap(KGlobal::iconLoader()->loadIcon("answer", KIcon::Panel)); + dlgBase -> picLanguage1 -> setPixmap(TDEGlobal::iconLoader()->loadIcon("question", KIcon::Panel)); + dlgBase -> picLanguage2 -> setPixmap(TDEGlobal::iconLoader()->loadIcon("answer", KIcon::Panel)); completion1 = new KCompletion(); completion1->setItems(Prefs::columnTitles1()); diff --git a/kwordquiz/src/flashview.cpp b/kwordquiz/src/flashview.cpp index a7561643..1daea15e 100644 --- a/kwordquiz/src/flashview.cpp +++ b/kwordquiz/src/flashview.cpp @@ -181,22 +181,22 @@ void FlashView::updateScore() TQString s; s = s.setNum(m_quiz->questionCount(), 10); lblScoreCount->setText(s); - picCount->setPixmap(KGlobal::iconLoader()->loadIcon("kwordquiz", KIcon::Panel)); + picCount->setPixmap(TDEGlobal::iconLoader()->loadIcon("kwordquiz", KIcon::Panel)); s = m_score->answerText(); lblScoreAnswered->setText(s); if (!s.isEmpty()) - picAnswered->setPixmap(KGlobal::iconLoader()->loadIcon("question", KIcon::Panel)); + picAnswered->setPixmap(TDEGlobal::iconLoader()->loadIcon("question", KIcon::Panel)); s = m_score->correctText(); lblScoreCorrect->setText(s); if (!s.isEmpty()) - picCorrect->setPixmap(KGlobal::iconLoader()->loadIcon("check", KIcon::Panel)); + picCorrect->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", KIcon::Panel)); s = m_score->errorText(); lblScoreError->setText(s); if (!s.isEmpty()) - picError->setPixmap(KGlobal::iconLoader()->loadIcon("error", KIcon::Panel)); + picError->setPixmap(TDEGlobal::iconLoader()->loadIcon("error", KIcon::Panel)); } void FlashView::slotTimer( ) diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp index a004094f..10dde982 100644 --- a/kwordquiz/src/kwordquiz.cpp +++ b/kwordquiz/src/kwordquiz.cpp @@ -205,11 +205,11 @@ void KWordQuizApp::initActions() KPopupMenu *popup = mode->popupMenu(); popup->clear(); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode1", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode1()), 0, 0); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode2", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode2()), 0, 1); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode3", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode3()), 0, 2); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode4", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode4()), 0, 3); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode5", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode5()), 0, 4); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode1", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode1()), 0, 0); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode2", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode2()), 0, 1); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode3", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode3()), 0, 2); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode4", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode4()), 0, 3); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode5", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode5()), 0, 4); mode1 = new KToggleAction("", "mode1", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode1()), actionCollection(),"mode_1"); mode2 = new KToggleAction("", "mode2", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode2()), actionCollection(),"mode_2"); diff --git a/kwordquiz/src/kwordquiz.kcfg b/kwordquiz/src/kwordquiz.kcfg index f4b5d6cb..18554adc 100644 --- a/kwordquiz/src/kwordquiz.kcfg +++ b/kwordquiz/src/kwordquiz.kcfg @@ -22,7 +22,7 @@ - KGlobalSettings::generalFont() + TDEGlobalSettings::generalFont() @@ -70,7 +70,7 @@ - KGlobalSettings::generalFont() + TDEGlobalSettings::generalFont() @@ -86,7 +86,7 @@ - KGlobalSettings::generalFont() + TDEGlobalSettings::generalFont() diff --git a/kwordquiz/src/kwordquizview.cpp b/kwordquiz/src/kwordquizview.cpp index bc6acc68..4b1f1cfc 100644 --- a/kwordquiz/src/kwordquizview.cpp +++ b/kwordquiz/src/kwordquizview.cpp @@ -141,7 +141,7 @@ void KWordQuizView::print(KPrinter *pPrinter) painter.drawLine(card_marg + card_width + card_text_marg, tPos + card_line_top, card_marg + card_width + card_width - card_text_marg, tPos + card_line_top); //draw headers - painter.setFont(KGlobalSettings::generalFont()); + painter.setFont(TDEGlobalSettings::generalFont()); painter.drawText(card_marg + card_text_marg, tPos, card_width, card_line_top, AlignAuto | AlignVCenter, horizontalHeader()->label(0)); painter.drawText(card_marg + card_width + card_text_marg, tPos, card_width, card_line_top, AlignAuto | AlignVCenter, horizontalHeader()->label(1)); //draw text @@ -167,7 +167,7 @@ void KWordQuizView::print(KPrinter *pPrinter) for (int rc = 0; rc < numRows(); ++rc) { painter.drawLine(lPos, tPos, lPos + gridWidth, tPos); - painter.setFont(KGlobalSettings::generalFont()); + painter.setFont(TDEGlobalSettings::generalFont()); painter.drawText(lPos, tPos, cw0 - pad, rowHeight(rc), AlignRight | AlignVCenter, TQString::number(rc + 1)); @@ -207,7 +207,7 @@ void KWordQuizView::doNewPage( TQPainter & painter, int res, int type ) TQRect w = painter.window(); - painter.setFont(KGlobalSettings::generalFont()); + painter.setFont(TDEGlobalSettings::generalFont()); if (type == 2) { @@ -238,7 +238,7 @@ void KWordQuizView::doNewPage( TQPainter & painter, int res, int type ) void KWordQuizView::doEndOfPage( TQPainter & painter, int vPos, int pageNum, int res, int type ) { int marg = res; - painter.setFont(KGlobalSettings::generalFont()); + painter.setFont(TDEGlobalSettings::generalFont()); TQRect w = painter.window(); TQRect r = painter.boundingRect(0, 0, 0, 0, AlignAuto, TQString::number(pageNum)); painter.drawText((w.width()/2) - (r.width()/2), w.height() - marg + 20, TQString::number(pageNum)); @@ -996,8 +996,8 @@ void KWordQuizView::addUndo( const TQString & caption ) void KWordQuizView::setFont( const TQFont & font) { TQTable::setFont(font); - horizontalHeader()->setFont(KGlobalSettings::generalFont()); - verticalHeader()->setFont(KGlobalSettings::generalFont()); + horizontalHeader()->setFont(TDEGlobalSettings::generalFont()); + verticalHeader()->setFont(TDEGlobalSettings::generalFont()); for (int i = 0; i < numRows(); ++i) adjustRow(i); //setRowHeight(i, fontMetrics().lineSpacing() ); } diff --git a/kwordquiz/src/multipleview.cpp b/kwordquiz/src/multipleview.cpp index b7376952..879bc450 100644 --- a/kwordquiz/src/multipleview.cpp +++ b/kwordquiz/src/multipleview.cpp @@ -120,7 +120,7 @@ void MultipleView::slotCheck() if (fIsCorrect) { - picYourAnswer->setPixmap(KGlobal::iconLoader()->loadIcon("check", KIcon::Panel)); + picYourAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", KIcon::Panel)); lblCorrectHeader->clear(); picCorrectAnswer->clear(); lblCorrect->clear(); @@ -132,11 +132,11 @@ void MultipleView::slotCheck() { m_error++; - picYourAnswer->setPixmap(KGlobal::iconLoader()->loadIcon("error", KIcon::Panel)); + picYourAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("error", KIcon::Panel)); lblCorrect->setText(m_quiz->answer(m_question)); //lblCorrect->setFont(m_quiz->fontAnswer(m_question)); - picCorrectAnswer->setPixmap(KGlobal::iconLoader()->loadIcon("check", KIcon::Panel)); + picCorrectAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", KIcon::Panel)); lblCorrectHeader->setText(i18n("Correct Answer")); m_score->countIncrement(WTQScore::cdError); updateScore(); @@ -146,7 +146,7 @@ void MultipleView::slotCheck() lblPreviousQuestionHeader->setText(i18n("Previous Question")); lblPreviousQuestion->setText(m_quiz->question(m_question)); //lblPreviousQuestion->setFont(m_quiz->fontQuestion(m_question)); - picPrevious->setPixmap(KGlobal::iconLoader()->loadIcon("question", KIcon::Panel)); + picPrevious->setPixmap(TDEGlobal::iconLoader()->loadIcon("question", KIcon::Panel)); lblYourAnswerHeader->setText(i18n("Your Answer")); lblYourAnswer->setText(m_quiz->yourAnswer(m_question, ans)); @@ -168,7 +168,7 @@ void MultipleView::slotCheck() opt1->hide(); opt2->hide(); opt3->hide(); - picQuestion->setPixmap(KGlobal::iconLoader()->loadIcon("kwordquiz", KIcon::Panel)); + picQuestion->setPixmap(TDEGlobal::iconLoader()->loadIcon("kwordquiz", KIcon::Panel)); picAnswer->clear(); } } @@ -224,22 +224,22 @@ void MultipleView::updateScore() TQString s; s = s.setNum(m_quiz->questionCount(), 10); lblScoreCount->setText(s); - picCount->setPixmap(KGlobal::iconLoader()->loadIcon("kwordquiz", KIcon::Panel)); + picCount->setPixmap(TDEGlobal::iconLoader()->loadIcon("kwordquiz", KIcon::Panel)); s = m_score->answerText(); lblScoreAnswered->setText(s); if (!s.isEmpty()) - picAnswered->setPixmap(KGlobal::iconLoader()->loadIcon("question", KIcon::Panel)); + picAnswered->setPixmap(TDEGlobal::iconLoader()->loadIcon("question", KIcon::Panel)); s = m_score->correctText(); lblScoreCorrect->setText(s); if (!s.isEmpty()) - picCorrect->setPixmap(KGlobal::iconLoader()->loadIcon("check", KIcon::Panel)); + picCorrect->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", KIcon::Panel)); s = m_score->errorText(); lblScoreError->setText(s); if (!s.isEmpty()) - picError->setPixmap(KGlobal::iconLoader()->loadIcon("error", KIcon::Panel)); + picError->setPixmap(TDEGlobal::iconLoader()->loadIcon("error", KIcon::Panel)); } @@ -253,7 +253,7 @@ void MultipleView::showQuestion(int i) lblQuestion -> setText(m_quiz ->question(i)); //lblQuestion -> setFont(m_quiz->fontQuestion(i)); - picQuestion->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiLeftCol), KIcon::Panel)); + picQuestion->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiLeftCol), KIcon::Panel)); lblAnswerLanguage -> setText(m_quiz ->langAnswer(i)); @@ -278,7 +278,7 @@ void MultipleView::showQuestion(int i) opt2->setChecked(false); opt3->setChecked(false); - picAnswer->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiRightCol), KIcon::Panel)); + picAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiRightCol), KIcon::Panel)); } void MultipleView::slotApplySettings( ) diff --git a/kwordquiz/src/qaview.cpp b/kwordquiz/src/qaview.cpp index 141873ec..049b4e19 100644 --- a/kwordquiz/src/qaview.cpp +++ b/kwordquiz/src/qaview.cpp @@ -150,7 +150,7 @@ void QAView::slotCheck() if (fIsCorrect) { - picYourAnswer->setPixmap(KGlobal::iconLoader()->loadIcon("check", KIcon::Panel)); + picYourAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", KIcon::Panel)); lblYourAnswer->setText(m_quiz->yourAnswer(m_question, txtAnswer->text())); lblCorrectHeader->clear(); picCorrectAnswer->clear(); @@ -163,10 +163,10 @@ void QAView::slotCheck() { m_error++; - picYourAnswer->setPixmap(KGlobal::iconLoader()->loadIcon("error", KIcon::Panel)); + picYourAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("error", KIcon::Panel)); lblYourAnswer->setText(highlightError(m_quiz->answer(m_question), m_quiz->yourAnswer(m_question, txtAnswer->text()))); lblCorrect->setText(m_quiz->answer(m_question)); - picCorrectAnswer->setPixmap(KGlobal::iconLoader()->loadIcon("check", KIcon::Panel)); + picCorrectAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", KIcon::Panel)); lblCorrectHeader->setText(i18n("Correct Answer")); m_score->countIncrement(WTQScore::cdError); updateScore(); @@ -175,7 +175,7 @@ void QAView::slotCheck() lblPreviousQuestionHeader->setText(i18n("Previous Question")); lblPreviousQuestion->setText(m_quiz->question(m_question)); - picPrevious->setPixmap(KGlobal::iconLoader()->loadIcon("question", KIcon::Panel)); + picPrevious->setPixmap(TDEGlobal::iconLoader()->loadIcon("question", KIcon::Panel)); lblYourAnswerHeader->setText(i18n("Your Answer")); if (++m_question < m_quiz->questionCount()) @@ -194,7 +194,7 @@ void QAView::slotCheck() lblAnswerLanguage->clear(); lblAnswerBlank->hide(); txtAnswer->hide(); - picQuestion->setPixmap(KGlobal::iconLoader()->loadIcon("kwordquiz", KIcon::Panel)); + picQuestion->setPixmap(TDEGlobal::iconLoader()->loadIcon("kwordquiz", KIcon::Panel)); picAnswer->clear(); } } @@ -245,22 +245,22 @@ void QAView::updateScore() TQString s; s = s.setNum(m_quiz->questionCount(), 10); lblScoreCount->setText(s); - picCount->setPixmap(KGlobal::iconLoader()->loadIcon("kwordquiz", KIcon::Panel)); + picCount->setPixmap(TDEGlobal::iconLoader()->loadIcon("kwordquiz", KIcon::Panel)); s = m_score->answerText(); lblScoreAnswered->setText(s); if (!s.isEmpty()) - picAnswered->setPixmap(KGlobal::iconLoader()->loadIcon("question", KIcon::Panel)); + picAnswered->setPixmap(TDEGlobal::iconLoader()->loadIcon("question", KIcon::Panel)); s = m_score->correctText(); lblScoreCorrect->setText(s); if (!s.isEmpty()) - picCorrect->setPixmap(KGlobal::iconLoader()->loadIcon("check", KIcon::Panel)); + picCorrect->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", KIcon::Panel)); s = m_score->errorText(); lblScoreError->setText(s); if (!s.isEmpty()) - picError->setPixmap(KGlobal::iconLoader()->loadIcon("error", KIcon::Panel)); + picError->setPixmap(TDEGlobal::iconLoader()->loadIcon("error", KIcon::Panel)); } @@ -274,7 +274,7 @@ void QAView::showQuestion(int i) lblQuestion -> setText(m_quiz ->question(i)); //lblQuestion -> setFont(m_quiz->fontQuestion(i)); - picQuestion->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiLeftCol), KIcon::Panel)); + picQuestion->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiLeftCol), KIcon::Panel)); lblAnswerLanguage -> setText(m_quiz ->langAnswer(i)); @@ -290,7 +290,7 @@ void QAView::showQuestion(int i) //txtAnswer->setFont(m_quiz->fontAnswer(i)); txtAnswer -> setText(""); - picAnswer->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiRightCol), KIcon::Panel)); + picAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiRightCol), KIcon::Panel)); //@todo handle keyboard layouts } diff --git a/libtdeedu/extdate/extcalendarsystem.cpp b/libtdeedu/extdate/extcalendarsystem.cpp index 58960986..38465749 100644 --- a/libtdeedu/extdate/extcalendarsystem.cpp +++ b/libtdeedu/extdate/extcalendarsystem.cpp @@ -54,7 +54,7 @@ const KLocale * ExtCalendarSystem::locale() const if ( d->locale ) return d->locale; - return KGlobal::locale(); + return TDEGlobal::locale(); } TQString ExtCalendarSystem::dayString(const ExtDate & pDate, bool bShort) const diff --git a/libtdeedu/extdate/extdatepicker.cpp b/libtdeedu/extdate/extdatepicker.cpp index 7d167a98..e9f2f4fe 100644 --- a/libtdeedu/extdate/extdatepicker.cpp +++ b/libtdeedu/extdate/extdatepicker.cpp @@ -60,7 +60,7 @@ void ExtDatePicker::fillWeeksCombo(const ExtDate &date) // every year can have a different number of weeks //must remain commented unless ExtDate stuff gets added to tdelibs -// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar(); +// const ExtCalendarSystem * calendar = TDEGlobal::locale()->calendar(); // it could be that we had 53,1..52 and now 1..53 which is the same number but different // so always fill with new values @@ -139,9 +139,9 @@ void ExtDatePicker::init( const ExtDate &dt ) line = new KLineEdit(this); val = new ExtDateValidator(this); table = new ExtDateTable(this); - fontsize = KGlobalSettings::generalFont().pointSize(); + fontsize = TDEGlobalSettings::generalFont().pointSize(); if (fontsize == -1) - fontsize = TQFontInfo(KGlobalSettings::generalFont()).pointSize(); + fontsize = TQFontInfo(TDEGlobalSettings::generalFont()).pointSize(); fontsize++; // Make a little bigger @@ -240,10 +240,10 @@ ExtDatePicker::dateChangedSlot(const ExtDate &date) //must remain commented unless ExtDate gets added to tdelibs -// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar(); +// const ExtCalendarSystem * calendar = TDEGlobal::locale()->calendar(); -// line->setText(KGlobal::locale()->formatDate(date, true)); - line->setText( date.toString( KGlobal::locale()->dateFormatShort() ) ); +// line->setText(TDEGlobal::locale()->formatDate(date, true)); + line->setText( date.toString( TDEGlobal::locale()->dateFormatShort() ) ); selectMonth->setText(d->calendar->monthName(date, false)); fillWeeksCombo(date); @@ -295,7 +295,7 @@ void ExtDatePicker::monthForwardClicked() { ExtDate temp; -// temp = KGlobal::locale()->calendar()->addMonths( table->getDate(), 1 ); +// temp = TDEGlobal::locale()->calendar()->addMonths( table->getDate(), 1 ); temp = d->calendar->addMonths( table->getDate(), 1 ); setDate( temp ); } @@ -304,7 +304,7 @@ void ExtDatePicker::monthBackwardClicked() { ExtDate temp; -// temp = KGlobal::locale()->calendar()->addMonths( table->getDate(), -1 ); +// temp = TDEGlobal::locale()->calendar()->addMonths( table->getDate(), -1 ); temp = d->calendar->addMonths( table->getDate(), -1 ); setDate( temp ); } @@ -313,7 +313,7 @@ void ExtDatePicker::yearForwardClicked() { ExtDate temp; -// temp = KGlobal::locale()->calendar()->addYears( table->getDate(), 1 ); +// temp = TDEGlobal::locale()->calendar()->addYears( table->getDate(), 1 ); temp = d->calendar->addYears( table->getDate(), 1 ); setDate( temp ); } @@ -322,7 +322,7 @@ void ExtDatePicker::yearBackwardClicked() { ExtDate temp; -// temp = KGlobal::locale()->calendar()->addYears( table->getDate(), -1 ); +// temp = TDEGlobal::locale()->calendar()->addYears( table->getDate(), -1 ); temp = d->calendar->addYears( table->getDate(), -1 ); setDate( temp ); } @@ -332,7 +332,7 @@ void ExtDatePicker::selectWeekClicked() {} // ### in 3.2 obsolete; kept for bin void ExtDatePicker::weekSelected(int week) { -// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar(); +// const ExtCalendarSystem * calendar = TDEGlobal::locale()->calendar(); ExtDate date = table->getDate(); int year = d->calendar->year(date); @@ -349,7 +349,7 @@ void ExtDatePicker::selectMonthClicked() { // every year can have different month names (in some calendar systems) -// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar(); +// const ExtCalendarSystem * calendar = TDEGlobal::locale()->calendar(); ExtDate date = table->getDate(); int i, month, months = d->calendar->monthsInYear(date); @@ -375,7 +375,7 @@ ExtDatePicker::selectMonthClicked() void ExtDatePicker::selectYearClicked() { -// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar(); +// const ExtCalendarSystem * calendar = TDEGlobal::locale()->calendar(); if (selectYear->state() == TQButton::Off) { diff --git a/libtdeedu/extdate/extdatetbl.cpp b/libtdeedu/extdate/extdatetbl.cpp index 78c7c9a8..295f1442 100644 --- a/libtdeedu/extdate/extdatetbl.cpp +++ b/libtdeedu/extdate/extdatetbl.cpp @@ -99,7 +99,7 @@ TQValidator::State ExtDateValidator::date(const TQString& text, ExtDate& ed) const { //FIXME: Can't uncomment unless ExtDate is adopted by KDE - //ExtDate tmp = KGlobal::locale()->readDate(text); + //ExtDate tmp = TDEGlobal::locale()->readDate(text); ExtDate tmp = ExtDate::fromString( text ); if (!tmp.isNull()) @@ -131,7 +131,7 @@ ExtDateTable::ExtDateTable(TQWidget *parent, ExtDate date_, const char* name, WF setNumCols(7); // 7 days a week setHScrollBarMode(AlwaysOff); setVScrollBarMode(AlwaysOff); - viewport()->setEraseColor(KGlobalSettings::baseColor()); + viewport()->setEraseColor(TDEGlobalSettings::baseColor()); setDate(date_); // this initializes firstday, numdays, numDaysPrevMonth } @@ -143,8 +143,8 @@ ExtDateTable::~ExtDateTable() int ExtDateTable::posFromDate( const ExtDate &dt ) { //FIXME: Can't uncomment unless ExtDate is added to tdelibs -// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar(); -// const int firstWeekDay = KGlobal::locale()->weekStartDay(); +// const ExtCalendarSystem * calendar = TDEGlobal::locale()->calendar(); +// const int firstWeekDay = TDEGlobal::locale()->weekStartDay(); const int firstWeekDay = 7; @@ -161,8 +161,8 @@ ExtDate ExtDateTable::dateFromPos( int pos ) ExtDate pCellDate; //FIXME: Can't uncomment unless ExtDate is added to tdelibs -// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar(); -// int firstWeekDay = KGlobal::locale()->weekStartDay(); +// const ExtCalendarSystem * calendar = TDEGlobal::locale()->calendar(); +// int firstWeekDay = TDEGlobal::locale()->weekStartDay(); const int firstWeekDay = 7; d->calendar->setYMD(pCellDate, d->calendar->year(date), d->calendar->month(date), 1); @@ -180,8 +180,8 @@ void ExtDateTable::paintCell(TQPainter *painter, int row, int col) { //FIXME: Can't uncomment unless ExtDate is added to tdelibs -// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar(); -// int firstWeekDay = KGlobal::locale()->weekStartDay(); +// const ExtCalendarSystem * calendar = TDEGlobal::locale()->calendar(); +// int firstWeekDay = TDEGlobal::locale()->weekStartDay(); const int firstWeekDay = 7; TQRect rect; @@ -189,7 +189,7 @@ ExtDateTable::paintCell(TQPainter *painter, int row, int col) TQPen pen; int w=cellWidth(); int h=cellHeight(); - TQFont font=KGlobalSettings::generalFont(); + TQFont font=TDEGlobalSettings::generalFont(); // ----- if(row==0) @@ -205,8 +205,8 @@ ExtDateTable::paintCell(TQPainter *painter, int row, int col) TQBrush brushTitle(); TQBrush brushInvertTitle(colorGroup().base()); - TQColor titleColor(isEnabled()?( KGlobalSettings::activeTitleColor() ):( KGlobalSettings::inactiveTitleColor() ) ); - TQColor textColor(isEnabled()?( KGlobalSettings::activeTextColor() ):( KGlobalSettings::inactiveTextColor() ) ); + TQColor titleColor(isEnabled()?( TDEGlobalSettings::activeTitleColor() ):( TDEGlobalSettings::inactiveTitleColor() ) ); + TQColor textColor(isEnabled()?( TDEGlobalSettings::activeTextColor() ):( TDEGlobalSettings::inactiveTextColor() ) ); if (!normalday) { painter->setPen(textColor); @@ -303,7 +303,7 @@ void ExtDateTable::keyPressEvent( TQKeyEvent *e ) { //FIXME: Can't uncomment unless ExtDate is added to tdelibs -// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar(); +// const ExtCalendarSystem * calendar = TDEGlobal::locale()->calendar(); ExtDate temp = date; @@ -373,7 +373,7 @@ void ExtDateTable::setFontSize(int size) { //FIXME: Can't uncomment unless ExtDate is added to tdelibs -// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar(); +// const ExtCalendarSystem * calendar = TDEGlobal::locale()->calendar(); int count; TQFontMetrics metrics(fontMetrics()); @@ -454,7 +454,7 @@ ExtDateTable::contentsMousePressEvent(TQMouseEvent *e) //FIXME: Uncomment the following line (and remove the one after it) // if ExtDate is added to tdelibs -// menu->insertTitle( KGlobal::locale()->formatDate(clickedDate) ); +// menu->insertTitle( TDEGlobal::locale()->formatDate(clickedDate) ); menu->insertTitle( clickedDate.toString() ); emit aboutToShowContextMenu( menu, clickedDate ); @@ -482,7 +482,7 @@ ExtDateTable::setDate(const ExtDate& date_) } //FIXME: Can't uncomment the following unless ExtDate is moved to tdelibs -// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar(); +// const ExtCalendarSystem * calendar = TDEGlobal::locale()->calendar(); d->calendar->setYMD(temp, d->calendar->year(date), d->calendar->month(date), 1); //temp.setYMD(date.year(), date.month(), 1); @@ -572,7 +572,7 @@ ExtDateInternalWeekSelector::ExtDateInternalWeekSelector { TQFont font; // ----- - font=KGlobalSettings::generalFont(); + font=TDEGlobalSettings::generalFont(); setFont(font); setFrameStyle(TQFrame::NoFrame); setValidator(val); @@ -643,14 +643,14 @@ ExtDateInternalMonthPicker::ExtDateInternalMonthPicker result(0) // invalid { //FIXME: Can't uncomment the following unless ExtDate is moved to tdelibs -// ExtCalendarSystem *calendar = KGlobal::locale()->calendar(); +// ExtCalendarSystem *calendar = TDEGlobal::locale()->calendar(); TQRect rect; TQFont font; // ----- activeCol = -1; activeRow = -1; - font=KGlobalSettings::generalFont(); + font=TDEGlobalSettings::generalFont(); setFont(font); setHScrollBarMode(AlwaysOff); setVScrollBarMode(AlwaysOff); @@ -661,7 +661,7 @@ ExtDateInternalMonthPicker::ExtDateInternalMonthPicker setNumRows( (d->calendar->monthsInYear(date) + 2) / 3); // enable to find drawing failures: // setTableFlags(Tbl_clipCellPainting); - viewport()->setEraseColor(KGlobalSettings::baseColor()); // for consistency with the datepicker + viewport()->setEraseColor(TDEGlobalSettings::baseColor()); // for consistency with the datepicker // ----- find the preferred size // (this is slow, possibly, but unfortunately it is needed here): TQFontMetrics metrics(font); @@ -692,7 +692,7 @@ ExtDateInternalMonthPicker::getResult() const void ExtDateInternalMonthPicker::setupPainter(TQPainter *p) { - p->setPen(KGlobalSettings::textColor()); + p->setPen(TDEGlobalSettings::textColor()); } void @@ -819,7 +819,7 @@ ExtDateInternalYearSelector::ExtDateInternalYearSelector { TQFont font; // ----- - font=KGlobalSettings::generalFont(); + font=TDEGlobalSettings::generalFont(); setFont(font); setFrameStyle(TQFrame::NoFrame); // set year limits (perhaps we should get rid of limits altogether) @@ -923,7 +923,7 @@ void KPopupFrame::popup(const TQPoint &pos) { // Make sure the whole popup is visible. - TQRect d = KGlobalSettings::desktopGeometry(pos); + TQRect d = TDEGlobalSettings::desktopGeometry(pos); int x = pos.x(); int y = pos.y(); diff --git a/libtdeedu/extdate/extdatetime.cpp b/libtdeedu/extdate/extdatetime.cpp index 681db123..3efcfdbd 100644 --- a/libtdeedu/extdate/extdatetime.cpp +++ b/libtdeedu/extdate/extdatetime.cpp @@ -258,7 +258,7 @@ TQString ExtDate::toString( Qt::DateFormat f) const break; case Qt::LocalDate : // local settings - a_format = KGlobal::locale()->dateFormat(); + a_format = TDEGlobal::locale()->dateFormat(); break; default : @@ -803,8 +803,8 @@ TQString ExtDateTime::toString( Qt::DateFormat f ) const } #endif else if ( f == Qt::LocalDate ) { - return toString( KGlobal::locale()->dateFormat() - + " " + KGlobal::locale()->timeFormat() ); + return toString( TDEGlobal::locale()->dateFormat() + + " " + TDEGlobal::locale()->timeFormat() ); } return TQString(); diff --git a/libtdeedu/extdate/extdatewidget.cpp b/libtdeedu/extdate/extdatewidget.cpp index bd0163d3..014c8568 100644 --- a/libtdeedu/extdate/extdatewidget.cpp +++ b/libtdeedu/extdate/extdatewidget.cpp @@ -73,7 +73,7 @@ ExtDateWidget::ExtDateWidget( const ExtDate &date, TQWidget *parent, // void ExtDateWidget::init() // { // d = new ExtDateWidgetPrivate; -// KLocale *locale = KGlobal::locale(); +// KLocale *locale = TDEGlobal::locale(); // TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); // layout->setAutoAdd(true); // d->m_day = new ExtDateWidgetSpinBox(1, 1, this); @@ -97,7 +97,7 @@ ExtDateWidget::ExtDateWidget( const ExtDate &date, TQWidget *parent, void ExtDateWidget::init(const ExtDate& date) { d = new ExtDateWidgetPrivate; - //KLocale *locale = KGlobal::locale(); + //KLocale *locale = TDEGlobal::locale(); TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); layout->setAutoAdd(true); d->m_day = new ExtDateWidgetSpinBox(1, 1, this); @@ -125,7 +125,7 @@ ExtDateWidget::~ExtDateWidget() void ExtDateWidget::setDate( const ExtDate &date ) { -// const KCalendarSystem * calendar = KGlobal::locale()->calendar(); +// const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); d->m_day->blockSignals(true); d->m_month->blockSignals(true); @@ -151,7 +151,7 @@ ExtDate ExtDateWidget::date() const void ExtDateWidget::slotDateChanged( ) { -// const KCalendarSystem * calendar = KGlobal::locale()->calendar(); +// const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); ExtDate date; int y,m,day;