diff options
Diffstat (limited to 'kmplot')
41 files changed, 182 insertions, 433 deletions
diff --git a/kmplot/KmPlot.tdevelop b/kmplot/KmPlot.tdevelop deleted file mode 100644 index 5e48c5d2..00000000 --- a/kmplot/KmPlot.tdevelop +++ /dev/null @@ -1,156 +0,0 @@ -<?xml version = '1.0'?> -<tdevelop> - <general> - <author>Klaus-Dieter Moeller</author> - <email>kd.moeller@t-online.de</email> - <version>$VERSION$</version> - <projectmanagement>KDevCustomProject</projectmanagement> - <primarylanguage>C</primarylanguage> - <ignoreparts/> - <projectdirectory>.</projectdirectory> - <absoluteprojectpath>false</absoluteprojectpath> - <description/> - <secondaryLanguages> - <language>C++</language> - </secondaryLanguages> - </general> - <kdevcustomproject> - <run> - <mainprogram>kmplot/kmplot</mainprogram> - <directoryradio>executable</directoryradio> - <customdirectory>/</customdirectory> - <programargs/> - <terminal>false</terminal> - <autocompile>true</autocompile> - <envvars/> - </run> - <build> - <buildtool>make</buildtool> - <builddir/> - </build> - <make> - <abortonerror>false</abortonerror> - <numberofjobs>1</numberofjobs> - <dontact>false</dontact> - <makebin/> - <selectedenvironment>default</selectedenvironment> - <environments> - <default/> - </environments> - <makeoptions/> - </make> - </kdevcustomproject> - <kdevdebugger> - <general> - <dbgshell/> - <programargs/> - <gdbpath/> - <configGdbScript/> - <runShellScript/> - <runGdbScript/> - <breakonloadinglibs>true</breakonloadinglibs> - <separatetty>false</separatetty> - <floatingtoolbar>false</floatingtoolbar> - </general> - <display> - <staticmembers>false</staticmembers> - <demanglenames>true</demanglenames> - <outputradix>10</outputradix> - </display> - </kdevdebugger> - <kdevdoctreeview> - <ignoretocs> - <toc>ada</toc> - <toc>ada_bugs_gcc</toc> - <toc>bash</toc> - <toc>bash_bugs</toc> - <toc>clanlib</toc> - <toc>fortran_bugs_gcc</toc> - <toc>gnome1</toc> - <toc>gnustep</toc> - <toc>gtk</toc> - <toc>gtk_bugs</toc> - <toc>haskell</toc> - <toc>haskell_bugs_ghc</toc> - <toc>java_bugs_gcc</toc> - <toc>java_bugs_sun</toc> - <toc>kde2book</toc> - <toc>libstdc++</toc> - <toc>opengl</toc> - <toc>pascal_bugs_fp</toc> - <toc>php</toc> - <toc>php_bugs</toc> - <toc>perl</toc> - <toc>perl_bugs</toc> - <toc>python</toc> - <toc>python_bugs</toc> - <toc>qt-kdev3</toc> - <toc>ruby</toc> - <toc>ruby_bugs</toc> - <toc>sdl</toc> - <toc>stl</toc> - <toc>sw</toc> - <toc>w3c-dom-level2-html</toc> - <toc>w3c-svg</toc> - <toc>w3c-uaag10</toc> - <toc>wxwindows_bugs</toc> - </ignoretocs> - <ignoreqt_xml> - <toc>Guide to the Qt Translation Tools</toc> - <toc>Qt Assistant Manual</toc> - <toc>Qt Designer Manual</toc> - <toc>Qt Reference Documentation</toc> - <toc>qmake User Guide</toc> - </ignoreqt_xml> - <ignoredoxygen> - <toc>KDE Libraries (Doxygen)</toc> - </ignoredoxygen> - <projectdoc> - <userdocDir>html/</userdocDir> - <apidocDir>html/</apidocDir> - </projectdoc> - <ignorekdocs/> - <ignoredevhelp/> - </kdevdoctreeview> - <kdevfilecreate> - <filetypes/> - <useglobaltypes> - <type ext="c" /> - <type ext="h" /> - </useglobaltypes> - </kdevfilecreate> - <kdevcppsupport> - <references> - <pcs>Qt</pcs> - <pcs>KDElibs</pcs> - </references> - <codecompletion> - <includeGlobalFunctions>true</includeGlobalFunctions> - <includeTypes>true</includeTypes> - <includeEnums>true</includeEnums> - <includeTypedefs>false</includeTypedefs> - <automaticCodeCompletion>true</automaticCodeCompletion> - <automaticArgumentsHint>true</automaticArgumentsHint> - <automaticHeaderCompletion>true</automaticHeaderCompletion> - <codeCompletionDelay>250</codeCompletionDelay> - <argumentsHintDelay>400</argumentsHintDelay> - <headerCompletionDelay>250</headerCompletionDelay> - </codecompletion> - </kdevcppsupport> - <kdevfileview> - <groups> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidenonlocation>false</hidenonlocation> - </groups> - <tree> - <hidepatterns>*.o,*.lo,CVS,*.moc,*~</hidepatterns> - <hidenonprojectfiles>false</hidenonprojectfiles> - </tree> - </kdevfileview> - <cppsupportpart> - <filetemplates> - <interfacesuffix>.h</interfacesuffix> - <implementationsuffix>.cpp</implementationsuffix> - </filetemplates> - </cppsupportpart> -</tdevelop> diff --git a/kmplot/KmPlot.tdevelop.filelist b/kmplot/KmPlot.tdevelop.filelist deleted file mode 100644 index f17adc32..00000000 --- a/kmplot/KmPlot.tdevelop.filelist +++ /dev/null @@ -1,89 +0,0 @@ -# KDevelop Custom Project File List -KmPlot.tdevelop -Makefile.am -TODO -pics/coords.png -pics/kfkt.png -pics/ksys1.png -pics/ksys2.png -pics/ksys3.png -pics/Makefile.am -pics/scaling.png -kmplot/AttrDlg.cpp -kmplot/AttrDlg.h -kmplot/AttrDlgData.ui -kmplot/BezWnd.cpp -kmplot/BezWnd.h -kmplot/BezWndData.ui -kmplot/diagr.cpp -kmplot/diagr.h -kmplot/FktDlg.cpp -kmplot/FktDlg.h -kmplot/FktDlgData.ui -kmplot/kmplot.desktop -kmplot/kmplot.kcfg -kmplot/kmplotui.rc -kmplot/KoordDlg.cpp -kmplot/KoordDlg.h -kmplot/KoordDlgData.ui -kmplot/KOptDlg.cpp -kmplot/KOptDlg.h -kmplot/KOptDlgData.ui -kmplot/kprinterdlg.cpp -kmplot/kprinterdlg.h -kmplot/ksettingsdlg.cpp -kmplot/ksettingsdlg.h -kmplot/main.cpp -kmplot/main.h -kmplot/MainDlg.cpp -kmplot/MainDlg.h -kmplot/Makefile.am -kmplot/misc.cpp -kmplot/misc.h -kmplot/parser.cpp -kmplot/parser.h -kmplot/RstDlg.cpp -kmplot/RstDlg.h -kmplot/RstDlgData.ui -kmplot/settings.kcfgc -kmplot/settingspagecolor.ui -kmplot/settingspagecoords.ui -kmplot/settingspagefonts.ui -kmplot/settingspagescaling.ui -kmplot/SkalDlg.cpp -kmplot/SkalDlg.h -kmplot/SkalDlgData.ui -kmplot/SwDlg.cpp -kmplot/SwDlg.h -kmplot/SwDlgData.ui -kmplot/View.cpp -kmplot/View.h -kmplot/x-kmplot.desktop -kmplot/xparser.cpp -kmplot/xparser.h -icons/cr128-app-kmplot.png -icons/cr16-app-kmplot.png -icons/cr32-app-kmplot.png -icons/cr48-app-kmplot.png -icons/Makefile.am -KmPlot.tdevelop.filelist -/keditfunction.h -/keditfunction.cpp -kmplot/qeditfunction.ui -/keditfunction2.h -/keditfunction2.cpp -/kfunctionedit.h -/kfunctionedit.cpp -keditfunction.h -keditfunction.cpp.c -kmplot/keditfunction.h -kmplot/keditfunction.cpp -/qfunctionlist.h -/qfunctionlist.cpp -kmplot/settingspageprecision.ui -kmplot/keditparametric.cpp -kmplot/keditparametric.h -kmplot/keditpolar.cpp -kmplot/keditpolar.h -kmplot/qeditparametric.ui -kmplot/qeditpolar.ui diff --git a/kmplot/kmplot/FktDlg.cpp b/kmplot/kmplot/FktDlg.cpp index bf0da759..e4df4f6d 100644 --- a/kmplot/kmplot/FktDlg.cpp +++ b/kmplot/kmplot/FktDlg.cpp @@ -51,11 +51,11 @@ FktDlg::FktDlg( TQWidget* parent, View *view ) : FktDlgData( parent, "editPlots" ), m_view(view) { - connect( cmdCopyFunction, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopyFunction()) ); - connect( cmdMoveFunction, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveFunction()) ); - connect( lb_fktliste, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int)), this, TQT_SLOT(lb_fktliste_doubleClicked(TQListViewItem *, const TQPoint &, int)) ); - connect( lb_fktliste, TQT_SIGNAL( clicked(TQListViewItem *)), this, TQT_SLOT(lb_fktliste_clicked(TQListViewItem *))); - connect( lb_fktliste, TQT_SIGNAL( spacePressed(TQListViewItem *)), this, TQT_SLOT(lb_fktliste_spacePressed(TQListViewItem *))); + connect( cmdCopyFunction, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotCopyFunction()) ); + connect( cmdMoveFunction, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveFunction()) ); + connect( lb_fktliste, TQ_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int)), this, TQ_SLOT(lb_fktliste_doubleClicked(TQListViewItem *, const TQPoint &, int)) ); + connect( lb_fktliste, TQ_SIGNAL( clicked(TQListViewItem *)), this, TQ_SLOT(lb_fktliste_clicked(TQListViewItem *))); + connect( lb_fktliste, TQ_SIGNAL( spacePressed(TQListViewItem *)), this, TQ_SLOT(lb_fktliste_spacePressed(TQListViewItem *))); lb_fktliste->addColumn( "" ); lb_fktliste->header()->hide(); @@ -297,7 +297,7 @@ void FktDlg::getPlots() void FktDlg::slotHelp() { - kapp->invokeHelp( "", "kmplot" ); + tdeApp->invokeHelp( "", "kmplot" ); } bool FktDlg::isChanged() diff --git a/kmplot/kmplot/FktDlg.h b/kmplot/kmplot/FktDlg.h index 328d91a4..933e61fa 100644 --- a/kmplot/kmplot/FktDlg.h +++ b/kmplot/kmplot/FktDlg.h @@ -44,7 +44,7 @@ class XParser; */ class FktDlg : public FktDlgData { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmplot/kmplot/FktDlgData.ui b/kmplot/kmplot/FktDlgData.ui index 75f0740c..95a41fd8 100644 --- a/kmplot/kmplot/FktDlgData.ui +++ b/kmplot/kmplot/FktDlgData.ui @@ -407,7 +407,7 @@ <tabstop>pushButtonCancel</tabstop> <tabstop>pushButtonHelp</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotDelete()</slot> <slot>slotEdit()</slot> <slot>slotHasSelection()</slot> @@ -416,7 +416,7 @@ <slot>slotNewFunction()</slot> <slot access="protected">slotHelp()</slot> <slot>slotNewPrime()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">tdelistview.h</include> diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp index 6b8ebc10..4b514926 100644 --- a/kmplot/kmplot/MainDlg.cpp +++ b/kmplot/kmplot/MainDlg.cpp @@ -35,7 +35,7 @@ #include <kdebug.h> #include <kedittoolbar.h> #include <tdeio/netaccess.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <klineedit.h> #include <tdelocale.h> #include <tdemessagebox.h> @@ -84,9 +84,9 @@ MainDlg::MainDlg(TQWidget *parentWidget, const char *, TQObject *parent, const c coordsDialog = 0; m_popupmenu = new TDEPopupMenu(parentWidget); view = new View( m_readonly, m_modified, m_popupmenu, parentWidget ); - connect( view, TQT_SIGNAL( setStatusBarText(const TQString &)), this, TQT_SLOT( setReadOnlyStatusBarText(const TQString &) ) ); + connect( view, TQ_SIGNAL( setStatusBarText(const TQString &)), this, TQ_SLOT( setReadOnlyStatusBarText(const TQString &) ) ); setWidget( view ); - view->setFocusPolicy(TQ_ClickFocus); + view->setFocusPolicy(TQWidget::ClickFocus); minmaxdlg = new KMinMax(view, m_parent); view->setMinMaxDlg(minmaxdlg); m_quickEdit = new KLineEdit( parentWidget ); @@ -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 @@ -109,8 +109,8 @@ MainDlg::MainDlg(TQWidget *parentWidget, const char *, TQObject *parent, const c m_settingsDialog->addPage( m_constantsSettings, i18n("Constants"), "editconstants", i18n("Constants") ); // User edited the configuration - update your local copies of the // configuration data - connect( m_settingsDialog, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT(updateSettings() ) ); - connect( view, TQT_SIGNAL( resetZoom() ), this, TQT_SLOT(resetZoom() ) ); + connect( m_settingsDialog, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT(updateSettings() ) ); + connect( view, TQ_SIGNAL( resetZoom() ), this, TQ_SLOT(resetZoom() ) ); } MainDlg::~MainDlg() @@ -123,29 +123,29 @@ MainDlg::~MainDlg() void MainDlg::setupActions() { // standard actions - m_recentFiles = KStdAction::openRecent( this, TQT_SLOT( slotOpenRecent( const KURL& ) ), actionCollection(),"file_openrecent"); - KStdAction::print( this, TQT_SLOT( slotPrint() ), actionCollection(),"file_print" ); - KStdAction::save( this, TQT_SLOT( slotSave() ), actionCollection() ); - KStdAction::saveAs( this, TQT_SLOT( slotSaveas() ), actionCollection() ); - connect( kapp, TQT_SIGNAL( lastWindowClosed() ), kapp, TQT_SLOT( quit() ) ); + m_recentFiles = KStdAction::openRecent( this, TQ_SLOT( slotOpenRecent( const KURL& ) ), actionCollection(),"file_openrecent"); + KStdAction::print( this, TQ_SLOT( slotPrint() ), actionCollection(),"file_print" ); + KStdAction::save( this, TQ_SLOT( slotSave() ), actionCollection() ); + KStdAction::saveAs( this, TQ_SLOT( slotSaveas() ), actionCollection() ); + connect( tdeApp, TQ_SIGNAL( lastWindowClosed() ), tdeApp, TQ_SLOT( quit() ) ); - TDEAction *prefs = KStdAction::preferences( this, TQT_SLOT( slotSettings() ), actionCollection()); + TDEAction *prefs = KStdAction::preferences( this, TQ_SLOT( slotSettings() ), actionCollection()); prefs->setText( i18n( "Configure KmPlot..." ) ); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); // KmPlot specific actions // file menu - ( void ) new TDEAction( i18n( "E&xport..." ), 0, this, TQT_SLOT( slotExport() ), actionCollection(), "export"); + ( void ) new TDEAction( i18n( "E&xport..." ), 0, this, TQ_SLOT( slotExport() ), actionCollection(), "export"); //zoom menu - m_mnuNoZoom = new TDERadioAction(i18n("&No Zoom") ,"CTRL+0",TQT_TQOBJECT(view), TQT_SLOT( mnuNoZoom_clicked() ),actionCollection(),"no_zoom" ); - TDERadioAction * mnuRectangular = new TDERadioAction(i18n("Zoom &Rectangular"), "zoom-fit-best", "CTRL+1",TQT_TQOBJECT(view), TQT_SLOT( mnuRectangular_clicked() ),actionCollection(),"zoom_rectangular" ); - TDERadioAction * mnuZoomIn = new TDERadioAction(i18n("Zoom &In"), "zoom-in", "CTRL+2",TQT_TQOBJECT(view), TQT_SLOT( mnuZoomIn_clicked() ),actionCollection(),"zoom_in" ); - TDERadioAction * mnuZoomOut = new TDERadioAction(i18n("Zoom &Out"), "zoom-out", "CTRL+3",TQT_TQOBJECT(view), TQT_SLOT( mnuZoomOut_clicked() ),actionCollection(),"zoom_out" ); - TDERadioAction * mnuZoomCenter = new TDERadioAction(i18n("&Center Point") ,"CTRL+4",TQT_TQOBJECT(view), TQT_SLOT( mnuCenter_clicked() ),actionCollection(),"zoom_center" ); - (void ) new TDEAction(i18n("&Fit Widget to Trigonometric Functions") ,0,TQT_TQOBJECT(view), TQT_SLOT( mnuTrig_clicked() ),actionCollection(),"zoom_trig" ); + m_mnuNoZoom = new TDERadioAction(i18n("&No Zoom") ,"CTRL+0",view, TQ_SLOT( mnuNoZoom_clicked() ),actionCollection(),"no_zoom" ); + TDERadioAction * mnuRectangular = new TDERadioAction(i18n("Zoom &Rectangular"), "zoom-fit-best", "CTRL+1",view, TQ_SLOT( mnuRectangular_clicked() ),actionCollection(),"zoom_rectangular" ); + TDERadioAction * mnuZoomIn = new TDERadioAction(i18n("Zoom &In"), "zoom-in", "CTRL+2",view, TQ_SLOT( mnuZoomIn_clicked() ),actionCollection(),"zoom_in" ); + TDERadioAction * mnuZoomOut = new TDERadioAction(i18n("Zoom &Out"), "zoom-out", "CTRL+3",view, TQ_SLOT( mnuZoomOut_clicked() ),actionCollection(),"zoom_out" ); + TDERadioAction * mnuZoomCenter = new TDERadioAction(i18n("&Center Point") ,"CTRL+4",view, TQ_SLOT( mnuCenter_clicked() ),actionCollection(),"zoom_center" ); + (void ) new TDEAction(i18n("&Fit Widget to Trigonometric Functions") ,0,view, TQ_SLOT( mnuTrig_clicked() ),actionCollection(),"zoom_trig" ); m_mnuNoZoom->setExclusiveGroup("zoom_modes"); m_mnuNoZoom->setChecked(true); mnuRectangular->setExclusiveGroup("zoom_modes"); @@ -154,52 +154,52 @@ void MainDlg::setupActions() mnuZoomCenter->setExclusiveGroup("zoom_modes"); // help menu - ( void ) new TDEAction( i18n( "Predefined &Math Functions" ), "functionhelp", 0, this, TQT_SLOT( slotNames() ), actionCollection(), "names" ); + ( void ) new TDEAction( i18n( "Predefined &Math Functions" ), "functionhelp", 0, this, TQ_SLOT( slotNames() ), actionCollection(), "names" ); // edit menu - ( void ) new TDEAction( i18n( "&Colors..." ), "colorize.png", 0, this, TQT_SLOT( editColors() ), actionCollection(), "editcolors" ); - ( void ) new TDEAction( i18n( "&Coordinate System..." ), "coords.png", 0, this, TQT_SLOT( editAxes() ), actionCollection(), "editaxes" ); - // ( void ) new TDEAction( i18n( "&Grid..." ), "coords.png", 0, this, TQT_SLOT( editGrid() ), actionCollection(), "editgrid" ); - ( void ) new TDEAction( i18n( "&Scaling..." ), "scaling", 0, this, TQT_SLOT( editScaling() ), actionCollection(), "editscaling" ); - ( void ) new TDEAction( i18n( "&Fonts..." ), "fonts", 0, this, TQT_SLOT( editFonts() ), actionCollection(), "editfonts" ); + ( void ) new TDEAction( i18n( "&Colors..." ), "colorize.png", 0, this, TQ_SLOT( editColors() ), actionCollection(), "editcolors" ); + ( void ) new TDEAction( i18n( "&Coordinate System..." ), "coords.png", 0, this, TQ_SLOT( editAxes() ), actionCollection(), "editaxes" ); + // ( void ) new TDEAction( i18n( "&Grid..." ), "coords.png", 0, this, TQ_SLOT( editGrid() ), actionCollection(), "editgrid" ); + ( void ) new TDEAction( i18n( "&Scaling..." ), "scaling", 0, this, TQ_SLOT( editScaling() ), actionCollection(), "editscaling" ); + ( void ) new TDEAction( i18n( "&Fonts..." ), "fonts", 0, this, TQ_SLOT( editFonts() ), actionCollection(), "editfonts" ); - ( void ) new TDEAction( i18n( "Coordinate System I" ), "ksys1.png", 0, this, TQT_SLOT( slotCoord1() ), actionCollection(), "coord_i" ); - ( void ) new TDEAction( i18n( "Coordinate System II" ), "ksys2.png", 0, this, TQT_SLOT( slotCoord2() ), actionCollection(), "coord_ii" ); - ( void ) new TDEAction( i18n( "Coordinate System III" ), "ksys3.png", 0, this, TQT_SLOT( slotCoord3() ), actionCollection(), "coord_iii" ); + ( void ) new TDEAction( i18n( "Coordinate System I" ), "ksys1.png", 0, this, TQ_SLOT( slotCoord1() ), actionCollection(), "coord_i" ); + ( void ) new TDEAction( i18n( "Coordinate System II" ), "ksys2.png", 0, this, TQ_SLOT( slotCoord2() ), actionCollection(), "coord_ii" ); + ( void ) new TDEAction( i18n( "Coordinate System III" ), "ksys3.png", 0, this, TQ_SLOT( slotCoord3() ), actionCollection(), "coord_iii" ); // plot menu - ( void ) new TDEAction( i18n( "&New Function Plot..." ), "newfunction", 0, this, TQT_SLOT( newFunction() ), actionCollection(), "newfunction" ); - ( void ) new TDEAction( i18n( "New Parametric Plot..." ), "newparametric", 0, this, TQT_SLOT( newParametric() ), actionCollection(), "newparametric" ); - ( void ) new TDEAction( i18n( "New Polar Plot..." ), "newpolar", 0, this, TQT_SLOT( newPolar() ), actionCollection(), "newpolar" ); - ( void ) new TDEAction( i18n( "Edit Plots..." ), "editplots", 0, this, TQT_SLOT( slotEditPlots() ), actionCollection(), "editplots" ); + ( void ) new TDEAction( i18n( "&New Function Plot..." ), "newfunction", 0, this, TQ_SLOT( newFunction() ), actionCollection(), "newfunction" ); + ( void ) new TDEAction( i18n( "New Parametric Plot..." ), "newparametric", 0, this, TQ_SLOT( newParametric() ), actionCollection(), "newparametric" ); + ( void ) new TDEAction( i18n( "New Polar Plot..." ), "newpolar", 0, this, TQ_SLOT( newPolar() ), actionCollection(), "newpolar" ); + ( void ) new TDEAction( i18n( "Edit Plots..." ), "editplots", 0, this, TQ_SLOT( slotEditPlots() ), actionCollection(), "editplots" ); // tools menu - TDEAction *mnuYValue = new TDEAction( i18n( "&Get y-Value..." ), 0, this, TQT_SLOT( getYValue() ), actionCollection(), "yvalue" ); - TDEAction *mnuMinValue = new TDEAction( i18n( "&Search for Minimum Value..." ), "minimum", 0, this, TQT_SLOT( findMinimumValue() ), actionCollection(), "minimumvalue" ); - TDEAction *mnuMaxValue = new TDEAction( i18n( "&Search for Maximum Value..." ), "maximum", 0, this, TQT_SLOT( findMaximumValue() ), actionCollection(), "maximumvalue" ); - TDEAction *mnuArea = new TDEAction( i18n( "&Calculate Integral" ), 0, this, TQT_SLOT( graphArea() ), actionCollection(), "grapharea" ); + TDEAction *mnuYValue = new TDEAction( i18n( "&Get y-Value..." ), 0, this, TQ_SLOT( getYValue() ), actionCollection(), "yvalue" ); + TDEAction *mnuMinValue = new TDEAction( i18n( "&Search for Minimum Value..." ), "minimum", 0, this, TQ_SLOT( findMinimumValue() ), actionCollection(), "minimumvalue" ); + TDEAction *mnuMaxValue = new TDEAction( i18n( "&Search for Maximum Value..." ), "maximum", 0, this, TQ_SLOT( findMaximumValue() ), actionCollection(), "maximumvalue" ); + TDEAction *mnuArea = new TDEAction( i18n( "&Calculate Integral" ), 0, this, TQ_SLOT( graphArea() ), actionCollection(), "grapharea" ); - connect( m_quickEdit, TQT_SIGNAL( returnPressed( const TQString& ) ), this, TQT_SLOT( slotQuickEdit( const TQString& ) ) ); + connect( m_quickEdit, TQ_SIGNAL( returnPressed( const TQString& ) ), this, TQ_SLOT( slotQuickEdit( const TQString& ) ) ); KWidgetAction* quickEditAction = new KWidgetAction( m_quickEdit, i18n( "Quick Edit" ), 0, this, 0, actionCollection(), "quickedit" ); quickEditAction->setWhatsThis( i18n( "Enter a simple function equation here.\n" "For instance: f(x)=x^2\nFor more options use Functions->Edit Plots... menu." ) ); - view->mnuSliders[0] = new TDEToggleAction( i18n( "Show Slider 1" ), 0, this, TQT_SLOT( toggleShowSlider0() ), actionCollection(), TQString( "options_configure_show_slider_0" ).latin1() ); - view->mnuSliders[1] = new TDEToggleAction( i18n( "Show Slider 2" ), 0, this, TQT_SLOT( toggleShowSlider1() ), actionCollection(), TQString( "options_configure_show_slider_1" ).latin1() ); - view->mnuSliders[2] = new TDEToggleAction( i18n( "Show Slider 3" ), 0, this, TQT_SLOT( toggleShowSlider2() ), actionCollection(), TQString( "options_configure_show_slider_2" ).latin1() ); - view->mnuSliders[3] = new TDEToggleAction( i18n( "Show Slider 4" ), 0, this, TQT_SLOT( toggleShowSlider3() ), actionCollection(), TQString( "options_configure_show_slider_3" ).latin1() ); + view->mnuSliders[0] = new TDEToggleAction( i18n( "Show Slider 1" ), 0, this, TQ_SLOT( toggleShowSlider0() ), actionCollection(), TQString( "options_configure_show_slider_0" ).latin1() ); + view->mnuSliders[1] = new TDEToggleAction( i18n( "Show Slider 2" ), 0, this, TQ_SLOT( toggleShowSlider1() ), actionCollection(), TQString( "options_configure_show_slider_1" ).latin1() ); + view->mnuSliders[2] = new TDEToggleAction( i18n( "Show Slider 3" ), 0, this, TQ_SLOT( toggleShowSlider2() ), actionCollection(), TQString( "options_configure_show_slider_2" ).latin1() ); + view->mnuSliders[3] = new TDEToggleAction( i18n( "Show Slider 4" ), 0, this, TQ_SLOT( toggleShowSlider3() ), actionCollection(), TQString( "options_configure_show_slider_3" ).latin1() ); // Popup menu - TDEAction *mnuHide = new TDEAction(i18n("&Hide") ,0,TQT_TQOBJECT(view), TQT_SLOT( mnuHide_clicked() ),actionCollection(),"mnuhide" ); + TDEAction *mnuHide = new TDEAction(i18n("&Hide") ,0,view, TQ_SLOT( mnuHide_clicked() ),actionCollection(),"mnuhide" ); mnuHide->plug(m_popupmenu); - TDEAction *mnuRemove = new TDEAction(i18n("&Remove"),"edit-delete", 0,TQT_TQOBJECT(view), TQT_SLOT( mnuRemove_clicked() ),actionCollection(),"mnuremove" ); + TDEAction *mnuRemove = new TDEAction(i18n("&Remove"),"edit-delete", 0,view, TQ_SLOT( mnuRemove_clicked() ),actionCollection(),"mnuremove" ); mnuRemove->plug(m_popupmenu); - TDEAction *mnuEdit = new TDEAction(i18n("&Edit"),"editplots", 0,TQT_TQOBJECT(view), TQT_SLOT( mnuEdit_clicked() ),actionCollection(),"mnuedit" ); + TDEAction *mnuEdit = new TDEAction(i18n("&Edit"),"editplots", 0,view, TQ_SLOT( mnuEdit_clicked() ),actionCollection(),"mnuedit" ); mnuEdit->plug(m_popupmenu); m_popupmenu->insertSeparator(); - TDEAction *mnuCopy = new TDEAction(i18n("&Copy"), 0,TQT_TQOBJECT(view), TQT_SLOT( mnuCopy_clicked() ),actionCollection(),"mnucopy" ); + TDEAction *mnuCopy = new TDEAction(i18n("&Copy"), 0,view, TQ_SLOT( mnuCopy_clicked() ),actionCollection(),"mnucopy" ); mnuCopy->plug(m_popupmenu); - TDEAction *mnuMove = new TDEAction(i18n("&Move"), 0,TQT_TQOBJECT(view), TQT_SLOT( mnuMove_clicked() ),actionCollection(),"mnumove" ); + TDEAction *mnuMove = new TDEAction(i18n("&Move"), 0,view, TQ_SLOT( mnuMove_clicked() ),actionCollection(),"mnumove" ); mnuMove->plug(m_popupmenu); m_popupmenu->insertSeparator(); mnuYValue->plug(m_popupmenu); @@ -298,7 +298,7 @@ void MainDlg::slotExport() if( url.fileName().right(4).lower()==".svg") { TQPicture pic; - view->draw(TQT_TQPAINTDEVICE(&pic), 2); + view->draw(&pic, 2); if (url.isLocalFile() ) pic.save( url.prettyURL(0,KURL::StripFileProtocol), "SVG"); else @@ -314,7 +314,7 @@ void MainDlg::slotExport() else if( url.fileName().right(4).lower()==".bmp") { TQPixmap pic(100, 100); - view->draw(TQT_TQPAINTDEVICE(&pic), 3); + view->draw(&pic, 3); if (url.isLocalFile() ) pic.save( url.prettyURL(0,KURL::StripFileProtocol), "BMP"); else @@ -330,7 +330,7 @@ void MainDlg::slotExport() else if( url.fileName().right(4).lower()==".png") { TQPixmap pic(100, 100); - view->draw(TQT_TQPAINTDEVICE(&pic), 3); + view->draw(&pic, 3); if (url.isLocalFile() ) pic.save( url.prettyURL(0,KURL::StripFileProtocol), "PNG"); else @@ -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; } @@ -408,7 +408,7 @@ void MainDlg::editColors() // User edited the configuration - update your local copies of the // configuration data - connect( colorsDialog, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT(updateSettings() ) ); + connect( colorsDialog, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT(updateSettings() ) ); colorsDialog->show(); } @@ -420,7 +420,7 @@ void MainDlg::editAxes() coordsDialog = new CoordsConfigDialog( view->parser(), m_parent); // User edited the configuration - update your local copies of the // configuration data - connect( coordsDialog, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT(updateSettings() ) ); + connect( coordsDialog, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT(updateSettings() ) ); } coordsDialog->show(); } @@ -433,7 +433,7 @@ void MainDlg::editScaling() scalingDialog->addPage( new SettingsPageScaling( 0, "scalingSettings" ), i18n( "Scale" ), "scaling", i18n( "Edit Scaling" ) ); // User edited the configuration - update your local copies of the // configuration data - connect( scalingDialog, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT(updateSettings() ) ); + connect( scalingDialog, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT(updateSettings() ) ); scalingDialog->show(); } @@ -445,7 +445,7 @@ void MainDlg::editFonts() fontsDialog->addPage( new SettingsPageFonts( 0, "fontsSettings" ), i18n( "Fonts" ), "fonts", i18n( "Edit Fonts" ) ); // User edited the configuration - update your local copies of the // configuration data - connect( fontsDialog, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT(updateSettings() ) ); + connect( fontsDialog, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT(updateSettings() ) ); fontsDialog->show(); } @@ -457,7 +457,7 @@ void MainDlg::editConstants() void MainDlg::slotNames() { - kapp->invokeHelp( "func-predefined", "kmplot" ); + tdeApp->invokeHelp( "func-predefined", "kmplot" ); } void MainDlg::newFunction() @@ -611,7 +611,7 @@ void MainDlg::updateSettings() void MainDlg::loadConstants() { - KSimpleConfig conf ("kcalcrc"); + TDESimpleConfig conf ("kcalcrc"); conf.setGroup("UserConstants"); TQString tmp; TQString tmp_constant; @@ -674,7 +674,7 @@ void MainDlg::loadConstants() void MainDlg::saveConstants() { - KSimpleConfig conf ("kcalcrc"); + TDESimpleConfig conf ("kcalcrc"); conf.deleteGroup("Constants"); conf.setGroup("UserConstants"); TQString tmp; @@ -736,8 +736,8 @@ void MainDlg::toggleShowSlider(int const num) if ( view->sliders[ num ] == 0 ) { view->sliders[ num ] = new KSliderWindow( view, num); - connect( view->sliders[num]->slider, TQT_SIGNAL( valueChanged( int ) ), view, TQT_SLOT( drawPlot() ) ); - connect( view->sliders[num], TQT_SIGNAL( windowClosed( int ) ), view, TQT_SLOT( sliderWindowClosed(int) ) ); + connect( view->sliders[num]->slider, TQ_SIGNAL( valueChanged( int ) ), view, TQ_SLOT( drawPlot() ) ); + connect( view->sliders[num], TQ_SIGNAL( windowClosed( int ) ), view, TQ_SLOT( sliderWindowClosed(int) ) ); } if ( !view->sliders[ num ]->isShown() ) view->sliders[ num ]->show(); @@ -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() @@ -807,7 +807,7 @@ TDEInstance* KmPlotPartFactory::instance() extern "C" { - KDE_EXPORT void* init_libkmplotpart() + TDE_EXPORT void* init_libkmplotpart() { return new KmPlotPartFactory; } diff --git a/kmplot/kmplot/MainDlg.h b/kmplot/kmplot/MainDlg.h index f258999c..e8bfecdd 100644 --- a/kmplot/kmplot/MainDlg.h +++ b/kmplot/kmplot/MainDlg.h @@ -35,7 +35,7 @@ #include <tdeaction.h> #include <tdefiledialog.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeparts/browserextension.h> #include <tdeparts/part.h> #include <tdeparts/factory.h> @@ -69,7 +69,7 @@ class BrowserExtension; */ class MainDlg : public KParts::ReadOnlyPart, virtual public MainDlgIface { - Q_OBJECT + TQ_OBJECT public: @@ -216,7 +216,7 @@ protected slots: class KmPlotPartFactory : public KParts::Factory { - Q_OBJECT + TQ_OBJECT public: KmPlotPartFactory(); @@ -233,7 +233,7 @@ private: class BrowserExtension : public KParts::BrowserExtension { - Q_OBJECT + TQ_OBJECT public: BrowserExtension(MainDlg*); diff --git a/kmplot/kmplot/Makefile.am b/kmplot/kmplot/Makefile.am index c845aecc..1009953d 100644 --- a/kmplot/kmplot/Makefile.am +++ b/kmplot/kmplot/Makefile.am @@ -25,7 +25,7 @@ bin_PROGRAMS = kmplot # the application source, library search path, and link libraries kmplot_SOURCES = main.cpp kmplot.cpp kmplotprogress.cpp kmplotIface.skel -kmplot_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP +kmplot_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP kmplot_LDADD = $(LIB_TDEPARTS) kmplot_COMPILE_FIRST = FktDlgData.h qminmax.h settings.h @@ -46,8 +46,8 @@ kde_module_LTLIBRARIES = libkmplotpart.la # the Part's source, library search path, and link libraries libkmplotpart_la_SOURCES = FktDlgData.ui parser.cpp xparser.cpp diagr.cpp View.cpp MainDlg.cpp FktDlg.cpp kprinterdlg.cpp settings.kcfgc settingspagecolor.ui kconstanteditor.cpp qparametereditor.ui kparametereditor.cpp settingspagecoords.ui settingspagefonts.ui settingspagescaling.ui settingspageprecision.ui qeditparametric.ui keditparametric.cpp qeditpolar.ui keditpolar.cpp editfunctionpage.ui editderivativespage.ui editintegralpage.ui editfunction.cpp qeditconstant.ui qminmax.ui kminmax.cpp qconstanteditor.ui keditconstant.cpp kmplotio.cpp sliderwindow.ui ksliderwindow.cpp MainDlgIface.skel parseriface.skel Viewiface.skel coordsconfigdialog.cpp -libkmplotpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP -libkmplotpart_la_LIBADD = $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET) $(LIB_TDEPRINT) +libkmplotpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP +libkmplotpart_la_LIBADD = $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) $(LIBSOCKET) $(LIB_TDEPRINT) # this is where the desktop file will go partdesktopdir = $(kde_servicesdir) diff --git a/kmplot/kmplot/View.cpp b/kmplot/kmplot/View.cpp index 6c60fd50..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; @@ -231,7 +231,7 @@ void View::plotfkt(Ufkt *ufkt, TQPainter *pDC) double x, y, dmin, dmax; TQPoint p1, p2; TQPen pen; - pen.setCapStyle(Qt::RoundCap); + pen.setCapStyle(TQt::RoundCap); iy=0; y=0.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; @@ -594,7 +594,7 @@ void View::drawPlot() if( m_minmax->isShown() ) m_minmax->updateFunctions(); buffer.fill(backgroundcolor); - draw(TQT_TQPAINTDEVICE(&buffer), 0); + draw(&buffer, 0); TQPainter p; p.begin(this); bitBlt( this, 0, 0, &buffer, 0, 0, width(), height() ); @@ -605,7 +605,7 @@ void View::mouseMoveEvent(TQMouseEvent *e) { if ( isDrawing) return; - if (zoom_mode==4 && e->stateAfter() != Qt::NoButton) + if (zoom_mode==4 && e->stateAfter() != TQt::NoButton) { TQPainter p; p.begin(this); @@ -616,7 +616,7 @@ void View::mouseMoveEvent(TQMouseEvent *e) TQPen pen(TQt::white, 1, TQt::DotLine); painter.setRasterOp (TQt::XorROP); painter.setPen(pen); - painter.setBackgroundMode (Qt::OpaqueMode); + painter.setBackgroundMode (TQt::OpaqueMode); painter.setBackgroundColor (TQt::blue); painter.drawRect(rectangle_point.x(), rectangle_point.y(), e->pos().x()-rectangle_point.x(), e->pos().y()-rectangle_point.y()); @@ -639,7 +639,7 @@ void View::mouseMoveEvent(TQMouseEvent *e) csflg=0; } - if(area.contains(e->pos()) || (e->button()==Qt::LeftButton && e->state()==Qt::LeftButton && csxpos>xmin && csxpos<xmax)) + if(area.contains(e->pos()) || (e->button()==TQt::LeftButton && e->state()==TQt::LeftButton && csxpos>xmin && csxpos<xmax)) { TQPoint ptd, ptl; TQPainter DC; @@ -862,7 +862,7 @@ void View::mousePressEvent(TQMouseEvent *e) } double const g=tlgy*double(xmax-xmin)/(2*double(ymax-ymin)); - if( !m_readonly && e->button()==Qt::RightButton) //clicking with the right mouse button + if( !m_readonly && e->button()==TQt::RightButton) //clicking with the right mouse button { char function_type; for( TQValueVector<Ufkt>::iterator it = m_parser->ufkt.begin(); it != m_parser->ufkt.end(); ++it) @@ -969,7 +969,7 @@ void View::mousePressEvent(TQMouseEvent *e) } return; } - if(e->button()!=Qt::LeftButton) return ; + if(e->button()!=TQt::LeftButton) return ; if(csmode>=0) //disable trace mode if trace mode is enable { csmode=-1; @@ -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(); } @@ -1471,9 +1471,9 @@ void View::keyPressEvent( TQKeyEvent * e) TQMouseEvent *event; if (e->key() == TQt::Key_Left ) - event = new TQMouseEvent(TQEvent::MouseMove,TQPoint(fcx-1,fcy-1),Qt::LeftButton,Qt::LeftButton); + event = new TQMouseEvent(TQEvent::MouseMove,TQPoint(fcx-1,fcy-1),TQt::LeftButton,TQt::LeftButton); else if (e->key() == TQt::Key_Right ) - event = new TQMouseEvent(TQEvent::MouseMove,TQPoint(fcx+1,fcy+1),Qt::LeftButton,Qt::LeftButton); + event = new TQMouseEvent(TQEvent::MouseMove,TQPoint(fcx+1,fcy+1),TQt::LeftButton,TQt::LeftButton); else if (e->key() == TQt::Key_Up || e->key() == TQt::Key_Down) //switch graph in trace mode { TQValueVector<Ufkt>::iterator it = &m_parser->ufkt[m_parser->ixValue(csmode)]; @@ -1573,18 +1573,18 @@ void View::keyPressEvent( TQKeyEvent * e) break; } } - event = new TQMouseEvent(TQEvent::MouseMove,TQPoint(fcx,fcy),Qt::LeftButton,Qt::LeftButton); + event = new TQMouseEvent(TQEvent::MouseMove,TQPoint(fcx,fcy),TQt::LeftButton,TQt::LeftButton); } else if ( e->key() == TQt::Key_Space ) { - event = new TQMouseEvent(TQEvent::MouseButtonPress,TQCursor::pos(),Qt::RightButton,Qt::RightButton); + event = new TQMouseEvent(TQEvent::MouseButtonPress,TQCursor::pos(),TQt::RightButton,TQt::RightButton); mousePressEvent(event); delete event; return; } else { - event = new TQMouseEvent(TQEvent::MouseButtonPress,TQPoint(fcx,fcy),Qt::LeftButton,Qt::LeftButton); + event = new TQMouseEvent(TQEvent::MouseButtonPress,TQPoint(fcx,fcy),TQt::LeftButton,TQt::LeftButton); mousePressEvent(event); delete event; return; @@ -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; @@ -1801,7 +1801,7 @@ void View::areaUnderGraph( Ufkt *ufkt, char const p_mode, double &dmin, double DC->end(); setFocus(); update(); - draw(TQT_TQPAINTDEVICE(&buffer),0); + draw(&buffer,0); } if ( calculated_area>0) @@ -1841,8 +1841,8 @@ void View::updateSliders() if ( sliders[ it->use_slider ] == 0 ) { sliders[ it->use_slider ] = new KSliderWindow( this, it->use_slider); - connect( sliders[ it->use_slider ]->slider, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( drawPlot() ) ); - connect( sliders[ it->use_slider ], TQT_SIGNAL( windowClosed( int ) ), this , TQT_SLOT( sliderWindowClosed(int) ) ); + connect( sliders[ it->use_slider ]->slider, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( drawPlot() ) ); + connect( sliders[ it->use_slider ], TQ_SIGNAL( windowClosed( int ) ), this , TQ_SLOT( sliderWindowClosed(int) ) ); mnuSliders[ it->use_slider ]->setChecked(true); //set the slider-item in the menu } sliders[ it->use_slider ]->show(); @@ -1876,7 +1876,7 @@ void View::mnuHide_clicked() if ( !ufkt->f_mode && !ufkt->f1_mode && !ufkt->f2_mode) //all graphs for the function are hidden { csmode=-1; - TQMouseEvent *event = new TQMouseEvent(TQMouseEvent::KeyPress,TQCursor::pos(),Qt::LeftButton,Qt::LeftButton); + TQMouseEvent *event = new TQMouseEvent(TQMouseEvent::KeyPress,TQCursor::pos(),TQt::LeftButton,TQt::LeftButton); mousePressEvent(event); //leave trace mode delete event; return; @@ -1904,7 +1904,7 @@ void View::mnuRemove_clicked() if (csmode!=-1) // if trace mode is enabled { csmode=-1; - TQMouseEvent *event = new TQMouseEvent(TQMouseEvent::KeyPress,TQCursor::pos(),Qt::LeftButton,Qt::LeftButton); + TQMouseEvent *event = new TQMouseEvent(TQMouseEvent::KeyPress,TQCursor::pos(),TQt::LeftButton,TQt::LeftButton); mousePressEvent(event); //leave trace mode delete event; } diff --git a/kmplot/kmplot/View.h b/kmplot/kmplot/View.h index c197d237..d219f0f5 100644 --- a/kmplot/kmplot/View.h +++ b/kmplot/kmplot/View.h @@ -66,7 +66,7 @@ enum ZoomMode */ class View : public TQWidget, virtual public ViewIface { - Q_OBJECT + TQ_OBJECT public: /// Contructor sets up the parser, too. diff --git a/kmplot/kmplot/coordsconfigdialog.h b/kmplot/kmplot/coordsconfigdialog.h index 716e2909..02ecfc9f 100644 --- a/kmplot/kmplot/coordsconfigdialog.h +++ b/kmplot/kmplot/coordsconfigdialog.h @@ -38,7 +38,7 @@ class SettingsPageCoords; /// class CoordsConfigDialog : public TDEConfigDialog { - Q_OBJECT + TQ_OBJECT public: CoordsConfigDialog(XParser *p, TQWidget *parent = 0); diff --git a/kmplot/kmplot/diagr.cpp b/kmplot/kmplot/diagr.cpp index 144e73b0..54f24a46 100644 --- a/kmplot/kmplot/diagr.cpp +++ b/kmplot/kmplot/diagr.cpp @@ -27,12 +27,6 @@ #include "diagr.h" #include "settings.h" -#ifdef __osf__ -#include <nan.h> -#define isnan(x) IsNAN(x) -#define isinf(x) IsINF(X) -#endif - #ifdef USE_SOLARIS #include <ieeefp.h> int isinf(double x) diff --git a/kmplot/kmplot/editfunction.cpp b/kmplot/kmplot/editfunction.cpp index 2d592676..0e9e7a09 100644 --- a/kmplot/kmplot/editfunction.cpp +++ b/kmplot/kmplot/editfunction.cpp @@ -69,10 +69,10 @@ EditFunction::EditFunction( XParser* parser, TQWidget* parent, const char* name { editfunctionpage->listOfSliders->insertItem( i18n( "Slider No. %1" ).arg( number +1) ); } - connect( editfunctionpage->cmdParameter, TQT_SIGNAL ( clicked() ), this, TQT_SLOT( cmdParameter_clicked() ) ); - connect( editfunctionpage->useNoParameter, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( noParameter_toggled(bool) ) ); - connect( editfunctionpage->customMinRange, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( customMinRange_toggled(bool) ) ); - connect( editfunctionpage->customMaxRange, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( customMaxRange_toggled(bool) ) ); + connect( editfunctionpage->cmdParameter, TQ_SIGNAL ( clicked() ), this, TQ_SLOT( cmdParameter_clicked() ) ); + connect( editfunctionpage->useNoParameter, TQ_SIGNAL ( toggled(bool) ), this, TQ_SLOT( noParameter_toggled(bool) ) ); + connect( editfunctionpage->customMinRange, TQ_SIGNAL ( toggled(bool) ), this, TQ_SLOT( customMinRange_toggled(bool) ) ); + connect( editfunctionpage->customMaxRange, TQ_SIGNAL ( toggled(bool) ), this, TQ_SLOT( customMaxRange_toggled(bool) ) ); m_updatedfunction = 0; } @@ -386,7 +386,7 @@ Ufkt * EditFunction::functionItem() void EditFunction::slotHelp() { - kapp->invokeHelp( "", "kmplot" ); + tdeApp->invokeHelp( "", "kmplot" ); } bool EditFunction::functionHas2Arguments() diff --git a/kmplot/kmplot/editfunction.h b/kmplot/kmplot/editfunction.h index a034b6e1..204a4bc2 100644 --- a/kmplot/kmplot/editfunction.h +++ b/kmplot/kmplot/editfunction.h @@ -38,7 +38,7 @@ class EditIntegralPage; /** @short Dialog window editing a function plot and its properties. */ class EditFunction : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /// @param parser points to the parser instance. diff --git a/kmplot/kmplot/editfunctionpage.ui b/kmplot/kmplot/editfunctionpage.ui index dce7932c..a33ec849 100644 --- a/kmplot/kmplot/editfunctionpage.ui +++ b/kmplot/kmplot/editfunctionpage.ui @@ -893,9 +893,9 @@ Example: f(x)=x^2</string> <tabstop>lineWidth</tabstop> <tabstop>color</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotHelp()</slot> <slot>customRange_toggled( bool )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmplot/kmplot/kconstanteditor.cpp b/kmplot/kmplot/kconstanteditor.cpp index d8af85e8..c11f2d62 100644 --- a/kmplot/kmplot/kconstanteditor.cpp +++ b/kmplot/kmplot/kconstanteditor.cpp @@ -30,7 +30,7 @@ #include <tdelistview.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqpushbutton.h> #include <tqstringlist.h> #include <tqvaluevector.h> @@ -61,7 +61,7 @@ void KConstantEditor::cmdNew_clicked() { constant = '0'; KEditConstant *dlg = new KEditConstant(m_view->parser(), constant, value); - connect( dlg, TQT_SIGNAL( finished() ), this,TQT_SLOT(newConstantSlot() ) ); + connect( dlg, TQ_SIGNAL( finished() ), this,TQ_SLOT(newConstantSlot() ) ); dlg->show(); } @@ -73,7 +73,7 @@ void KConstantEditor::cmdEdit_clicked() value = varlist->currentItem()->text(1); KEditConstant *dlg = new KEditConstant(m_view->parser(), constant, value); - connect( dlg, TQT_SIGNAL( finished() ), this,TQT_SLOT(editConstantSlot() ) ); + connect( dlg, TQ_SIGNAL( finished() ), this,TQ_SLOT(editConstantSlot() ) ); dlg->show(); } diff --git a/kmplot/kmplot/kconstanteditor.h b/kmplot/kmplot/kconstanteditor.h index 62be39f6..6357c700 100644 --- a/kmplot/kmplot/kconstanteditor.h +++ b/kmplot/kmplot/kconstanteditor.h @@ -36,7 +36,7 @@ /// Handles all the constants. class KConstantEditor : public QConstantEditor { -Q_OBJECT +TQ_OBJECT public: KConstantEditor(View *, TQWidget *parent = 0, const char *name = 0); diff --git a/kmplot/kmplot/keditconstant.cpp b/kmplot/kmplot/keditconstant.cpp index 04dfa441..19bd3855 100644 --- a/kmplot/kmplot/keditconstant.cpp +++ b/kmplot/kmplot/keditconstant.cpp @@ -43,8 +43,8 @@ KEditConstant::KEditConstant(XParser *p, char &c, TQString &v, TQWidget *parent, txtValue->setFocus(); txtValue->selectAll(); } - connect( cmdCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deleteLater() )); - connect( cmdOK, TQT_SIGNAL( clicked() ), this, TQT_SLOT( cmdOK_clicked() )); + connect( cmdCancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( deleteLater() )); + connect( cmdOK, TQ_SIGNAL( clicked() ), this, TQ_SLOT( cmdOK_clicked() )); } diff --git a/kmplot/kmplot/keditconstant.h b/kmplot/kmplot/keditconstant.h index 90e2d9cd..cd742f6c 100644 --- a/kmplot/kmplot/keditconstant.h +++ b/kmplot/kmplot/keditconstant.h @@ -35,7 +35,7 @@ /// A small dialog for creating an editing constants class KEditConstant : public QEditConstant { - Q_OBJECT + TQ_OBJECT public: KEditConstant(XParser *p, char &, TQString &,TQWidget *parent = 0, const char *name = 0); diff --git a/kmplot/kmplot/keditparametric.cpp b/kmplot/kmplot/keditparametric.cpp index 0d83b3a7..ce0f2f74 100644 --- a/kmplot/kmplot/keditparametric.cpp +++ b/kmplot/kmplot/keditparametric.cpp @@ -44,8 +44,8 @@ KEditParametric::KEditParametric( XParser* parser, TQWidget* parent, const char* name ) : QEditParametric( parent, name ), m_parser(parser) { - connect( customMinRange, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( customMinRange_toggled(bool) ) ); - connect( customMaxRange, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( customMaxRange_toggled(bool) ) ); + connect( customMinRange, TQ_SIGNAL ( toggled(bool) ), this, TQ_SLOT( customMinRange_toggled(bool) ) ); + connect( customMaxRange, TQ_SIGNAL ( toggled(bool) ), this, TQ_SLOT( customMaxRange_toggled(bool) ) ); m_updatedfunction = 0; } @@ -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/keditparametric.h b/kmplot/kmplot/keditparametric.h index bed49aef..0fb3d3ba 100644 --- a/kmplot/kmplot/keditparametric.h +++ b/kmplot/kmplot/keditparametric.h @@ -35,7 +35,7 @@ class XParser; /** @short Dialog window editing a parametric plot and its properties. */ class KEditParametric : public QEditParametric { - Q_OBJECT + TQ_OBJECT public: /// @param parser points to the parser instance. diff --git a/kmplot/kmplot/keditpolar.cpp b/kmplot/kmplot/keditpolar.cpp index 27334bb6..b1d4815e 100644 --- a/kmplot/kmplot/keditpolar.cpp +++ b/kmplot/kmplot/keditpolar.cpp @@ -45,8 +45,8 @@ KEditPolar::KEditPolar( XParser* parser, TQWidget* parent, const char* name ) : QEditPolar( parent, name ),m_parser(parser) { - connect( customMinRange, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( customMinRange_toggled(bool) ) ); - connect( customMaxRange, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( customMaxRange_toggled(bool) ) ); + connect( customMinRange, TQ_SIGNAL ( toggled(bool) ), this, TQ_SLOT( customMinRange_toggled(bool) ) ); + connect( customMaxRange, TQ_SIGNAL ( toggled(bool) ), this, TQ_SLOT( customMaxRange_toggled(bool) ) ); m_updatedfunction = 0; } @@ -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/keditpolar.h b/kmplot/kmplot/keditpolar.h index 09dcaf46..8a23c857 100644 --- a/kmplot/kmplot/keditpolar.h +++ b/kmplot/kmplot/keditpolar.h @@ -35,7 +35,7 @@ class XParser; /** @short Dialog window editing a polar plot and its properties. */ class KEditPolar : public QEditPolar { - Q_OBJECT + TQ_OBJECT public: /// @param parser points to the parser instance. diff --git a/kmplot/kmplot/kminmax.cpp b/kmplot/kmplot/kminmax.cpp index 3b947f97..1a6dffac 100644 --- a/kmplot/kmplot/kminmax.cpp +++ b/kmplot/kmplot/kminmax.cpp @@ -40,11 +40,11 @@ KMinMax::KMinMax(View *v, TQWidget *parent, const char *name) : QMinMax(parent, name), m_view(v) { m_mode=-1; - connect( cmdClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( close() )); - connect( cmdFind, TQT_SIGNAL( clicked() ), this, TQT_SLOT( cmdFind_clicked() )); - connect( cmdParameter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( cmdParameter_clicked() )); - connect( list, TQT_SIGNAL( highlighted(TQListBoxItem*) ), this, TQT_SLOT( list_highlighted(TQListBoxItem*) )); - connect( list, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQT_SLOT( list_doubleClicked(TQListBoxItem *) )); + connect( cmdClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( close() )); + connect( cmdFind, TQ_SIGNAL( clicked() ), this, TQ_SLOT( cmdFind_clicked() )); + connect( cmdParameter, TQ_SIGNAL( clicked() ), this, TQ_SLOT( cmdParameter_clicked() )); + connect( list, TQ_SIGNAL( highlighted(TQListBoxItem*) ), this, TQ_SLOT( list_highlighted(TQListBoxItem*) )); + connect( list, TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQ_SLOT( list_doubleClicked(TQListBoxItem *) )); parameter=""; } diff --git a/kmplot/kmplot/kminmax.h b/kmplot/kmplot/kminmax.h index 46f028a1..78c92739 100644 --- a/kmplot/kmplot/kminmax.h +++ b/kmplot/kmplot/kminmax.h @@ -35,7 +35,7 @@ /// KMinMax handles all the dialogs for the items in the tool-menu. class KMinMax : public QMinMax { -Q_OBJECT +TQ_OBJECT public: KMinMax(View *, TQWidget *parent = 0, const char *name = 0); diff --git a/kmplot/kmplot/kmplot.cpp b/kmplot/kmplot/kmplot.cpp index bbb49a8d..7c3208d9 100644 --- a/kmplot/kmplot/kmplot.cpp +++ b/kmplot/kmplot/kmplot.cpp @@ -59,7 +59,7 @@ KmPlot::KmPlot( TDECmdLineArgs* args) { // now that the Part is loaded, we cast it to a Part to get // our hands on it - m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(TQT_TQOBJECT(this), + m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(this, "kmplot_part", "KParts::ReadOnlyPart" )); if (m_part) { @@ -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; } @@ -135,18 +135,18 @@ bool KmPlot::load(const KURL& url) void KmPlot::setupActions() { - KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection()); - KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); m_fullScreen = KStdAction::fullScreen( NULL, NULL, actionCollection(), this, "fullscreen"); - connect( m_fullScreen, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( slotUpdateFullScreen( bool ))); + connect( m_fullScreen, TQ_SIGNAL( toggled( bool )), this, TQ_SLOT( slotUpdateFullScreen( bool ))); } void KmPlot::saveProperties(TDEConfig* /*config*/) @@ -210,7 +210,7 @@ void KmPlot::optionsConfigureToolbars() saveMainWindowSettings(TDEGlobal::config() ); // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(applyNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(applyNewToolbarConfig())); dlg.exec(); } @@ -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; @@ -306,13 +306,13 @@ void KmPlot::setupStatusBar() m_progressbar = new KmPlotProgress( statusBar() ); m_progressbar->setMaximumHeight( statusBar()->height()-10 ); - connect( m_progressbar->button, TQT_SIGNAL (clicked() ), this, TQT_SLOT( progressbar_clicked() ) ); + connect( m_progressbar->button, TQ_SIGNAL (clicked() ), this, TQ_SLOT( progressbar_clicked() ) ); statusBar()->addWidget(m_progressbar); } 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/kmplot.h b/kmplot/kmplot/kmplot.h index 4bb4a26e..701a9ae0 100644 --- a/kmplot/kmplot/kmplot.h +++ b/kmplot/kmplot/kmplot.h @@ -48,7 +48,7 @@ class TDEToggleAction; */ class KmPlot : public KParts::MainWindow, virtual public KmPlotIface { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kmplot/kmplot/kmplot.kcfg b/kmplot/kmplot/kmplot.kcfg index df9eba38..0013ab68 100644 --- a/kmplot/kmplot/kmplot.kcfg +++ b/kmplot/kmplot/kmplot.kcfg @@ -208,10 +208,10 @@ <whatsthis>If relative step width is set to true, the step width will be adapted to the size of the window.</whatsthis> <default>true</default> </entry> - <entry name="anglemode" type="Int"> + <entry name="anglemode" type="Bool"> <label>Radians instead of degrees</label> <whatsthis>Check the box if you want to use radians</whatsthis> - <default>0</default> + <default>false</default> </entry> <entry name="backgroundcolor" type="Color"> <label>Background color</label> diff --git a/kmplot/kmplot/kmplotprogress.h b/kmplot/kmplot/kmplotprogress.h index 549fb09c..329bd8b8 100644 --- a/kmplot/kmplot/kmplotprogress.h +++ b/kmplot/kmplot/kmplotprogress.h @@ -32,7 +32,7 @@ /// The progress-widget in the statusbar which appears when drawing integrals class KmPlotProgress: public TQWidget { - Q_OBJECT + TQ_OBJECT public: KmPlotProgress( TQWidget* parent = 0, const char* name = 0 ); diff --git a/kmplot/kmplot/kparametereditor.cpp b/kmplot/kmplot/kparametereditor.cpp index 972cd9b4..5aa0f810 100644 --- a/kmplot/kmplot/kparametereditor.cpp +++ b/kmplot/kmplot/kparametereditor.cpp @@ -49,14 +49,14 @@ KParameterEditor::KParameterEditor(XParser *m, TQValueList<ParameterValueItem> * list->insertItem( (*it).expression ); list->sort(); - connect( cmdNew, TQT_SIGNAL( clicked() ), this, TQT_SLOT( cmdNew_clicked() )); - connect( cmdEdit, TQT_SIGNAL( clicked() ), this, TQT_SLOT( cmdEdit_clicked() )); - connect( cmdDelete, TQT_SIGNAL( clicked() ), this, TQT_SLOT( cmdDelete_clicked() )); - connect( cmdImport, TQT_SIGNAL( clicked() ), this, TQT_SLOT( cmdImport_clicked() )); - connect( cmdExport, TQT_SIGNAL( clicked() ), this, TQT_SLOT( cmdExport_clicked() )); - connect( cmdClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( close() )); - connect( list, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQT_SLOT( varlist_doubleClicked( TQListBoxItem *) )); - connect( list, TQT_SIGNAL( clicked ( TQListBoxItem * ) ), this, TQT_SLOT( varlist_clicked(TQListBoxItem * ) )); + connect( cmdNew, TQ_SIGNAL( clicked() ), this, TQ_SLOT( cmdNew_clicked() )); + connect( cmdEdit, TQ_SIGNAL( clicked() ), this, TQ_SLOT( cmdEdit_clicked() )); + connect( cmdDelete, TQ_SIGNAL( clicked() ), this, TQ_SLOT( cmdDelete_clicked() )); + connect( cmdImport, TQ_SIGNAL( clicked() ), this, TQ_SLOT( cmdImport_clicked() )); + connect( cmdExport, TQ_SIGNAL( clicked() ), this, TQ_SLOT( cmdExport_clicked() )); + connect( cmdClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( close() )); + connect( list, TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQ_SLOT( varlist_doubleClicked( TQListBoxItem *) )); + connect( list, TQ_SIGNAL( clicked ( TQListBoxItem * ) ), this, TQ_SLOT( varlist_clicked(TQListBoxItem * ) )); } diff --git a/kmplot/kmplot/kparametereditor.h b/kmplot/kmplot/kparametereditor.h index 47702010..3c3b6c9c 100644 --- a/kmplot/kmplot/kparametereditor.h +++ b/kmplot/kmplot/kparametereditor.h @@ -37,7 +37,7 @@ class ParameterValueList; /// This class handles the parameter values: it can create, remove, edit and import values. class KParameterEditor : public QParameterEditor { -Q_OBJECT +TQ_OBJECT public: KParameterEditor(XParser *, TQValueList<ParameterValueItem> *, TQWidget *parent = 0, const char *name = 0); diff --git a/kmplot/kmplot/kprinterdlg.h b/kmplot/kmplot/kprinterdlg.h index fef92b8d..92a57246 100644 --- a/kmplot/kmplot/kprinterdlg.h +++ b/kmplot/kmplot/kprinterdlg.h @@ -41,7 +41,7 @@ */ class KPrinterDlg : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: /// Getting the common arguments. diff --git a/kmplot/kmplot/ksliderwindow.cpp b/kmplot/kmplot/ksliderwindow.cpp index b2921bbd..f56e562e 100644 --- a/kmplot/kmplot/ksliderwindow.cpp +++ b/kmplot/kmplot/ksliderwindow.cpp @@ -61,9 +61,9 @@ KSliderWindow::KSliderWindow(TQWidget* parent, int num ) : installEventFilter(this); m_popupmenu = new TDEPopupMenu(this); - TDEAction *mnuMinValue = new TDEAction(i18n("&Change Minimum Value") ,0,TQT_TQOBJECT(this), TQT_SLOT( mnuMinValue_clicked() ),0); + TDEAction *mnuMinValue = new TDEAction(i18n("&Change Minimum Value") ,0,this, TQ_SLOT( mnuMinValue_clicked() ),0); mnuMinValue->plug(m_popupmenu); - TDEAction *mnuMaxValue = new TDEAction(i18n("&Change Maximum Value") ,0,TQT_TQOBJECT(this), TQT_SLOT( mnuMaxValue_clicked() ),0 ); + TDEAction *mnuMaxValue = new TDEAction(i18n("&Change Maximum Value") ,0,this, TQ_SLOT( mnuMaxValue_clicked() ),0 ); mnuMaxValue->plug(m_popupmenu); } @@ -82,7 +82,7 @@ bool KSliderWindow::eventFilter( TQObject *obj, TQEvent *ev ) if (ev->type() == TQEvent::MouseButtonPress) { TQMouseEvent *e = (TQMouseEvent *)ev; - if (e->button() != Qt::RightButton) + if (e->button() != TQt::RightButton) return SliderWindow::eventFilter( obj, ev ); m_popupmenu->exec(TQCursor::pos()); return true; diff --git a/kmplot/kmplot/ksliderwindow.h b/kmplot/kmplot/ksliderwindow.h index e19b25d2..d0d85d46 100644 --- a/kmplot/kmplot/ksliderwindow.h +++ b/kmplot/kmplot/ksliderwindow.h @@ -33,7 +33,7 @@ /** @short Slider window for changing a parameter value */ class KSliderWindow : public SliderWindow { - Q_OBJECT + TQ_OBJECT public: /// @param parent points to the parent widget. diff --git a/kmplot/kmplot/parser.cpp b/kmplot/kmplot/parser.cpp index eaa741ff..13d37681 100644 --- a/kmplot/kmplot/parser.cpp +++ b/kmplot/kmplot/parser.cpp @@ -142,9 +142,9 @@ Parser::~Parser() } } -void Parser::setAngleMode(int angle) +void Parser::setAngleMode(bool angle) { - if(angle==0) + if(!angle) m_anglemode = 1; else m_anglemode = M_PI/180; diff --git a/kmplot/kmplot/parser.h b/kmplot/kmplot/parser.h index 559fb53e..f975156a 100644 --- a/kmplot/kmplot/parser.h +++ b/kmplot/kmplot/parser.h @@ -201,12 +201,12 @@ public: /// Returns the ID-number of the function "name". If the function couldn't be found, -1 is returned. int fnameToId(const TQString &name); /// Returns the current error value. If showMessageBox is true, an error message box will appear if an error was found - int parserError(bool showMessageBox=TRUE); + int parserError(bool showMessageBox=true); /// return the angletype static double anglemode(); - /// Sets the angletype. TRUE is radians and FALSE degrees - void setAngleMode(int); + /// Sets the angletype. true is radians and false degrees + void setAngleMode(bool); /// sets the decimal symbol void setDecimalSymbol(const TQString ); diff --git a/kmplot/kmplot/qconstanteditor.ui b/kmplot/kmplot/qconstanteditor.ui index 0dc8ab8b..68ec9280 100644 --- a/kmplot/kmplot/qconstanteditor.ui +++ b/kmplot/kmplot/qconstanteditor.ui @@ -186,7 +186,7 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot>cmdCancel_clicked()</slot> <slot>cmdNew_clicked()</slot> <slot>cmdEdit_clicked()</slot> @@ -195,7 +195,7 @@ <slot>cmdDuplicate_clicked()</slot> <slot>newNewConstantSlot()</slot> <slot>varlist_doubleClicked( TQListViewItem * )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">tdelistview.h</include> diff --git a/kmplot/kmplot/qeditconstant.ui b/kmplot/kmplot/qeditconstant.ui index ffb66c43..7afff3c0 100644 --- a/kmplot/kmplot/qeditconstant.ui +++ b/kmplot/kmplot/qeditconstant.ui @@ -128,9 +128,9 @@ <includes> <include location="local" impldecl="in implementation">qeditconstant.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>txtVariable_lostFocus()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kmplot/kmplot/qeditparametric.ui b/kmplot/kmplot/qeditparametric.ui index 1b7eaffb..398b2fbb 100644 --- a/kmplot/kmplot/qeditparametric.ui +++ b/kmplot/kmplot/qeditparametric.ui @@ -528,9 +528,9 @@ Example: sin(t)</string> <tabstop>buttonCancel</tabstop> <tabstop>buttonHelp</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotHelp()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcolorbutton.h</include> diff --git a/kmplot/kmplot/qeditpolar.ui b/kmplot/kmplot/qeditpolar.ui index 2d9a785c..9e533b1c 100644 --- a/kmplot/kmplot/qeditpolar.ui +++ b/kmplot/kmplot/qeditpolar.ui @@ -392,9 +392,9 @@ Example: loop(angle)=ln(angle)</string> <tabstop>buttonCancel</tabstop> <tabstop>buttonHelp</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotHelp()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcolorbutton.h</include> 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); |