diff options
93 files changed, 226 insertions, 226 deletions
diff --git a/atlantik/ChangeLog b/atlantik/ChangeLog index 8f889261..a6b10b98 100644 --- a/atlantik/ChangeLog +++ b/atlantik/ChangeLog @@ -106,7 +106,7 @@ - fixed potential double initialization of gameboard - don't crash when removing money from a trade -- properly quote arguments given to KProcess in kio_atlantik +- properly quote arguments given to TDEProcess in kio_atlantik - valgrind leak and unitialised memory access fixes 0.5.0 diff --git a/atlantik/client/atlantik.cpp b/atlantik/client/atlantik.cpp index 8cd33f2c..fbdba102 100644 --- a/atlantik/client/atlantik.cpp +++ b/atlantik/client/atlantik.cpp @@ -147,7 +147,7 @@ Atlantik::Atlantik () // Mix code and XML into GUI KMainWindow::createGUI(); - applyMainWindowSettings( KGlobal::config(), "AtlantikMainWindow" ); + applyMainWindowSettings( TDEGlobal::config(), "AtlantikMainWindow" ); KMainWindow::statusBar()->insertItem("Atlantik " ATLANTIK_VERSION_STRING, 0); KMainWindow::statusBar()->insertItem(TQString(), 1); connect(statusBar(), TQT_SIGNAL(released(int)), TQT_TQOBJECT(this), TQT_SLOT(statusBarClick(int))); diff --git a/atlantik/client/main.cpp b/atlantik/client/main.cpp index ec677a57..21a3f0ed 100644 --- a/atlantik/client/main.cpp +++ b/atlantik/client/main.cpp @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) TDEApplication::addCmdLineOptions(); TDEApplication kapplication; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); if (kapplication.isRestored()) RESTORE(Atlantik) diff --git a/atlantik/kio_atlantik/kio_atlantik.cpp b/atlantik/kio_atlantik/kio_atlantik.cpp index 95eca5fa..d999e51b 100644 --- a/atlantik/kio_atlantik/kio_atlantik.cpp +++ b/atlantik/kio_atlantik/kio_atlantik.cpp @@ -45,11 +45,11 @@ extern "C" void AtlantikProtocol::get( const KURL& url ) { - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "atlantik"; #ifdef KDE_3_1_FEATURES - TQString host = url.hasHost() ? url.host() : KProcess::quote( url.queryItem("host") ); + TQString host = url.hasHost() ? url.host() : TDEProcess::quote( url.queryItem("host") ); #else TQString host = url.hasHost() ? url.host() : url.queryItem("host"); #endif @@ -64,7 +64,7 @@ void AtlantikProtocol::get( const KURL& url ) *proc << "--game" << gameString; } - proc->start(KProcess::DontCare); + proc->start(TDEProcess::DontCare); proc->detach(); finished(); } diff --git a/atlantik/libatlantikui/estatedetails.cpp b/atlantik/libatlantikui/estatedetails.cpp index 4a601ddf..e4e52ea1 100644 --- a/atlantik/libatlantikui/estatedetails.cpp +++ b/atlantik/libatlantikui/estatedetails.cpp @@ -174,11 +174,11 @@ void EstateDetails::paintEvent(TQPaintEvent *) // Estate name painter.setPen(TQt::white); - int fontSize = KGlobalSettings::generalFont().pointSize(); + int fontSize = TDEGlobalSettings::generalFont().pointSize(); if (fontSize == -1) - fontSize = KGlobalSettings::generalFont().pixelSize(); + fontSize = TDEGlobalSettings::generalFont().pixelSize(); - painter.setFont(TQFont(KGlobalSettings::generalFont().family(), fontSize * 2, TQFont::Bold)); + painter.setFont(TQFont(TDEGlobalSettings::generalFont().family(), fontSize * 2, TQFont::Bold)); painter.drawText(KDialog::marginHint(), KDialog::marginHint(), width()-KDialog::marginHint(), titleHeight, TQt::AlignJustify, m_estate->name()); painter.setPen(TQt::black); @@ -189,12 +189,12 @@ void EstateDetails::paintEvent(TQPaintEvent *) if (m_estate->estateGroup()) { xText = titleHeight - fontSize - KDialog::marginHint(); - painter.setFont(TQFont(KGlobalSettings::generalFont().family(), fontSize, TQFont::Bold)); + painter.setFont(TQFont(TDEGlobalSettings::generalFont().family(), fontSize, TQFont::Bold)); painter.drawText(5, xText, width()-10, titleHeight, TQt::AlignRight, m_estate->estateGroup()->name().upper()); } xText = titleHeight + fontSize + 5; - painter.setFont(TQFont(KGlobalSettings::generalFont().family(), fontSize, TQFont::Normal)); + painter.setFont(TQFont(TDEGlobalSettings::generalFont().family(), fontSize, TQFont::Normal)); } b_recreate = false; diff --git a/atlantik/libatlantikui/estateview.cpp b/atlantik/libatlantikui/estateview.cpp index 407f80e3..a9f4b83d 100644 --- a/atlantik/libatlantikui/estateview.cpp +++ b/atlantik/libatlantikui/estateview.cpp @@ -401,7 +401,7 @@ void EstateView::paintEvent(TQPaintEvent *) delete quartzBuffer; } - TQFont font = TQFont( KGlobalSettings::generalFont().family(), KGlobalSettings::generalFont().pointSize(), TQFont::Normal ); + TQFont font = TQFont( TDEGlobalSettings::generalFont().family(), TDEGlobalSettings::generalFont().pointSize(), TQFont::Normal ); painter.setFont(font); TQString estateName = m_estate->name(); #if defined(TDE_MAKE_VERSION) diff --git a/atlantik/libatlantikui/kwrappedlistviewitem.cpp b/atlantik/libatlantikui/kwrappedlistviewitem.cpp index 38c0d636..eb0a0d9e 100644 --- a/atlantik/libatlantikui/kwrappedlistviewitem.cpp +++ b/atlantik/libatlantikui/kwrappedlistviewitem.cpp @@ -64,7 +64,7 @@ void KWrappedListViewItem::wrapColumn( int c ) if ( !lv ) return; - TQFont font = TQFont( KGlobalSettings::generalFont().family(), KGlobalSettings::generalFont().pointSize(), TQFont::Normal ); + TQFont font = TQFont( TDEGlobalSettings::generalFont().family(), TDEGlobalSettings::generalFont().pointSize(), TQFont::Normal ); TQFontMetrics fm = TQFontMetrics( font ); int wrapWidth = lv->width(); diff --git a/atlantik/libatlantikui/portfolioview.cpp b/atlantik/libatlantikui/portfolioview.cpp index 1cd6d2e8..df24c6df 100644 --- a/atlantik/libatlantikui/portfolioview.cpp +++ b/atlantik/libatlantikui/portfolioview.cpp @@ -216,7 +216,7 @@ void PortfolioView::paintEvent(TQPaintEvent *) } painter.setPen(TQt::white); - painter.setFont(TQFont(KGlobalSettings::generalFont().family(), KGlobalSettings::generalFont().pointSize(), TQFont::Bold)); + painter.setFont(TQFont(TDEGlobalSettings::generalFont().family(), TDEGlobalSettings::generalFont().pointSize(), TQFont::Bold)); painter.drawText(ICONSIZE + KDialog::marginHint(), 15, m_player->name()); if ( m_portfolioEstates.count() ) @@ -226,7 +226,7 @@ void PortfolioView::paintEvent(TQPaintEvent *) painter.setPen(TQt::black); painter.setBrush(TQt::white); - painter.setFont(TQFont(KGlobalSettings::generalFont().family(), KGlobalSettings::generalFont().pointSize(), TQFont::Normal)); + painter.setFont(TQFont(TDEGlobalSettings::generalFont().family(), TDEGlobalSettings::generalFont().pointSize(), TQFont::Normal)); painter.drawText(ICONSIZE + KDialog::marginHint(), 30, m_player->host()); } diff --git a/atlantik/libatlantikui/token.cpp b/atlantik/libatlantikui/token.cpp index bb60e5ed..81cad373 100644 --- a/atlantik/libatlantikui/token.cpp +++ b/atlantik/libatlantikui/token.cpp @@ -53,7 +53,7 @@ Token::Token(Player *player, AtlantikBoard *parent, const char *name) : TQWidget m_image = 0; loadIcon(); - setFixedSize(TQSize(TOKEN_ICONSIZE, TOKEN_ICONSIZE + KGlobalSettings::generalFont().pointSize())); + setFixedSize(TQSize(TOKEN_ICONSIZE, TOKEN_ICONSIZE + TDEGlobalSettings::generalFont().pointSize())); } Token::~Token() @@ -140,10 +140,10 @@ void Token::paintEvent(TQPaintEvent *) painter.setPen(TQt::black); painter.setBrush(TQt::black); - painter.drawRect(0, TOKEN_ICONSIZE, width(), KGlobalSettings::generalFont().pointSize()); + painter.drawRect(0, TOKEN_ICONSIZE, width(), TDEGlobalSettings::generalFont().pointSize()); painter.setPen(TQt::white); - painter.setFont(TQFont(KGlobalSettings::generalFont().family(), KGlobalSettings::generalFont().pointSize(), TQFont::DemiBold)); + painter.setFont(TQFont(TDEGlobalSettings::generalFont().family(), TDEGlobalSettings::generalFont().pointSize(), TQFont::DemiBold)); painter.drawText(1, height()-1, (m_player ? m_player->name() : TQString())); b_recreate = false; diff --git a/kasteroids/main.cpp b/kasteroids/main.cpp index 8cf87921..24992bf2 100644 --- a/kasteroids/main.cpp +++ b/kasteroids/main.cpp @@ -30,9 +30,9 @@ int main( int argc, char *argv[] ) TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication app; - KGlobal::locale()->insertCatalogue("libtdegames"); - KGlobal::dirs()->addResourceType("sprite", KStandardDirs::kde_default("data") + "kasteroids/sprites/"); - KGlobal::dirs()->addResourceType("sounds", KStandardDirs::kde_default("data") + "kasteroids/sounds/"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::dirs()->addResourceType("sprite", KStandardDirs::kde_default("data") + "kasteroids/sprites/"); + TDEGlobal::dirs()->addResourceType("sounds", KStandardDirs::kde_default("data") + "kasteroids/sounds/"); #ifdef KA_ENABLE_SOUND // setup mcop communication diff --git a/kasteroids/toplevel.cpp b/kasteroids/toplevel.cpp index c9bde61b..cf9c5795 100644 --- a/kasteroids/toplevel.cpp +++ b/kasteroids/toplevel.cpp @@ -89,7 +89,7 @@ KAstTopLevel::KAstTopLevel() TQHBoxLayout *hbd = new TQHBoxLayout; vb->addLayout( hb ); - TQFont labelFont( KGlobalSettings::generalFont().family(), 24 ); + TQFont labelFont( TDEGlobalSettings::generalFont().family(), 24 ); TQColorGroup grp( darkGreen, black, TQColor( 128, 128, 128 ), TQColor( 64, 64, 64 ), black, darkGreen, black ); TQPalette pal( grp, grp, grp ); @@ -160,11 +160,11 @@ KAstTopLevel::KAstTopLevel() vb->addLayout( hbd ); - TQFont smallFont( KGlobalSettings::generalFont().family(), 14 ); + TQFont smallFont( TDEGlobalSettings::generalFont().family(), 14 ); hbd->addSpacing( 10 ); TQString sprites_prefix = - KGlobal::dirs()->findResourceDir("sprite", "rock1/rock10000.png"); + TDEGlobal::dirs()->findResourceDir("sprite", "rock1/rock10000.png"); /* label = new TQLabel( i18n( "T" ), mainWin ); label->setFont( smallFont ); @@ -627,10 +627,10 @@ void KAstTopLevel::doStats() { TQString r; if ( view->shots() ) - r = KGlobal::locale()->formatNumber(( (float)view->hits() / + r = TDEGlobal::locale()->formatNumber(( (float)view->hits() / (float)view->shots() ) * 100, 2 ); else - r = KGlobal::locale()->formatNumber( 0.0, 2 ); + r = TDEGlobal::locale()->formatNumber( 0.0, 2 ); TQString s = i18n( "Game Over\n\n" "Shots fired:\t%1\n" diff --git a/kasteroids/view.cpp b/kasteroids/view.cpp index e203ffb5..3d886d7d 100644 --- a/kasteroids/view.cpp +++ b/kasteroids/view.cpp @@ -81,7 +81,7 @@ KAsteroidsView::KAsteroidsView( TQWidget *parent, const char *name ) field.setBackgroundPixmap( pm ); textSprite = new TQCanvasText( &field ); - TQFont font( KGlobalSettings::generalFont().family(), 18 ); + TQFont font( TDEGlobalSettings::generalFont().family(), 18 ); textSprite->setFont( font ); shield = 0; @@ -230,7 +230,7 @@ void KAsteroidsView::brake( bool b ) void KAsteroidsView::readSprites() { TQString sprites_prefix = - KGlobal::dirs()->findResourceDir("sprite", "rock1/rock10000.png"); + TDEGlobal::dirs()->findResourceDir("sprite", "rock1/rock10000.png"); int i = 0; while ( kas_animations[i].id ) diff --git a/katomic/gamewidget.cpp b/katomic/gamewidget.cpp index 194ff3f6..c3a7e3f8 100644 --- a/katomic/gamewidget.cpp +++ b/katomic/gamewidget.cpp @@ -171,7 +171,7 @@ GameWidget::GameWidget ( TQWidget *parent, const char* name ) : TQWidget( parent, name ) { level = 1; - nlevels = KGlobal::dirs()->findAllResources("appdata", "levels/level_*", + nlevels = TDEGlobal::dirs()->findAllResources("appdata", "levels/level_*", false, true).count(); TQHBoxLayout *top = new TQHBoxLayout(this, 10); @@ -210,7 +210,7 @@ GameWidget::GameWidget ( TQWidget *parent, const char* name ) slay->addWidget(new TQLabel(i18n("Highscore:"), bg)); - TQFont headerFont = KGlobalSettings::generalFont(); + TQFont headerFont = TDEGlobalSettings::generalFont(); headerFont.setBold(true); hs = new TQLabel (highest, bg); @@ -229,7 +229,7 @@ GameWidget::GameWidget ( TQWidget *parent, const char* name ) updateLevel(1); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Options"); settings.anim_speed = config->readNumEntry("Animation Speed", 1); if (settings.anim_speed < 1 || settings.anim_speed > MAX_SPEED) diff --git a/katomic/main.cpp b/katomic/main.cpp index 2b4d9fd9..d359617e 100644 --- a/katomic/main.cpp +++ b/katomic/main.cpp @@ -54,7 +54,7 @@ int main(int argc, char **argv) TQApplication::setColorSpec(TQApplication::ManyColor); TDEApplication a; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); if ( a.isRestored() ) RESTORE(AtomTopLevel) diff --git a/katomic/toplevel.cpp b/katomic/toplevel.cpp index e2d9e745..56244c3a 100644 --- a/katomic/toplevel.cpp +++ b/katomic/toplevel.cpp @@ -70,12 +70,12 @@ void AtomTopLevel::configopts() void AtomTopLevel::initConfig() { - config = KGlobal::config(); + config = TDEGlobal::config(); } void AtomTopLevel::saveConfig() { - config = KGlobal::config(); + config = TDEGlobal::config(); if (settings.changed) { config->setGroup("Options"); diff --git a/kbackgammon/engines/gnubg/kbggnubg.cpp b/kbackgammon/engines/gnubg/kbggnubg.cpp index e125e4d5..1ac1a50c 100644 --- a/kbackgammon/engines/gnubg/kbggnubg.cpp +++ b/kbackgammon/engines/gnubg/kbggnubg.cpp @@ -484,12 +484,12 @@ void KBgEngineGNU::start() */ gnubg << "gnubg" << "--tty"; - connect(&gnubg, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(gnubgExit(KProcess *))); - connect(&gnubg, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), - this, TQT_SLOT(receiveData(KProcess *, char *, int))); - connect(&gnubg, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - this, TQT_SLOT(receiveData(KProcess *, char *, int))); - connect(&gnubg, TQT_SIGNAL(wroteStdin(KProcess *)), this, TQT_SLOT(wroteStdin(KProcess *))); + connect(&gnubg, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(gnubgExit(TDEProcess *))); + connect(&gnubg, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQT_SLOT(receiveData(TDEProcess *, char *, int))); + connect(&gnubg, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQT_SLOT(receiveData(TDEProcess *, char *, int))); + connect(&gnubg, TQT_SIGNAL(wroteStdin(TDEProcess *)), this, TQT_SLOT(wroteStdin(TDEProcess *))); startGNU(); } @@ -502,7 +502,7 @@ void KBgEngineGNU::startGNU() resAction->setEnabled(false); - if (!gnubg.start(KProcess::NotifyOnExit, KProcess::All)) + if (!gnubg.start(TDEProcess::NotifyOnExit, TDEProcess::All)) KMessageBox::information((TQWidget *)parent(), i18n("Could not start the GNU Backgammon process.\n" "Make sure the program is in your PATH and is " @@ -518,7 +518,7 @@ void KBgEngineGNU::startGNU() /* * The gnubg process has died. Stop all user activity and allow a restart. */ -void KBgEngineGNU::gnubgExit(KProcess *proc) +void KBgEngineGNU::gnubgExit(TDEProcess *proc) { ct->stop(); @@ -544,7 +544,7 @@ void KBgEngineGNU::gnubgExit(KProcess *proc) /* * Last command has been sent. Try to send pending ones. */ -void KBgEngineGNU::wroteStdin(KProcess *proc) +void KBgEngineGNU::wroteStdin(TDEProcess *proc) { if (!proc->isRunning()) return; @@ -577,7 +577,7 @@ void KBgEngineGNU::nextCommand() * Get data from GNU Backgammon and process them. Note that we may have * to buffer the last line and wait for the closing newline... */ -void KBgEngineGNU::receiveData(KProcess *proc, char *buffer, int buflen) +void KBgEngineGNU::receiveData(TDEProcess *proc, char *buffer, int buflen) { if (!proc->isRunning()) return; diff --git a/kbackgammon/engines/gnubg/kbggnubg.h b/kbackgammon/engines/gnubg/kbggnubg.h index 95db0171..b86e9130 100644 --- a/kbackgammon/engines/gnubg/kbggnubg.h +++ b/kbackgammon/engines/gnubg/kbggnubg.h @@ -191,7 +191,7 @@ private: enum Turn {uRoll, uMove, tRoll, tMove, maxTurn}; - KProcess gnubg; + TDEProcess gnubg; TQStringList cmdList; @@ -209,13 +209,13 @@ private: protected slots: - void wroteStdin(KProcess *); + void wroteStdin(TDEProcess *); - void receiveData(KProcess *, char *buffer, int buflen); + void receiveData(TDEProcess *, char *buffer, int buflen); void handleLine(const TQString &l); - void gnubgExit(KProcess *proc); + void gnubgExit(TDEProcess *proc); void nextCommand(); diff --git a/kbackgammon/kbg.cpp b/kbackgammon/kbg.cpp index b25153ee..7065ead1 100644 --- a/kbackgammon/kbg.cpp +++ b/kbackgammon/kbg.cpp @@ -684,11 +684,11 @@ void KBg::toggleMenubar() */ void KBg::configureToolbars() { - saveMainWindowSettings(KGlobal::config(), "kedittoolbar settings"); // temp group + saveMainWindowSettings(TDEGlobal::config(), "kedittoolbar settings"); // temp group KEditToolbar dlg(actionCollection(), xmlFile(), true, this); connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(newToolbarConfig())); dlg.exec(); - KGlobal::config()->deleteGroup( "kedittoolbar settings" ); // delete temp group + TDEGlobal::config()->deleteGroup( "kedittoolbar settings" ); // delete temp group } /* @@ -697,7 +697,7 @@ void KBg::configureToolbars() void KBg::newToolbarConfig() { createGUI(); - applyMainWindowSettings(KGlobal::config(), "kedittoolbar settings"); + applyMainWindowSettings(TDEGlobal::config(), "kedittoolbar settings"); } /* diff --git a/kbackgammon/main.cpp b/kbackgammon/main.cpp index 51d3eb96..af57085a 100644 --- a/kbackgammon/main.cpp +++ b/kbackgammon/main.cpp @@ -52,7 +52,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::init(argc, argv, &about); TDEApplication app; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); if (app.isRestored()) RESTORE(KBg) diff --git a/kbattleship/kbattleship/main.cpp b/kbattleship/kbattleship/main.cpp index ba9a1092..a9a97a98 100644 --- a/kbattleship/kbattleship/main.cpp +++ b/kbattleship/kbattleship/main.cpp @@ -49,7 +49,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. TDEApplication app; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); TQString picDirCheck = locate("data", "kbattleship/pictures/"); TQString onePicCheck = locate("data", "kbattleship/pictures/hit.png"); diff --git a/kblackbox/kbbgame.cpp b/kblackbox/kbbgame.cpp index dbaf2bc7..4855058f 100644 --- a/kblackbox/kbbgame.cpp +++ b/kblackbox/kbbgame.cpp @@ -326,12 +326,12 @@ void KBBGame::gameFinished() "I guess you need more practice."); KMessageBox::information(this, - s.arg(KGlobal::locale()->formatNumber(score, 0))); + s.arg(TDEGlobal::locale()->formatNumber(score, 0))); } else { s = i18n( "You should place %1 balls!\n" "You have placed %2.") - .arg(KGlobal::locale()->formatNumber(balls, 0)) - .arg(KGlobal::locale()->formatNumber(ballsPlaced, 0)); + .arg(TDEGlobal::locale()->formatNumber(balls, 0)) + .arg(TDEGlobal::locale()->formatNumber(ballsPlaced, 0)); KMessageBox::sorry(this, s); } diff --git a/kblackbox/main.cpp b/kblackbox/main.cpp index 1a0180eb..7fd684b2 100644 --- a/kblackbox/main.cpp +++ b/kblackbox/main.cpp @@ -33,7 +33,7 @@ int main( int argc, char **argv ) TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication a; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); if (a.isRestored()) RESTORE(KBBGame) diff --git a/kbounce/game.cpp b/kbounce/game.cpp index 7b655905..5ba84ee0 100644 --- a/kbounce/game.cpp +++ b/kbounce/game.cpp @@ -429,7 +429,7 @@ void JezzGame::display( const TQString &text, int size ) { //kdDebug(12008) << "text = " << text << endl; - TQFont font = KGlobalSettings::generalFont(); + TQFont font = TDEGlobalSettings::generalFont(); font.setBold(true); font.setPointSize(size); m_text->setFont( font ); diff --git a/kbounce/main.cpp b/kbounce/main.cpp index e2b5f79a..ebbfa6b0 100644 --- a/kbounce/main.cpp +++ b/kbounce/main.cpp @@ -56,7 +56,7 @@ int main(int argc, char **argv) TQApplication::setColorSpec(TQApplication::ManyColor); TDEApplication a; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); ExtManager manager; diff --git a/kenolaba/kenolaba.cpp b/kenolaba/kenolaba.cpp index 1ced08fb..7b47c64f 100644 --- a/kenolaba/kenolaba.cpp +++ b/kenolaba/kenolaba.cpp @@ -47,7 +47,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. TDEApplication app; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); /* command line handling */ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/kgoldrunner/src/kgoldrunner.cpp b/kgoldrunner/src/kgoldrunner.cpp index 9497a7ef..3e6bc0b4 100644 --- a/kgoldrunner/src/kgoldrunner.cpp +++ b/kgoldrunner/src/kgoldrunner.cpp @@ -76,7 +76,7 @@ KGoldrunner::KGoldrunner() /******************************************************************************/ // Get catalog for translation - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); // Tell the KMainWindow that this is the main widget setCentralWidget (view); @@ -769,12 +769,12 @@ void KGoldrunner::optionsConfigureToolbars() // use the standard toolbar editor #if defined(TDE_MAKE_VERSION) # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) - saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); + saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); # else - saveMainWindowSettings(KGlobal::config()); + saveMainWindowSettings(TDEGlobal::config()); # endif #else - saveMainWindowSettings(KGlobal::config()); + saveMainWindowSettings(TDEGlobal::config()); #endif } @@ -786,12 +786,12 @@ void KGoldrunner::newToolbarConfig() #if defined(TDE_MAKE_VERSION) # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) - applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); + applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); # else - applyMainWindowSettings(KGlobal::config()); + applyMainWindowSettings(TDEGlobal::config()); # endif #else - applyMainWindowSettings(KGlobal::config()); + applyMainWindowSettings(TDEGlobal::config()); #endif } diff --git a/kgoldrunner/src/kgrdialog.cpp b/kgoldrunner/src/kgrdialog.cpp index 4a58b235..79d19f3a 100644 --- a/kgoldrunner/src/kgrdialog.cpp +++ b/kgoldrunner/src/kgrdialog.cpp @@ -782,7 +782,7 @@ KGrLGDialog::KGrLGDialog (TQFile * savedGames, #ifdef KGR_PORTABLE TQFont f ("courier", 12); #else - TQFont f = KGlobalSettings::fixedFont(); // KDE version. + TQFont f = TDEGlobalSettings::fixedFont(); // KDE version. #endif f.setFixedPitch (TRUE); lgList-> setFont (f); diff --git a/kgoldrunner/src/kgrgame.cpp b/kgoldrunner/src/kgrgame.cpp index 6962d7a1..13157225 100644 --- a/kgoldrunner/src/kgrgame.cpp +++ b/kgoldrunner/src/kgrgame.cpp @@ -1162,7 +1162,7 @@ void KGrGame::showHighScores() #ifdef KGR_PORTABLE TQFont f ("courier", 12); #else - TQFont f = KGlobalSettings::fixedFont(); // KDE version. + TQFont f = TDEGlobalSettings::fixedFont(); // KDE version. #endif f. setFixedPitch (TRUE); f. setBold (TRUE); diff --git a/kjumpingcube/main.cpp b/kjumpingcube/main.cpp index 075c17fd..236577fb 100644 --- a/kjumpingcube/main.cpp +++ b/kjumpingcube/main.cpp @@ -44,7 +44,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication app; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); // All session management is handled in the RESTORE macro if (app.isRestored()) diff --git a/klines/main.cpp b/klines/main.cpp index e9a120a7..42127644 100644 --- a/klines/main.cpp +++ b/klines/main.cpp @@ -43,7 +43,7 @@ int main( int argc, char **argv ) TDECmdLineArgs::init(argc, argv, &aboutData); TDEApplication a; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); if (a.isRestored()) RESTORE(KLines) diff --git a/kmahjongg/Editor.cpp b/kmahjongg/Editor.cpp index b1da62b0..c6ab4b9b 100644 --- a/kmahjongg/Editor.cpp +++ b/kmahjongg/Editor.cpp @@ -105,7 +105,7 @@ Editor::~Editor() void Editor::setupToolbar() { - KIconLoader *loader = KGlobal::iconLoader(); + KIconLoader *loader = TDEGlobal::iconLoader(); topToolbar = new KToolBar( this, "editToolBar" ); KToolBarRadioGroup *radio = new KToolBarRadioGroup(topToolbar); diff --git a/kmahjongg/HighScore.cpp b/kmahjongg/HighScore.cpp index 637fdf25..fab8d8f2 100644 --- a/kmahjongg/HighScore.cpp +++ b/kmahjongg/HighScore.cpp @@ -127,7 +127,7 @@ HighScore::HighScore resetBtn->setAutoRepeat( false ); resetBtn->setAutoResize( false ); - KIconLoader *loader = KGlobal::iconLoader(); + KIconLoader *loader = TDEGlobal::iconLoader(); resetBtn->setPixmap(loader->loadIcon("editdelete", KIcon::Toolbar)); diff --git a/kmahjongg/main.cpp b/kmahjongg/main.cpp index ca432466..7a65959f 100644 --- a/kmahjongg/main.cpp +++ b/kmahjongg/main.cpp @@ -23,7 +23,7 @@ int main( int argc, char** argv ) TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication a; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); KImageIO::registerFormats(); if (a.isRestored()) diff --git a/kmines/main.cpp b/kmines/main.cpp index 932ca8d4..cb5c4c48 100644 --- a/kmines/main.cpp +++ b/kmines/main.cpp @@ -248,7 +248,7 @@ int main(int argc, char **argv) TDECmdLineArgs::init(argc, argv, &aboutData); TDEApplication a; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); KExtHighscore::ExtManager manager; if ( a.isRestored() ) RESTORE(MainWidget) diff --git a/knetwalk/src/cell.cpp b/knetwalk/src/cell.cpp index 2847f4d2..e3ee7193 100644 --- a/knetwalk/src/cell.cpp +++ b/knetwalk/src/cell.cpp @@ -46,7 +46,7 @@ void Cell::initPixmaps() NamesMap::ConstIterator it; for(it = names.constBegin(); it != names.constEnd(); ++it) { - connectedpixmap[it.key()]=new TQPixmap(KGlobal::iconLoader()->loadIcon( + connectedpixmap[it.key()]=new TQPixmap(TDEGlobal::iconLoader()->loadIcon( locate("data","knetwalk/cable"+it.data()+".png"), KIcon::NoGroup, 32) ); TQImage image = connectedpixmap[it.key()]->convertToImage(); @@ -152,9 +152,9 @@ void Cell::paintEvent(TQPaintEvent*) { changed = false; if ( locked ) { - pixmap = KGlobal::iconLoader()->loadIcon(locate("data", "knetwalk/background_locked.png"), KIcon::NoGroup, 32); + pixmap = TDEGlobal::iconLoader()->loadIcon(locate("data", "knetwalk/background_locked.png"), KIcon::NoGroup, 32); } else { - pixmap = KGlobal::iconLoader()->loadIcon(locate("data", "knetwalk/background.png"), KIcon::NoGroup, 32); + pixmap = TDEGlobal::iconLoader()->loadIcon(locate("data", "knetwalk/background.png"), KIcon::NoGroup, 32); } TQPainter paint; @@ -185,14 +185,14 @@ void Cell::paintEvent(TQPaintEvent*) if(root) { - pix=KGlobal::iconLoader()->loadIcon(locate("data", "knetwalk/server.png"), KIcon::NoGroup, 32); + pix=TDEGlobal::iconLoader()->loadIcon(locate("data", "knetwalk/server.png"), KIcon::NoGroup, 32); } else if(ddirs == U || ddirs == L || ddirs == D || ddirs == R) { if(connected) - pix=KGlobal::iconLoader()->loadIcon(locate("data","knetwalk/computer2.png"),KIcon::NoGroup,32); + pix=TDEGlobal::iconLoader()->loadIcon(locate("data","knetwalk/computer2.png"),KIcon::NoGroup,32); else - pix=KGlobal::iconLoader()->loadIcon(locate("data","knetwalk/computer1.png"),KIcon::NoGroup,32); + pix=TDEGlobal::iconLoader()->loadIcon(locate("data","knetwalk/computer1.png"),KIcon::NoGroup,32); } paint.drawPixmap(0, 0, pix); } diff --git a/knetwalk/src/main.cpp b/knetwalk/src/main.cpp index ea55a816..94b54af1 100644 --- a/knetwalk/src/main.cpp +++ b/knetwalk/src/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char ** argv) TDEApplication app; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->isSet("Novice")) Settings::setSkill(Settings::EnumSkill::Novice); diff --git a/knetwalk/src/mainwindow.cpp b/knetwalk/src/mainwindow.cpp index 24d2a528..5d45af3b 100644 --- a/knetwalk/src/mainwindow.cpp +++ b/knetwalk/src/mainwindow.cpp @@ -94,7 +94,7 @@ MainWindow::MainWindow(TQWidget *parent, const char* name, WFlags /*fl*/) : " to turn it in a counter-clockwise direction." "<p>Start the LAN with as few turns as possible!")); - //const int cellsize = KGlobal::iconLoader()->loadIcon("knetwalk/background.png", KIcon::User, 32).width(); + //const int cellsize = TDEGlobal::iconLoader()->loadIcon("knetwalk/background.png", KIcon::User, 32).width(); const int cellsize = 32; const int gridsize = cellsize * MasterBoardSize + 2; diff --git a/kolf/kcomboboxdialog.cpp b/kolf/kcomboboxdialog.cpp index 5882e257..a6e45373 100644 --- a/kolf/kcomboboxdialog.cpp +++ b/kolf/kcomboboxdialog.cpp @@ -86,7 +86,7 @@ TQString KComboBoxDialog::getItem( const TQString &_text, const TQString &_capti TQString prevAnswer; if ( !dontAskAgainName.isEmpty() ) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "Notification Messages" ); prevAnswer = config->readEntry( dontAskAgainName ); if ( !prevAnswer.isEmpty() ) @@ -106,7 +106,7 @@ TQString KComboBoxDialog::getItem( const TQString &_text, const TQString &_capti { if ( !dontAskAgainName.isEmpty() && !text.isEmpty() ) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup ( "Notification Messages" ); config->writeEntry( dontAskAgainName, text ); } diff --git a/kolf/kcomboboxdialog.h b/kolf/kcomboboxdialog.h index 18c0bba5..61b7ff2e 100644 --- a/kolf/kcomboboxdialog.h +++ b/kolf/kcomboboxdialog.h @@ -104,7 +104,7 @@ public: const TQString &_value = TQString(), bool *ok = 0, TQWidget *parent = 0, const TQString &configName = TQString(), - KConfig *config = KGlobal::config()); + KConfig *config = TDEGlobal::config()); protected: KHistoryCombo *combo; diff --git a/kolf/kolf.cpp b/kolf/kolf.cpp index 246403b9..f40c3f5d 100644 --- a/kolf/kolf.cpp +++ b/kolf/kolf.cpp @@ -200,7 +200,7 @@ void Kolf::startNewGame() config.setGroup("0 Saved Game"); if (isTutorial) - filename = KGlobal::dirs()->findResource("appdata", "tutorial.kolf"); + filename = TDEGlobal::dirs()->findResource("appdata", "tutorial.kolf"); else filename = config.readEntry("Course", TQString()); @@ -305,7 +305,7 @@ void Kolf::newGame() void Kolf::tutorial() { - TQString newfilename = KGlobal::dirs()->findResource("appdata", "tutorial.kolfgame"); + TQString newfilename = TDEGlobal::dirs()->findResource("appdata", "tutorial.kolfgame"); if (newfilename.isNull()) return; @@ -369,7 +369,7 @@ void Kolf::createSpacer() spacerPlayers.last().setId(1); delete spacer; - spacer = new KolfGame(obj, &spacerPlayers, KGlobal::dirs()->findResource("appdata", "intro"), dummy); + spacer = new KolfGame(obj, &spacerPlayers, TDEGlobal::dirs()->findResource("appdata", "intro"), dummy); spacer->setSound(false); spacer->startFirstHole(1); layout->addWidget(spacer, 0, 0, AlignCenter); diff --git a/kolf/main.cpp b/kolf/main.cpp index 8eb157fe..be2d4c6f 100644 --- a/kolf/main.cpp +++ b/kolf/main.cpp @@ -72,7 +72,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) TQApplication::setColorSpec(TQApplication::ManyColor); TDEApplication a; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); Kolf *top = new Kolf; diff --git a/kolf/newgame.cpp b/kolf/newgame.cpp index 493b00fd..a617fc1f 100644 --- a/kolf/newgame.cpp +++ b/kolf/newgame.cpp @@ -104,7 +104,7 @@ NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_ externCourses = config->readListEntry("extra"); /// course loading - TQStringList items = externCourses + KGlobal::dirs()->findAllResources("appdata", "courses/*"); + TQStringList items = externCourses + TDEGlobal::dirs()->findAllResources("appdata", "courses/*"); TQStringList nameList; const TQString lastCourse(config->readEntry("course", "")); int curItem = 0; diff --git a/kolf/pluginloader.cpp b/kolf/pluginloader.cpp index 8cf39d69..9f320856 100644 --- a/kolf/pluginloader.cpp +++ b/kolf/pluginloader.cpp @@ -17,7 +17,7 @@ ObjectList *PluginLoader::loadAll() ObjectList *ret = new ObjectList; TQStringList libs; - TQStringList files = KGlobal::dirs()->findAllResources("appdata", "*.plugin", false, true); + TQStringList files = TDEGlobal::dirs()->findAllResources("appdata", "*.plugin", false, true); for (TQStringList::Iterator it = files.begin(); it != files.end(); ++it) { diff --git a/konquest/Konquest.cc b/konquest/Konquest.cc index e06125d1..25a08857 100644 --- a/konquest/Konquest.cc +++ b/konquest/Konquest.cc @@ -20,7 +20,7 @@ main(int argc, char **argv) TDEApplication a; TQApplication::setGlobalMouseTracking( true ); - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); if (a.isRestored()) RESTORE(MainWindow) diff --git a/konquest/fleetdlg.cc b/konquest/fleetdlg.cc index e933e895..d45cb88e 100644 --- a/konquest/fleetdlg.cc +++ b/konquest/fleetdlg.cc @@ -82,7 +82,7 @@ FleetDlg::init() TQString("%1").arg(fleetNumber), curFleet->destination->getName(), TQString("%1").arg(curFleet->getShipCount()), - TQString("%1").arg(KGlobal::locale()->formatNumber(curFleet->killPercentage, 3)), + TQString("%1").arg(TDEGlobal::locale()->formatNumber(curFleet->killPercentage, 3)), TQString("%1").arg((int)ceil(curFleet->arrivalTurn))); } } diff --git a/konquest/gameboard.cc b/konquest/gameboard.cc index 455ea03c..ce8ae2e0 100644 --- a/konquest/gameboard.cc +++ b/konquest/gameboard.cc @@ -317,8 +317,8 @@ GameBoard::turn() "A ship leaving this turn will arrive on turn %4") .arg(sourcePlanet->getName()) .arg(destPlanet->getName()) - .arg(KGlobal::locale()->formatNumber( dist, 2 )) - .arg(KGlobal::locale()->formatNumber( turnNumber + (int)dist, 0 )); + .arg(TDEGlobal::locale()->formatNumber( dist, 2 )) + .arg(TDEGlobal::locale()->formatNumber( turnNumber + (int)dist, 0 )); KMessageBox::information( this, msg, i18n("Distance")); gameState = NONE; diff --git a/konquest/map_widget.cc b/konquest/map_widget.cc index a8aa33de..ed3770b0 100644 --- a/konquest/map_widget.cc +++ b/konquest/map_widget.cc @@ -17,7 +17,7 @@ ConquestMap::ConquestMap( Map *newMap, TQWidget *parent ) map( newMap ), gridColor( 50, 80, 50 ), hiLiteRow( -1 ), hiLiteCol( -1 ) { - labelFont = KGlobalSettings::generalFont(); + labelFont = TDEGlobalSettings::generalFont(); labelFont.setPointSize( 8 ); setFrameStyle( NoFrame ); diff --git a/konquest/planet_info.cc b/konquest/planet_info.cc index 1d178493..29e2436e 100644 --- a/konquest/planet_info.cc +++ b/konquest/planet_info.cc @@ -147,13 +147,13 @@ void PlanetInfo::showPlanet( Planet *planet ) temp = "<qt>" + i18n("Owner: %1").arg(p->planet->getPlayer()->getColoredName()); owner->setText( temp ); - temp = "<qt>" + i18n("Ships: %1").arg( KGlobal::locale()->formatNumber(p->ships, 0) ); + temp = "<qt>" + i18n("Ships: %1").arg( TDEGlobal::locale()->formatNumber(p->ships, 0) ); ships->setText( temp ); - temp = "<qt>" + i18n("Production: %1").arg( KGlobal::locale()->formatNumber(p->production, 0) ); + temp = "<qt>" + i18n("Production: %1").arg( TDEGlobal::locale()->formatNumber(p->production, 0) ); production->setText( temp ); - temp = "<qt>" + i18n("Kill percent: %1").arg( KGlobal::locale()->formatNumber(p->killRate, 3) ); + temp = "<qt>" + i18n("Kill percent: %1").arg( TDEGlobal::locale()->formatNumber(p->killRate, 3) ); kill_percent->setText( temp ); } } diff --git a/kpat/cardmaps.cpp b/kpat/cardmaps.cpp index a7461daa..9b50c356 100644 --- a/kpat/cardmaps.cpp +++ b/kpat/cardmaps.cpp @@ -104,7 +104,7 @@ bool cardMap::setCardDir( const TQString &dir) if( animate ) { t1 = TQTime::currentTime(); w = new TQWidget( 0, "", TQt::WStyle_Customize | TQt::WStyle_NoBorder | TQt::WStyle_Tool ); - TQRect dg = KGlobalSettings::splashScreenDesktopGeometry(); + TQRect dg = TDEGlobalSettings::splashScreenDesktopGeometry(); w->setBackgroundColor( TQt::darkGreen ); w->setGeometry( dg.left() + ( dg.width() - greeting_width ) / 2, dg.top() + ( dg.height() - 180 ) / 2, greeting_width, 180); w->show(); diff --git a/kpat/main.cpp b/kpat/main.cpp index 69dbe391..caee083b 100644 --- a/kpat/main.cpp +++ b/kpat/main.cpp @@ -58,7 +58,7 @@ int main( int argc, char **argv ) TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); TDEApplication a; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); if (a.isRestored()) RESTORE(pWidget) diff --git a/kpat/pwidget.cpp b/kpat/pwidget.cpp index 4901d75f..288ebc6a 100644 --- a/kpat/pwidget.cpp +++ b/kpat/pwidget.cpp @@ -70,7 +70,7 @@ pWidget::pWidget() actionCollection(), "open"); recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openGame(const KURL&)), actionCollection(), "open_recent"); - recent->loadEntries(KGlobal::config()); + recent->loadEntries(TDEGlobal::config()); (void)KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveGame()), actionCollection(), "save"); (void)new KAction(i18n("&Choose Game..."), 0, TQT_TQOBJECT(this), TQT_SLOT(chooseGame()), @@ -102,14 +102,14 @@ pWidget::pWidget() } games->setItems(list); - KGlobal::dirs()->addResourceType("wallpaper", KStandardDirs::kde_default("data") + "kpat/backgrounds/"); - KGlobal::dirs()->addResourceType("wallpaper", KStandardDirs::kde_default("data") + "ksnake/backgrounds/"); + TDEGlobal::dirs()->addResourceType("wallpaper", KStandardDirs::kde_default("data") + "kpat/backgrounds/"); + TDEGlobal::dirs()->addResourceType("wallpaper", KStandardDirs::kde_default("data") + "ksnake/backgrounds/"); wallpapers = new KSelectAction(i18n("&Change Background"), 0, TQT_TQOBJECT(this), TQT_SLOT(changeWallpaper()), actionCollection(), "wallpaper"); list.clear(); wallpaperlist.clear(); - TQStringList wallpaperlist2 = KGlobal::dirs()->findAllResources("wallpaper", TQString(), + TQStringList wallpaperlist2 = TDEGlobal::dirs()->findAllResources("wallpaper", TQString(), false, true, list); TQStringList list2; for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { @@ -470,7 +470,7 @@ void pWidget::gameLost() KConfig *config = 0; TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); - config = KGlobal::config(); + config = TDEGlobal::config(); KConfigGroupSaver saver(config, TQString::fromLatin1("Notification Messages")); TQString dontAsk = config->readEntry(dontAskAgainName).lower(); @@ -524,7 +524,7 @@ void pWidget::openGame(const KURL &url) setGameCaption(); KIO::NetAccess::removeTempFile( tmpFile ); recent->addURL(url); - recent->saveEntries(KGlobal::config()); + recent->saveEntries(TDEGlobal::config()); } } @@ -545,7 +545,7 @@ void pWidget::saveGame() file.close(); KIO::NetAccess::upload(file.name(), url, this); recent->addURL(url); - recent->saveEntries(KGlobal::config()); + recent->saveEntries(TDEGlobal::config()); } void pWidget::showStats() diff --git a/kpoker/betbox.cpp b/kpoker/betbox.cpp index 91fcab8b..2ed453e4 100644 --- a/kpoker/betbox.cpp +++ b/kpoker/betbox.cpp @@ -46,10 +46,10 @@ BetBox::BetBox(TQWidget* parent, const char* name) foldButton = new TQPushButton(this); l->addWidget(foldButton, 0); - bet5Up->setText(TQString("+%1").arg(KGlobal::locale()->formatMoney(5))); - bet10Up->setText(TQString("+%1").arg(KGlobal::locale()->formatMoney(10))); - bet5Down->setText(TQString("-%1").arg(KGlobal::locale()->formatMoney(5))); - bet10Down->setText(TQString("-%1").arg(KGlobal::locale()->formatMoney(10))); + bet5Up->setText(TQString("+%1").arg(TDEGlobal::locale()->formatMoney(5))); + bet10Up->setText(TQString("+%1").arg(TDEGlobal::locale()->formatMoney(10))); + bet5Down->setText(TQString("-%1").arg(TDEGlobal::locale()->formatMoney(5))); + bet10Down->setText(TQString("-%1").arg(TDEGlobal::locale()->formatMoney(10))); adjustBet->setText(i18n("Adjust Bet")); foldButton->setText(i18n("Fold")); diff --git a/kpoker/kpoker.cpp b/kpoker/kpoker.cpp index 73321bdf..7d50e198 100644 --- a/kpoker/kpoker.cpp +++ b/kpoker/kpoker.cpp @@ -269,7 +269,7 @@ void kpok::initWindow() mWonWidget = new TQWidget(this); inputLayout->addWidget(mWonWidget, 2); mWonWidget->setMinimumHeight(50); //FIXME hardcoded value for the wave - mWonWidget->setMinimumWidth(tmp.width(i18n("You won %1").arg(KGlobal::locale()->formatMoney(100))) + 20); // workaround for width problem in wave + mWonWidget->setMinimumWidth(tmp.width(i18n("You won %1").arg(TDEGlobal::locale()->formatMoney(100))) + 20); // workaround for width problem in wave TQHBoxLayout* wonLayout = new TQHBoxLayout(mWonWidget); wonLayout->setAutoAdd(true); @@ -686,7 +686,7 @@ void kpok::paintCash() for (unsigned int i = 0; i < m_numPlayers; i++) { playerBox[i]->showCash(); } - potLabel->setText(i18n("Pot: %1").arg(KGlobal::locale()->formatMoney(m_game.getPot()))); + potLabel->setText(i18n("Pot: %1").arg(TDEGlobal::locale()->formatMoney(m_game.getPot()))); } @@ -805,9 +805,9 @@ void kpok::displayWinner_Computer(PokerPlayer* winner, bool othersPassed) // Generate a string with winner info and show it. TQString label; if (winner->getHuman()) - label = i18n("You won %1").arg(KGlobal::locale()->formatMoney(m_game.getPot())); + label = i18n("You won %1").arg(TDEGlobal::locale()->formatMoney(m_game.getPot())); else - label = i18n("%1 won %2").arg(winner->getName()).arg(KGlobal::locale()->formatMoney(m_game.getPot())); + label = i18n("%1 won %2").arg(winner->getName()).arg(TDEGlobal::locale()->formatMoney(m_game.getPot())); wonLabel->setText(label); // Start the waving motion of the text. @@ -1072,7 +1072,7 @@ void kpok::displayWin(const TQString& hand, int cashWon) if (cashWon) { playSound("win.wav"); - buf = i18n("You won %1!").arg(KGlobal::locale()->formatMoney(cashWon)); + buf = i18n("You won %1!").arg(TDEGlobal::locale()->formatMoney(cashWon)); } else { playSound("lose.wav"); buf = i18n("Game Over"); // locale diff --git a/kpoker/main.cpp b/kpoker/main.cpp index 88017931..9ed05f9b 100644 --- a/kpoker/main.cpp +++ b/kpoker/main.cpp @@ -41,7 +41,7 @@ int main( int argc, char *argv[] ) TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication myApp; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); if (myApp.isRestored()) RESTORE(PokerWindow) diff --git a/kpoker/playerbox.cpp b/kpoker/playerbox.cpp index 66ffd5a7..dee8337f 100644 --- a/kpoker/playerbox.cpp +++ b/kpoker/playerbox.cpp @@ -122,7 +122,7 @@ void PlayerBox::showCash() { // Show the amount of cash the player has. m_cashLabel->setText(i18n("Cash: %1") - .arg(KGlobal::locale()->formatMoney(m_player->getCash()))); + .arg(TDEGlobal::locale()->formatMoney(m_player->getCash()))); // Show how much we have bet during this round. if (m_player->out()) @@ -130,10 +130,10 @@ void PlayerBox::showCash() else { if (m_singlePlayer) m_betLabel->setText(i18n("Cash per round: %1") - .arg(KGlobal::locale()->formatMoney(m_cashPerRound))); + .arg(TDEGlobal::locale()->formatMoney(m_cashPerRound))); else m_betLabel->setText(i18n("Bet: %1") - .arg(KGlobal::locale()-> formatMoney(m_player->getCurrentBet()))); + .arg(TDEGlobal::locale()-> formatMoney(m_player->getCurrentBet()))); } } diff --git a/kreversi/board.cpp b/kreversi/board.cpp index 8950fc8f..6f9c7a57 100644 --- a/kreversi/board.cpp +++ b/kreversi/board.cpp @@ -56,7 +56,7 @@ #ifndef PICDATA -#define PICDATA(x) KGlobal::dirs()->findResource("appdata", TQString("pics/")+ x) +#define PICDATA(x) TDEGlobal::dirs()->findResource("appdata", TQString("pics/")+ x) #endif const uint HINT_BLINKRATE = 250000; @@ -109,7 +109,7 @@ void QReversiBoardView::loadChips(ChipType type) TQString name("pics/"); name += (type==Colored ? "chips.png" : "chips_mono.png"); - TQString s = KGlobal::dirs()->findResource("appdata", name); + TQString s = TDEGlobal::dirs()->findResource("appdata", name); bool ok = allchips.load(s); Q_ASSERT( ok && allchips.width()==CHIP_SIZE*5 diff --git a/kreversi/kreversi.cpp b/kreversi/kreversi.cpp index eee245b0..22d1f5c5 100644 --- a/kreversi/kreversi.cpp +++ b/kreversi/kreversi.cpp @@ -74,7 +74,7 @@ #ifndef PICDATA #define PICDATA(x) \ - KGlobal::dirs()->findResource("appdata", TQString("pics/") + x) + TDEGlobal::dirs()->findResource("appdata", TQString("pics/") + x) #endif diff --git a/kreversi/kreversi.kcfg b/kreversi/kreversi.kcfg index c1dc6e52..900a3cdf 100644 --- a/kreversi/kreversi.kcfg +++ b/kreversi/kreversi.kcfg @@ -55,7 +55,7 @@ </entry> <entry name="BackgroundImage" type="Path"> <label>Image to use as background.</label> - <code>#define PICDATA(x) KGlobal::dirs()->findResource("appdata", QString("pics/")+ x)</code> + <code>#define PICDATA(x) TDEGlobal::dirs()->findResource("appdata", QString("pics/")+ x)</code> <default code="true">PICDATA("background/Light_Wood.png")</default> </entry> <entry name="MenubarVisible" type="Bool" key="menubar visible"> diff --git a/kreversi/main.cpp b/kreversi/main.cpp index 1bf0ef79..711559a6 100644 --- a/kreversi/main.cpp +++ b/kreversi/main.cpp @@ -67,7 +67,7 @@ int main(int argc, char **argv) TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication a; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); // used for loading background pixmaps KImageIO::registerFormats(); diff --git a/ksame/main.cpp b/ksame/main.cpp index 6cb78db1..f85a7f85 100644 --- a/ksame/main.cpp +++ b/ksame/main.cpp @@ -41,7 +41,7 @@ int main( int argc, char **argv ) { TDEApplication::setColorSpec(TQApplication::ManyColor+TQApplication::CustomColor); TDEApplication a; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); KSameWidget *w = new KSameWidget; if (kapp->isRestored()) { diff --git a/kshisen/board.cpp b/kshisen/board.cpp index ae2fd750..475b3672 100644 --- a/kshisen/board.cpp +++ b/kshisen/board.cpp @@ -74,7 +74,7 @@ Board::Board(TQWidget *parent, const char *name) : _redo.setAutoDelete(true); _undo.setAutoDelete(true); - TQPixmap bg(KGlobal::dirs()->findResource("appdata", "kshisen_bgnd.png")); + TQPixmap bg(TDEGlobal::dirs()->findResource("appdata", "kshisen_bgnd.png")); setBackgroundPixmap(bg); loadSettings(); @@ -458,7 +458,7 @@ void Board::paintEvent(TQPaintEvent *e) if(paused) { - p.setFont(KGlobalSettings::largeFont()); + p.setFont(TDEGlobalSettings::largeFont()); p.drawText(rect(), TQt::AlignCenter, i18n("Game Paused")); } else diff --git a/kshisen/main.cpp b/kshisen/main.cpp index 00bff799..db5d96d8 100644 --- a/kshisen/main.cpp +++ b/kshisen/main.cpp @@ -63,7 +63,7 @@ int main(int argc, char **argv) TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication a; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); App *app = new App(); app->show(); diff --git a/kshisen/tileset.cpp b/kshisen/tileset.cpp index 4ca6319d..fdaf184f 100644 --- a/kshisen/tileset.cpp +++ b/kshisen/tileset.cpp @@ -36,7 +36,7 @@ TileSet::TileSet() : scaledTiles(nTiles) { //loadTiles - TQImage tileset(KGlobal::dirs()->findResource("appdata", "tileset.png")); + TQImage tileset(TDEGlobal::dirs()->findResource("appdata", "tileset.png")); if(tileset.isNull()) { KMessageBox::sorry(0, i18n("Cannot load tiles pixmap!")); diff --git a/ksmiletris/main.cpp b/ksmiletris/main.cpp index c069d780..c64db46c 100644 --- a/ksmiletris/main.cpp +++ b/ksmiletris/main.cpp @@ -44,7 +44,7 @@ int main(int argc, char **argv) TDEApplication app; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); GameWindow *w = new GameWindow; app.setMainWidget(w); diff --git a/ksnake/levels.cpp b/ksnake/levels.cpp index fe85cb39..21b59fbd 100644 --- a/ksnake/levels.cpp +++ b/ksnake/levels.cpp @@ -35,7 +35,7 @@ Levels *leV = 0; Levels::Levels() { leV = this; - list = KGlobal::dirs()->findAllResources("appdata", "levels/*"); + list = TDEGlobal::dirs()->findAllResources("appdata", "levels/*"); list.prepend( "dummy" ); } diff --git a/ksnake/main.cpp b/ksnake/main.cpp index b70a8a5a..ae4f9098 100644 --- a/ksnake/main.cpp +++ b/ksnake/main.cpp @@ -44,7 +44,7 @@ int main( int argc, char **argv ) TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication app; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); Game *ksnake = new Game(); app.setMainWidget( ksnake ); diff --git a/ksnake/pixServer.cpp b/ksnake/pixServer.cpp index 244ff17d..08bbb0f0 100644 --- a/ksnake/pixServer.cpp +++ b/ksnake/pixServer.cpp @@ -146,7 +146,7 @@ void PixServer::initbackPixmaps() } else if(Settings::bgimage_enabled()) { // A bit of a hack. TQStringList backgroundPixmaps = - KGlobal::dirs()->findAllResources("appdata", "backgrounds/*.png"); + TDEGlobal::dirs()->findAllResources("appdata", "backgrounds/*.png"); path = backgroundPixmaps[(Settings::bgimage())]; } diff --git a/ksnake/rattler.cpp b/ksnake/rattler.cpp index 86ab1528..458c88bf 100644 --- a/ksnake/rattler.cpp +++ b/ksnake/rattler.cpp @@ -79,7 +79,7 @@ Rattler::Rattler( TQWidget *parent, const char *name ) TQTimer::singleShot( 2000, this, TQT_SLOT(demo()) ); // Why wait? backgroundPixmaps = - KGlobal::dirs()->findAllResources("appdata", "backgrounds/*.png"); + TDEGlobal::dirs()->findAllResources("appdata", "backgrounds/*.png"); } Rattler::~Rattler() diff --git a/ksokoban/Bookmark.cpp b/ksokoban/Bookmark.cpp index 7645be2e..87414938 100644 --- a/ksokoban/Bookmark.cpp +++ b/ksokoban/Bookmark.cpp @@ -38,7 +38,7 @@ void Bookmark::fileName(TQString &p) { - p = KGlobal::dirs()->saveLocation("appdata"); + p = TDEGlobal::dirs()->saveLocation("appdata"); TQString n; n.setNum(number_); diff --git a/ksokoban/ModalLabel.cpp b/ksokoban/ModalLabel.cpp index 3fd244ee..93ee7d1e 100644 --- a/ksokoban/ModalLabel.cpp +++ b/ksokoban/ModalLabel.cpp @@ -31,7 +31,7 @@ ModalLabel::ModalLabel(const TQString &text, TQWidget *parent, const char *name, WFlags f) : TQLabel(text, parent, name, f) { - TQFont font(KGlobalSettings::generalFont().family(), 24, TQFont::Bold); + TQFont font(TDEGlobalSettings::generalFont().family(), 24, TQFont::Bold); TQFontMetrics fontMet(font); TQString currentLine; diff --git a/ksokoban/PlayField.cpp b/ksokoban/PlayField.cpp index 4fa12157..e0fce7fa 100644 --- a/ksokoban/PlayField.cpp +++ b/ksokoban/PlayField.cpp @@ -52,7 +52,7 @@ PlayField::PlayField(TQWidget *parent, const char *name, WFlags f) wheelDelta_(0), levelText_(i18n("Level:")), stepsText_(i18n("Steps:")), pushesText_(i18n("Pushes:")), - statusFont_(KGlobalSettings::generalFont().family(), 18, TQFont::Bold), statusMetrics_(statusFont_) { + statusFont_(TDEGlobalSettings::generalFont().family(), 18, TQFont::Bold), statusMetrics_(statusFont_) { setFocusPolicy(TQ_StrongFocus); setFocus(); diff --git a/kspaceduel/mainview.cpp b/kspaceduel/mainview.cpp index 04bc7e4f..fcb0cf40 100644 --- a/kspaceduel/mainview.cpp +++ b/kspaceduel/mainview.cpp @@ -41,7 +41,7 @@ MyMainView::MyMainView(TQWidget *parent) minePut[p]=false; } - TQString tmp = KGlobal::dirs()->findResourceDir("appdata", (TQString)MV_BACKGROUND); + TQString tmp = TDEGlobal::dirs()->findResourceDir("appdata", (TQString)MV_BACKGROUND); TQCanvasPixmapArray *sunsequence = loadOldPixmapSequence( tmp + MV_SUN_PPM, tmp + MV_SUN_PBM ); @@ -535,7 +535,7 @@ void MyMainView::timerEvent(TQTimerEvent *event) textSprite->move(width()/2,height()/2-90); textSprite->setTextFlags(AlignCenter); textSprite->setColor(tqRgb(255,160,0)); - textSprite->setFont(TQFont(KGlobalSettings::generalFont().family(),14)); + textSprite->setFont(TQFont(TDEGlobalSettings::generalFont().family(),14)); textSprite->show( ); if(ship[0]->getHitPoints()==0) { diff --git a/ktron/main.cpp b/ktron/main.cpp index 24f48305..f86bd398 100644 --- a/ktron/main.cpp +++ b/ktron/main.cpp @@ -41,7 +41,7 @@ int main(int argc, char* argv[]) TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication a; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); // used for loading background pixmaps KImageIO::registerFormats(); diff --git a/ktuberling/main.cpp b/ktuberling/main.cpp index 5cef6c9d..9408c336 100644 --- a/ktuberling/main.cpp +++ b/ktuberling/main.cpp @@ -40,7 +40,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::addCmdLineOptions(options); TDEApplication app; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); KImageIO::registerFormats(); TopLevel *toplevel=0; diff --git a/libksirtet/base/factory.cpp b/libksirtet/base/factory.cpp index 5bf272ac..121e02c1 100644 --- a/libksirtet/base/factory.cpp +++ b/libksirtet/base/factory.cpp @@ -29,8 +29,8 @@ void BaseFactory::init(int argc, char **argv) { TDECmdLineArgs::init(argc, argv, _aboutData); (void)new TDEApplication; - KGlobal::locale()->insertCatalogue("libtdegames"); - KGlobal::locale()->insertCatalogue("libksirtet"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libksirtet"); } BaseFactory::~BaseFactory() diff --git a/libtdegames/README b/libtdegames/README index b96c1772..df28c8f6 100644 --- a/libtdegames/README +++ b/libtdegames/README @@ -19,7 +19,7 @@ Contents: of classes which are explained in the kgame docu (as soon as it is written) if you use libtdegames in your game please also add -KGlobal::locale()->insertCatalogue("libtdegames"); +TDEGlobal::locale()->insertCatalogue("libtdegames"); to main() This will add libtdegames.pot to your game and therefore all libtdegames strings get translated. diff --git a/libtdegames/highscore/kexthighscore_item.cpp b/libtdegames/highscore/kexthighscore_item.cpp index 5a7b9826..c7e294c1 100644 --- a/libtdegames/highscore/kexthighscore_item.cpp +++ b/libtdegames/highscore/kexthighscore_item.cpp @@ -132,7 +132,7 @@ TQString Item::pretty(uint, const TQVariant &value) const return timeFormat(value.toUInt()); case DateTime: if ( value.toDateTime().isNull() ) return "--"; - return KGlobal::locale()->formatDateTime(value.toDateTime()); + return TDEGlobal::locale()->formatDateTime(value.toDateTime()); case NoSpecial: break; } diff --git a/libtdegames/kcarddialog.cpp b/libtdegames/kcarddialog.cpp index 937eb26b..4a2c4168 100644 --- a/libtdegames/kcarddialog.cpp +++ b/libtdegames/kcarddialog.cpp @@ -226,7 +226,7 @@ TQString KCardDialog::getDefaultCardDir() KCardDialog::init(); TQString file = KCARD_DEFAULTCARDDIR + KCARD_DEFAULTCARD; - return KGlobal::dirs()->findResourceDir("cards",file) + KCARD_DEFAULTCARDDIR; + return TDEGlobal::dirs()->findResourceDir("cards",file) + KCARD_DEFAULTCARDDIR; } TQString KCardDialog::getCardPath(const TQString &carddir, int index) @@ -452,7 +452,7 @@ void KCardDialog::setupDialog(bool showResizeBox) void KCardDialog::insertCardIcons() { - TQStringList list = KGlobal::dirs()->findAllResources("cards", "card*/index.desktop", false, true); + TQStringList list = TDEGlobal::dirs()->findAllResources("cards", "card*/index.desktop", false, true); // kdDebug(11000) << "insert " << list.count() << endl; if (list.isEmpty()) return; @@ -488,7 +488,7 @@ void KCardDialog::insertCardIcons() void KCardDialog::insertDeckIcons() { - TQStringList list = KGlobal::dirs()->findAllResources("cards", "decks/*.desktop", false, true); + TQStringList list = TDEGlobal::dirs()->findAllResources("cards", "decks/*.desktop", false, true); if (list.isEmpty()) return; @@ -575,7 +575,7 @@ TQString KCardDialog::getRandomDeck() { KCardDialog::init(); - TQStringList list = KGlobal::dirs()->findAllResources("cards", "decks/*.desktop"); + TQStringList list = TDEGlobal::dirs()->findAllResources("cards", "decks/*.desktop"); if (list.isEmpty()) return TQString(); @@ -587,7 +587,7 @@ TQString KCardDialog::getRandomCardDir() { KCardDialog::init(); - TQStringList list = KGlobal::dirs()->findAllResources("cards", "card*/index.desktop"); + TQStringList list = TDEGlobal::dirs()->findAllResources("cards", "card*/index.desktop"); if (list.isEmpty()) return TQString(); @@ -799,9 +799,9 @@ void KCardDialog::init() static bool _inited = false; if (_inited) return; - KGlobal::dirs()->addResourceType("cards", KStandardDirs::kde_default("data") + TQString::fromLatin1("carddecks/")); + TDEGlobal::dirs()->addResourceType("cards", KStandardDirs::kde_default("data") + TQString::fromLatin1("carddecks/")); - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); _inited = true; } diff --git a/libtdegames/kchatbase.cpp b/libtdegames/kchatbase.cpp index 64434668..771975ca 100644 --- a/libtdegames/kchatbase.cpp +++ b/libtdegames/kchatbase.cpp @@ -222,7 +222,7 @@ void KChatBase::init(bool noComboBox) d->mEdit->setHandleSignals(false); d->mEdit->setTrapReturnKey(true); d->mEdit->completionObject(); // add the completion object - d->mEdit->setCompletionMode(KGlobalSettings::CompletionNone); + d->mEdit->setCompletionMode(TDEGlobalSettings::CompletionNone); connect(d->mEdit, TQT_SIGNAL(returnPressed(const TQString&)), this, TQT_SLOT(slotReturnPressed(const TQString&))); h->addWidget(d->mEdit); @@ -414,7 +414,7 @@ void KChatBase::slotClear() d->mBox->clear(); } -void KChatBase::setCompletionMode(KGlobalSettings::Completion mode) +void KChatBase::setCompletionMode(TDEGlobalSettings::Completion mode) { d->mEdit->setCompletionMode(mode); } void KChatBase::setNameFont(const TQFont& font) diff --git a/libtdegames/kchatbase.h b/libtdegames/kchatbase.h index 9753cc8d..5c28f6a7 100644 --- a/libtdegames/kchatbase.h +++ b/libtdegames/kchatbase.h @@ -290,7 +290,7 @@ public: /** * See KLineEdit::setCompletionMode **/ - void setCompletionMode(KGlobalSettings::Completion mode); + void setCompletionMode(TDEGlobalSettings::Completion mode); /** * Set the font that used used for the name part of a message. See also diff --git a/libtdegames/kgame/kgameio.h b/libtdegames/kgame/kgameio.h index e0118b8b..1478f632 100644 --- a/libtdegames/kgame/kgameio.h +++ b/libtdegames/kgame/kgameio.h @@ -28,7 +28,7 @@ #include <kdemacros.h> class KPlayer; class KGame; -class KProcess; +class TDEProcess; /** * \short Base class for IO devices for games diff --git a/libtdegames/kgame/kgameprocess.h b/libtdegames/kgame/kgameprocess.h index 609ee1fd..092acd0f 100644 --- a/libtdegames/kgame/kgameprocess.h +++ b/libtdegames/kgame/kgameprocess.h @@ -35,7 +35,7 @@ class KMessageFilePipe; /** * This is the process class used on the computer player - * side to communicate with its counterpart KProcessIO class. + * side to communicate with its counterpart TDEProcessIO class. * Using these two classes will give fully transparent communication * via TQDataStreams. */ @@ -222,7 +222,7 @@ class KDE_EXPORT KGameProcess: public TQObject /** * This signal is emmited when the process is initialized, i.e. added * to a KPlayer. Initial initialisation can be performed here be reacting - * to the KProcessIO signal signalIOAdded and retrieving the data here + * to the TDEProcessIO signal signalIOAdded and retrieving the data here * from the stream. * It works just as the signalTurn() but is only send when the player is * added to the game, i.e. it needs some initialization data diff --git a/libtdegames/kgame/kmessageio.cpp b/libtdegames/kgame/kmessageio.cpp index 37fbcc1f..6067d9e5 100644 --- a/libtdegames/kgame/kmessageio.cpp +++ b/libtdegames/kgame/kmessageio.cpp @@ -243,20 +243,20 @@ KMessageProcess::KMessageProcess(TQObject *parent, TQString file) : KMessageIO(p // Start process kdDebug(11001) << "@@@KMessageProcess::Start process" << endl; mProcessName=file; - mProcess=new KProcess; + mProcess=new TDEProcess; int id=0; *mProcess << mProcessName << TQString("%1").arg(id); kdDebug(11001) << "@@@KMessageProcess::Init:Id= " << id << endl; kdDebug(11001) << "@@@KMessgeProcess::Init:Processname: " << mProcessName << endl; - connect(mProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )), - this, TQT_SLOT(slotReceivedStdout(KProcess *, char * , int ))); - connect(mProcess, TQT_SIGNAL(receivedStderr(KProcess *, char *, int )), - this, TQT_SLOT(slotReceivedStderr(KProcess *, char * , int ))); - connect(mProcess, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(slotProcessExited(KProcess *))); - connect(mProcess, TQT_SIGNAL(wroteStdin(KProcess *)), - this, TQT_SLOT(slotWroteStdin(KProcess *))); - mProcess->start(KProcess::NotifyOnExit,KProcess::All); + connect(mProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )), + this, TQT_SLOT(slotReceivedStdout(TDEProcess *, char * , int ))); + connect(mProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int )), + this, TQT_SLOT(slotReceivedStderr(TDEProcess *, char * , int ))); + connect(mProcess, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(slotProcessExited(TDEProcess *))); + connect(mProcess, TQT_SIGNAL(wroteStdin(TDEProcess *)), + this, TQT_SLOT(slotWroteStdin(TDEProcess *))); + mProcess->start(TDEProcess::NotifyOnExit,TDEProcess::All); mSendBuffer=0; mReceiveCount=0; mReceiveBuffer.resize(1024); @@ -300,7 +300,7 @@ void KMessageProcess::writeToProcess() mProcess->writeStdin(mSendBuffer->data(),mSendBuffer->size()); } -void KMessageProcess::slotWroteStdin(KProcess * ) +void KMessageProcess::slotWroteStdin(TDEProcess * ) { kdDebug(11001) << k_funcinfo << endl; if (mSendBuffer) @@ -311,7 +311,7 @@ void KMessageProcess::slotWroteStdin(KProcess * ) writeToProcess(); } -void KMessageProcess::slotReceivedStderr(KProcess * proc, char *buffer, int buflen) +void KMessageProcess::slotReceivedStderr(TDEProcess * proc, char *buffer, int buflen) { int pid=0; int len; @@ -341,7 +341,7 @@ void KMessageProcess::slotReceivedStderr(KProcess * proc, char *buffer, int bufl } -void KMessageProcess::slotReceivedStdout(KProcess * , char *buffer, int buflen) +void KMessageProcess::slotReceivedStdout(TDEProcess * , char *buffer, int buflen) { kdDebug(11001) << "$$$$$$ " << k_funcinfo << ": Received " << buflen << " bytes over inter process communication" << endl; @@ -387,7 +387,7 @@ void KMessageProcess::slotReceivedStdout(KProcess * , char *buffer, int buflen) } } -void KMessageProcess::slotProcessExited(KProcess * /*p*/) +void KMessageProcess::slotProcessExited(TDEProcess * /*p*/) { kdDebug(11001) << "Process exited (slot)" << endl; emit connectionBroken(); diff --git a/libtdegames/kgame/kmessageio.h b/libtdegames/kgame/kmessageio.h index 16dea633..0a8d4172 100644 --- a/libtdegames/kgame/kmessageio.h +++ b/libtdegames/kgame/kmessageio.h @@ -33,7 +33,7 @@ #include <kdebug.h> class TQSocket; -class KProcess; +class TDEProcess; //class TQFile; @@ -373,14 +373,14 @@ class KMessageProcess : public KMessageIO public slots: - void slotReceivedStdout(KProcess *proc, char *buffer, int buflen); - void slotReceivedStderr(KProcess *proc, char *buffer, int buflen); - void slotProcessExited(KProcess *p); - void slotWroteStdin(KProcess *p); + void slotReceivedStdout(TDEProcess *proc, char *buffer, int buflen); + void slotReceivedStderr(TDEProcess *proc, char *buffer, int buflen); + void slotProcessExited(TDEProcess *p); + void slotWroteStdin(TDEProcess *p); private: TQString mProcessName; - KProcess *mProcess; + TDEProcess *mProcess; TQPtrQueue <TQByteArray> mQueue; TQByteArray *mSendBuffer; TQByteArray mReceiveBuffer; diff --git a/lskat/lskat.kdevprj b/lskat/lskat.kdevprj index 58eb63d7..6a561dea 100644 --- a/lskat/lskat.kdevprj +++ b/lskat/lskat.kdevprj @@ -141,12 +141,12 @@ dist=true install=false install_location= type=HEADER -[lskat/KProcessConnect.cpp] +[lskat/TDEProcessConnect.cpp] dist=true install=false install_location= type=SOURCE -[lskat/KProcessConnect.h] +[lskat/TDEProcessConnect.h] dist=true install=false install_location= @@ -172,7 +172,7 @@ install=false install_location= type=HEADER [lskat/Makefile.am] -files=lskat/main.cpp,lskat/lskat.cpp,lskat/lskat.h,lskat/lskatdoc.cpp,lskat/lskatdoc.h,lskat/lskatview.cpp,lskat/lskatview.h,lskat/resource.h,lskat/lskat.desktop,lskat/lskat.xpm,lskat/mini-lskat.xpm,lskat/KChildConnect.cpp,lskat/KChildConnect.h,lskat/KConnectEntry.cpp,lskat/KConnectEntry.h,lskat/KConnectTypes.h,lskat/KEInput.cpp,lskat/KEInput.h,lskat/KEMessage.cpp,lskat/KEMessage.h,lskat/KInputChildProcess.cpp,lskat/KInputChildProcess.h,lskat/KInteractiveConnect.cpp,lskat/KInteractiveConnect.h,lskat/KMessageEntry.cpp,lskat/KMessageEntry.h,lskat/KProcessConnect.cpp,lskat/KProcessConnect.h,lskat/KRSocket.cpp,lskat/KRSocket.h,lskat/KRemoteConnect.cpp,lskat/KRemoteConnect.h,lskat/namedlg.cpp,lskat/namedlg.h,lskat/networkdlg.cpp,lskat/networkdlg.h,lskat/aboutdlg.cpp,lskat/aboutdlg.h,lskat/aboutdlgdata.cpp,lskat/msgdlg.cpp,lskat/msgdlg.h +files=lskat/main.cpp,lskat/lskat.cpp,lskat/lskat.h,lskat/lskatdoc.cpp,lskat/lskatdoc.h,lskat/lskatview.cpp,lskat/lskatview.h,lskat/resource.h,lskat/lskat.desktop,lskat/lskat.xpm,lskat/mini-lskat.xpm,lskat/KChildConnect.cpp,lskat/KChildConnect.h,lskat/KConnectEntry.cpp,lskat/KConnectEntry.h,lskat/KConnectTypes.h,lskat/KEInput.cpp,lskat/KEInput.h,lskat/KEMessage.cpp,lskat/KEMessage.h,lskat/KInputChildProcess.cpp,lskat/KInputChildProcess.h,lskat/KInteractiveConnect.cpp,lskat/KInteractiveConnect.h,lskat/KMessageEntry.cpp,lskat/KMessageEntry.h,lskat/TDEProcessConnect.cpp,lskat/TDEProcessConnect.h,lskat/KRSocket.cpp,lskat/KRSocket.h,lskat/KRemoteConnect.cpp,lskat/KRemoteConnect.h,lskat/namedlg.cpp,lskat/namedlg.h,lskat/networkdlg.cpp,lskat/networkdlg.h,lskat/aboutdlg.cpp,lskat/aboutdlg.h,lskat/aboutdlgdata.cpp,lskat/msgdlg.cpp,lskat/msgdlg.h sub_dirs= type=prog_main [lskat/aboutdlg.cpp] diff --git a/lskat/lskat/KConnectEntry.cpp b/lskat/lskat/KConnectEntry.cpp index 870b8cd2..ba714b58 100644 --- a/lskat/lskat/KConnectEntry.cpp +++ b/lskat/lskat/KConnectEntry.cpp @@ -45,7 +45,7 @@ KRemoteConnect *KConnectEntry::QueryRemoteConnect() return connect.r; } -KProcessConnect *KConnectEntry::QueryProcessConnect() +TDEProcessConnect *KConnectEntry::QueryProcessConnect() { return connect.p; } @@ -132,7 +132,7 @@ bool KConnectEntry::Init(KG_INPUTTYPE stype,int id,KEMessage *msg) result=connect.r->Init(id,msg); break; case KG_INPUTTYPE_PROCESS: - connect.p=new KProcessConnect; + connect.p=new TDEProcessConnect; result=connect.p->Init(id,msg); break; default: result=FALSE; diff --git a/lskat/lskat/KConnectEntry.h b/lskat/lskat/KConnectEntry.h index 73619eac..f62c6e2d 100644 --- a/lskat/lskat/KConnectEntry.h +++ b/lskat/lskat/KConnectEntry.h @@ -19,7 +19,7 @@ #include <string.h> #include "KRemoteConnect.h" -#include "KProcessConnect.h" +#include "TDEProcessConnect.h" #include "KInteractiveConnect.h" #include "KConnectTypes.h" #include "KEMessage.h" @@ -27,7 +27,7 @@ union UConnect { KRemoteConnect *r; - KProcessConnect *p; + TDEProcessConnect *p; KInteractiveConnect *i; }; @@ -42,7 +42,7 @@ class KConnectEntry public: KG_INPUTTYPE QueryType(); KRemoteConnect *QueryRemoteConnect(); - KProcessConnect *QueryProcessConnect(); + TDEProcessConnect *QueryProcessConnect(); KInteractiveConnect *QueryInteractiveConnect(); KConnectEntry(); ~KConnectEntry(); diff --git a/lskat/lskat/KEInput.h b/lskat/lskat/KEInput.h index c5629c8b..a2b391c8 100644 --- a/lskat/lskat/KEInput.h +++ b/lskat/lskat/KEInput.h @@ -23,7 +23,7 @@ #include <tqmemarray.h> #include "KConnectEntry.h" #include "KRemoteConnect.h" -#include "KProcessConnect.h" +#include "TDEProcessConnect.h" #include "KInteractiveConnect.h" #include "KEMessage.h" #include "KConnectTypes.h" @@ -42,7 +42,7 @@ class KEInput : public TQObject TQTimer *cTimer; TQPtrList<KRemoteConnect> remoteList; - TQPtrList<KProcessConnect> computerList; + TQPtrList<TDEProcessConnect> computerList; TQPtrList<KInteractiveConnect> interactiveList; TQMemArray<KConnectEntry> playerArray; diff --git a/lskat/lskat/KProcessConnect.cpp b/lskat/lskat/KProcessConnect.cpp index 97cd9221..b2038b4f 100644 --- a/lskat/lskat/KProcessConnect.cpp +++ b/lskat/lskat/KProcessConnect.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - KProcessConnect.cpp - description + TDEProcessConnect.cpp - description ------------------- begin : Tue May 2 2000 copyright : (C) 2000 by Martin Heni @@ -31,25 +31,25 @@ * * ***************************************************************************/ #include <stdio.h> -#include "KProcessConnect.h" +#include "TDEProcessConnect.h" -#include "KProcessConnect.moc" +#include "TDEProcessConnect.moc" -KProcessConnect::KProcessConnect() +TDEProcessConnect::TDEProcessConnect() : KChildConnect() { running=false; process=0; } -KProcessConnect::~KProcessConnect() +TDEProcessConnect::~TDEProcessConnect() { Exit(); delete process; // printf("DESTRUCTRING KPROCESSCONNECT\n"); } -bool KProcessConnect::Init(int id,KEMessage *msg) +bool TDEProcessConnect::Init(int id,KEMessage *msg) { int size; char *p; @@ -73,19 +73,19 @@ bool KProcessConnect::Init(int id,KEMessage *msg) if (running) Exit(); // create process - process=new KProcess; + process=new TDEProcess; *process << processname; - connect(process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )), - this, TQT_SLOT(slotReceivedStdout(KProcess *, char * , int ))); - connect(process, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(slotProcessExited(KProcess *))); + connect(process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )), + this, TQT_SLOT(slotReceivedStdout(TDEProcess *, char * , int ))); + connect(process, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(slotProcessExited(TDEProcess *))); /* - connect(process, TQT_SIGNAL(wroteStdin(KProcess *)), - this, TQT_SLOT(slotWroteStdin(KProcess *))); + connect(process, TQT_SIGNAL(wroteStdin(TDEProcess *)), + this, TQT_SLOT(slotWroteStdin(TDEProcess *))); */ // TRUE if ok - running=process->start(KProcess::NotifyOnExit,KProcess::All); + running=process->start(TDEProcess::NotifyOnExit,TDEProcess::All); if (running && msg && msg->QueryNumberOfKeys()>0) { @@ -95,7 +95,7 @@ bool KProcessConnect::Init(int id,KEMessage *msg) return running; } -void KProcessConnect::slotReceivedStdout(KProcess *, char *buffer, int buflen) +void TDEProcessConnect::slotReceivedStdout(TDEProcess *, char *buffer, int buflen) { TQString s; char c; @@ -134,19 +134,19 @@ void KProcessConnect::slotReceivedStdout(KProcess *, char *buffer, int buflen) Receive(s); } } -void KProcessConnect::slotProcessExited(KProcess *) +void TDEProcessConnect::slotProcessExited(TDEProcess *) { running=false; delete process; process=0; Init(QueryID()); } -void KProcessConnect::slotWroteStdin(KProcess *) +void TDEProcessConnect::slotWroteStdin(TDEProcess *) { printf("slotWroteStdin:: IS NEVER CALLED\n"); } -bool KProcessConnect::Exit() +bool TDEProcessConnect::Exit() { // kill process if running if (running) @@ -159,12 +159,12 @@ bool KProcessConnect::Exit() return true; } -bool KProcessConnect::Next() +bool TDEProcessConnect::Next() { bool result; if (!running) return false; // create and send message - // printf("+- KProcessConnect::ProcessNext\n"); + // printf("+- TDEProcessConnect::ProcessNext\n"); KEMessage *msg=new KEMessage; // User fills message emit signalPrepareMove(msg,KG_INPUTTYPE_PROCESS); @@ -174,7 +174,7 @@ bool KProcessConnect::Next() } // Send string to child -bool KProcessConnect::Send(TQString str) +bool TDEProcessConnect::Send(TQString str) { bool result; // printf("****** PROCESS:SEND\n"); diff --git a/lskat/lskat/KProcessConnect.h b/lskat/lskat/KProcessConnect.h index 13659500..3a38e23b 100644 --- a/lskat/lskat/KProcessConnect.h +++ b/lskat/lskat/KProcessConnect.h @@ -1,5 +1,5 @@ /*************************************************************************** - KProcessConnect.h - description + TDEProcessConnect.h - description ------------------- begin : Tue May 2 2000 copyright : (C) 2000 by Martin Heni @@ -24,19 +24,19 @@ #include "KChildConnect.h" -class KProcessConnect: public KChildConnect +class TDEProcessConnect: public KChildConnect { Q_OBJECT private: - KProcess *process; + TDEProcess *process; TQString processname; bool running; public: - KProcessConnect(); - ~KProcessConnect(); + TDEProcessConnect(); + ~TDEProcessConnect(); bool Init(int id=0,KEMessage *msg=0); bool Exit(); bool Next(); @@ -45,9 +45,9 @@ class KProcessConnect: public KChildConnect // void Receive(TQString input); public slots: - void slotReceivedStdout(KProcess *proc, char *buffer, int buflen); - void slotProcessExited(KProcess *p); - void slotWroteStdin(KProcess *p); + void slotReceivedStdout(TDEProcess *proc, char *buffer, int buflen); + void slotProcessExited(TDEProcess *p); + void slotWroteStdin(TDEProcess *p); signals: diff --git a/lskat/lskat/Makefile.am b/lskat/lskat/Makefile.am index 55815d90..c5116694 100644 --- a/lskat/lskat/Makefile.am +++ b/lskat/lskat/Makefile.am @@ -1,7 +1,7 @@ ####### tdevelop will overwrite this part!!! (begin)########## bin_PROGRAMS = lskat -lskat_SOURCES = msgdlg.cpp networkdlg.cpp namedlg.cpp KRemoteConnect.cpp KRSocket.cpp KProcessConnect.cpp KMessageEntry.cpp KInteractiveConnect.cpp KInputChildProcess.cpp KEMessage.cpp KEInput.cpp KConnectEntry.cpp KChildConnect.cpp lskatview.cpp lskatdoc.cpp lskat.cpp main.cpp networkdlgbase.ui +lskat_SOURCES = msgdlg.cpp networkdlg.cpp namedlg.cpp KRemoteConnect.cpp KRSocket.cpp TDEProcessConnect.cpp KMessageEntry.cpp KInteractiveConnect.cpp KInputChildProcess.cpp KEMessage.cpp KEInput.cpp KConnectEntry.cpp KChildConnect.cpp lskatview.cpp lskatdoc.cpp lskat.cpp main.cpp networkdlgbase.ui lskat_LDADD = $(LIB_KFILE) $(LIB_TDEGAMES) $(LIB_KDNSSD) lskat_DEPENDENCIES = $(LIB_TDEGAMES_DEP) diff --git a/lskat/lskat/lskatview.cpp b/lskat/lskat/lskatview.cpp index 9ba0dd94..8a948b2a 100644 --- a/lskat/lskat/lskatview.cpp +++ b/lskat/lskat/lskatview.cpp @@ -252,7 +252,7 @@ void LSkatView::drawIntro(TQPainter *p) TQPoint point,point1,p2; TQString s; // Get a nice font - TQFont font = KGlobalSettings::generalFont(); + TQFont font = TDEGlobalSettings::generalFont(); font.setPointSize(48); // Get the font info to determine text sizes TQFontMetrics fontMetrics(font); @@ -367,9 +367,9 @@ void LSkatView::drawFinal(TQPainter *p) TQString ld; int ts[10]; - TQFont font24 = KGlobalSettings::generalFont(); + TQFont font24 = TDEGlobalSettings::generalFont(); font24.setPointSize(24); - TQFont font14 = KGlobalSettings::generalFont(); + TQFont font14 = TDEGlobalSettings::generalFont(); font14.setPointSize(13); //p1=status_rect3.topLeft(); @@ -621,7 +621,7 @@ void LSkatView::drawStatus(TQPainter *p) srect[0]=status_rect1; srect[1]=status_rect2; - TQFont font10 = KGlobalSettings::generalFont(); + TQFont font10 = TDEGlobalSettings::generalFont(); font10.setPointSize(13); p->setFont(font10); diff --git a/twin4/twin4/main.cpp b/twin4/twin4/main.cpp index d6a648f8..35ddc6ff 100644 --- a/twin4/twin4/main.cpp +++ b/twin4/twin4/main.cpp @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) } args->clear(); TDEApplication app(argc, argv); - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); if (app.isRestored()) { |