diff options
Diffstat (limited to 'kmplot')
-rw-r--r-- | kmplot/kmplot/FktDlg.cpp | 2 | ||||
-rw-r--r-- | kmplot/kmplot/MainDlg.cpp | 12 | ||||
-rw-r--r-- | kmplot/kmplot/View.cpp | 10 | ||||
-rw-r--r-- | kmplot/kmplot/editfunction.cpp | 2 | ||||
-rw-r--r-- | kmplot/kmplot/keditparametric.cpp | 2 | ||||
-rw-r--r-- | kmplot/kmplot/keditpolar.cpp | 2 | ||||
-rw-r--r-- | kmplot/kmplot/kmplot.cpp | 12 | ||||
-rw-r--r-- | kmplot/kmplot/xparser.cpp | 8 |
8 files changed, 25 insertions, 25 deletions
diff --git a/kmplot/kmplot/FktDlg.cpp b/kmplot/kmplot/FktDlg.cpp index 7597fc9e..e4df4f6d 100644 --- a/kmplot/kmplot/FktDlg.cpp +++ b/kmplot/kmplot/FktDlg.cpp @@ -297,7 +297,7 @@ void FktDlg::getPlots() void FktDlg::slotHelp() { - kapp->invokeHelp( "", "kmplot" ); + tdeApp->invokeHelp( "", "kmplot" ); } bool FktDlg::isChanged() diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp index 5202a98c..31c62e7f 100644 --- a/kmplot/kmplot/MainDlg.cpp +++ b/kmplot/kmplot/MainDlg.cpp @@ -95,7 +95,7 @@ MainDlg::MainDlg(TQWidget *parentWidget, const char *, TQObject *parent, const c setupActions(); loadConstants(); kmplotio = new KmPlotIO(view->parser()); - m_config = kapp->config(); + m_config = tdeApp->config(); m_recentFiles->loadEntries( m_config ); // Let's create a Configure Diloag @@ -127,7 +127,7 @@ void MainDlg::setupActions() KStdAction::print( this, TQ_SLOT( slotPrint() ), actionCollection(),"file_print" ); KStdAction::save( this, TQ_SLOT( slotSave() ), actionCollection() ); KStdAction::saveAs( this, TQ_SLOT( slotSaveas() ), actionCollection() ); - connect( kapp, TQ_SIGNAL( lastWindowClosed() ), kapp, TQ_SLOT( quit() ) ); + connect( tdeApp, TQ_SIGNAL( lastWindowClosed() ), tdeApp, TQ_SLOT( quit() ) ); TDEAction *prefs = KStdAction::preferences( this, TQ_SLOT( slotSettings() ), actionCollection()); prefs->setText( i18n( "Configure KmPlot..." ) ); @@ -369,7 +369,7 @@ void MainDlg::slotOpenRecent( const KURL &url ) TQByteArray data; TQDataStream stream(data, IO_WriteOnly); stream << url; - TDEApplication::kApplication()->dcopClient()->send(TDEApplication::kApplication()->dcopClient()->appId(), "KmPlotShell","openFileInNewWindow(KURL)", data); + tdeApp->dcopClient()->send(tdeApp->dcopClient()->appId(), "KmPlotShell","openFileInNewWindow(KURL)", data); return; } @@ -457,7 +457,7 @@ void MainDlg::editConstants() void MainDlg::slotNames() { - kapp->invokeHelp( "func-predefined", "kmplot" ); + tdeApp->invokeHelp( "func-predefined", "kmplot" ); } void MainDlg::newFunction() @@ -752,12 +752,12 @@ void MainDlg::setReadOnlyStatusBarText(const TQString &text) void MainDlg::optionsConfigureKeys() { - TDEApplication::kApplication()->dcopClient()->send(TDEApplication::kApplication()->dcopClient()->appId(), "KmPlotShell","optionsConfigureKeys()", TQByteArray()); + tdeApp->dcopClient()->send(tdeApp->dcopClient()->appId(), "KmPlotShell","optionsConfigureKeys()", TQByteArray()); } void MainDlg::optionsConfigureToolbars() { - TDEApplication::kApplication()->dcopClient()->send(TDEApplication::kApplication()->dcopClient()->appId(), "KmPlotShell","optionsConfigureToolbars()", TQByteArray()); + tdeApp->dcopClient()->send(tdeApp->dcopClient()->appId(), "KmPlotShell","optionsConfigureToolbars()", TQByteArray()); } void MainDlg::resetZoom() diff --git a/kmplot/kmplot/View.cpp b/kmplot/kmplot/View.cpp index abadabdf..db089543 100644 --- a/kmplot/kmplot/View.cpp +++ b/kmplot/kmplot/View.cpp @@ -56,7 +56,7 @@ double View::xmin = 0; double View::xmax = 0; -View::View(bool const r, bool &mo, TDEPopupMenu *p, TQWidget* parent, const char* name ) : DCOPObject("View"), TQWidget( parent, name , WStaticContents ), buffer( width(), height() ), m_popupmenu(p), m_modified(mo), m_readonly(r), m_dcop_client(TDEApplication::kApplication()->dcopClient()) +View::View(bool const r, bool &mo, TDEPopupMenu *p, TQWidget* parent, const char* name ) : DCOPObject("View"), TQWidget( parent, name , WStaticContents ), buffer( width(), height() ), m_popupmenu(p), m_modified(mo), m_readonly(r), m_dcop_client(tdeApp->dcopClient()) { csmode = csparam = -1; cstype = 0; @@ -346,7 +346,7 @@ void View::plotfkt(Ufkt *ufkt, TQPainter *pDC) y = m_parser->euler_method(x, ufkt); if ( int(x*100)%2==0) { - TDEApplication::kApplication()->processEvents(); //makes the program usable when drawing a complicated integral function + tdeApp->processEvents(); //makes the program usable when drawing a complicated integral function increaseProgressBar(); } break; @@ -1283,7 +1283,7 @@ void View::findMinMaxValue(Ufkt *ufkt, char p_mode, bool minimum, double &dmin, y = m_parser->euler_method(x, ufkt); if ( int(x*100)%2==0) { - TDEApplication::kApplication()->processEvents(); //makes the program usable when drawing a complicated integral function + tdeApp->processEvents(); //makes the program usable when drawing a complicated integral function increaseProgressBar(); } break; @@ -1416,7 +1416,7 @@ void View::getYValue(Ufkt *ufkt, char p_mode, double x, double &y, const TQStri y = m_parser->euler_method( x, ufkt ); if ( int(x*100)%2==0) { - TDEApplication::kApplication()->processEvents(); //makes the program usable when drawing a complicated integral function + tdeApp->processEvents(); //makes the program usable when drawing a complicated integral function increaseProgressBar(); } @@ -1716,7 +1716,7 @@ void View::areaUnderGraph( Ufkt *ufkt, char const p_mode, double &dmin, double y = m_parser->euler_method(x, ufkt); if ( int(x*100)%2==0) { - TDEApplication::kApplication()->processEvents(); //makes the program usable when drawing a complicated integral function + tdeApp->processEvents(); //makes the program usable when drawing a complicated integral function increaseProgressBar(); } break; diff --git a/kmplot/kmplot/editfunction.cpp b/kmplot/kmplot/editfunction.cpp index 66547508..0e9e7a09 100644 --- a/kmplot/kmplot/editfunction.cpp +++ b/kmplot/kmplot/editfunction.cpp @@ -386,7 +386,7 @@ Ufkt * EditFunction::functionItem() void EditFunction::slotHelp() { - kapp->invokeHelp( "", "kmplot" ); + tdeApp->invokeHelp( "", "kmplot" ); } bool EditFunction::functionHas2Arguments() diff --git a/kmplot/kmplot/keditparametric.cpp b/kmplot/kmplot/keditparametric.cpp index ae4fbe10..ce0f2f74 100644 --- a/kmplot/kmplot/keditparametric.cpp +++ b/kmplot/kmplot/keditparametric.cpp @@ -326,7 +326,7 @@ Ufkt * KEditParametric::functionItem() void KEditParametric::slotHelp() { - kapp->invokeHelp( "", "kmplot" ); + tdeApp->invokeHelp( "", "kmplot" ); } void KEditParametric::customMinRange_toggled(bool status) { diff --git a/kmplot/kmplot/keditpolar.cpp b/kmplot/kmplot/keditpolar.cpp index 1d730b04..b1d4815e 100644 --- a/kmplot/kmplot/keditpolar.cpp +++ b/kmplot/kmplot/keditpolar.cpp @@ -230,7 +230,7 @@ Ufkt *KEditPolar::functionItem() void KEditPolar::slotHelp() { - kapp->invokeHelp( "", "kmplot" ); + tdeApp->invokeHelp( "", "kmplot" ); } void KEditPolar::customMinRange_toggled(bool status) diff --git a/kmplot/kmplot/kmplot.cpp b/kmplot/kmplot/kmplot.cpp index a6c17053..7c3208d9 100644 --- a/kmplot/kmplot/kmplot.cpp +++ b/kmplot/kmplot/kmplot.cpp @@ -75,8 +75,8 @@ KmPlot::KmPlot( TDECmdLineArgs* args) // if we couldn't find our Part, we exit since the Shell by // itself can't do anything useful KMessageBox::error(this, i18n("Could not find KmPlot's part.")); - kapp->quit(); - // we return here, cause kapp->quit() only means "exit the + tdeApp->quit(); + // we return here, cause tdeApp->quit() only means "exit the // next time we enter the event loop... return; } @@ -137,7 +137,7 @@ void KmPlot::setupActions() { KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); @@ -265,7 +265,7 @@ bool KmPlot::checkModified() { TQCString replyType; TQByteArray replyData; - kapp->dcopClient()->call(kapp->dcopClient()->appId(), "MainDlg","checkModified()", TQByteArray(), replyType, replyData, false); + tdeApp->dcopClient()->call(tdeApp->dcopClient()->appId(), "MainDlg","checkModified()", TQByteArray(), replyType, replyData, false); bool result; TQDataStream stream(replyData, IO_ReadOnly); stream >> result; @@ -276,7 +276,7 @@ bool KmPlot::isModified() { TQCString replyType; TQByteArray replyData; - kapp->dcopClient()->call(kapp->dcopClient()->appId(), "MainDlg","isModified()", TQByteArray(), replyType, replyData, false); + tdeApp->dcopClient()->call(tdeApp->dcopClient()->appId(), "MainDlg","isModified()", TQByteArray(), replyType, replyData, false); bool result; TQDataStream stream(replyData, IO_ReadOnly); stream >> result; @@ -312,7 +312,7 @@ void KmPlot::setupStatusBar() void KmPlot::progressbar_clicked() { - kapp->dcopClient()->send(kapp->dcopClient()->appId(), "View","stopDrawing()", TQByteArray()); + tdeApp->dcopClient()->send(tdeApp->dcopClient()->appId(), "View","stopDrawing()", TQByteArray()); } #include "kmplot.moc" diff --git a/kmplot/kmplot/xparser.cpp b/kmplot/kmplot/xparser.cpp index 4ab4300f..624b4883 100644 --- a/kmplot/kmplot/xparser.cpp +++ b/kmplot/kmplot/xparser.cpp @@ -759,10 +759,10 @@ bool XParser::setFunctionExpression(const TQString &f_str, uint id) bool XParser::sendFunction(int id, const TQString &dcopclient_target) { - QCStringList cstr_list = kapp->dcopClient()->registeredApplications(); + QCStringList cstr_list = tdeApp->dcopClient()->registeredApplications(); TQStringList str_list; for ( QCStringList::iterator it = cstr_list.begin(); it!=cstr_list.end();++it ) - if ( TQString(*it).startsWith("kmplot") && *it!=kapp->dcopClient()->appId() ) + if ( TQString(*it).startsWith("kmplot") && *it!=tdeApp->dcopClient()->appId() ) str_list.append(*it); if ( str_list.isEmpty() ) { @@ -801,7 +801,7 @@ bool XParser::sendFunction(int id, const TQString &dcopclient_target) arg << item->fstr << item->f_mode << item->f1_mode << item->f2_mode << item->integral_mode << item->integral_use_precision << item->linewidth << item->f1_linewidth << item->f2_linewidth << item->integral_linewidth << str_dmin << str_dmax << item->str_startx << item->str_starty << item->integral_precision << item->color << item->f1_color << item->f2_color << item->integral_color << str_parameters << item->use_slider; TQByteArray replay_data; TQCString replay_type; - bool ok = kapp->dcopClient()->call( str_result.utf8(), "Parser", "addFunction(TQString,bool,bool,bool,bool,bool,int,int,int,int,TQString,TQString,TQString,TQString,double,TQRgb,TQRgb,TQRgb,TQRgb,TQStringList,int)", parameters, replay_type, replay_data, false); + bool ok = tdeApp->dcopClient()->call( str_result.utf8(), "Parser", "addFunction(TQString,bool,bool,bool,bool,bool,int,int,int,int,TQString,TQString,TQString,TQString,double,TQRgb,TQRgb,TQRgb,TQRgb,TQStringList,int)", parameters, replay_type, replay_data, false); if (!ok) { KMessageBox::error(0, i18n("An error appeared during the transfer")); @@ -817,7 +817,7 @@ bool XParser::sendFunction(int id, const TQString &dcopclient_target) return false; } - kapp->dcopClient()->send(str_result.utf8(), "View","drawPlot()",TQByteArray() ); //update the other window + tdeApp->dcopClient()->send(str_result.utf8(), "View","drawPlot()",TQByteArray() ); //update the other window if (item->fname.at(0) == 'x') // a parametric function return sendFunction(id+1, str_result); |