diff options
| m--------- | cmake | 0 | ||||
| -rw-r--r-- | kimagemapeditor/Makefile.am | 4 | ||||
| -rw-r--r-- | kommander/part/Makefile.am | 2 | ||||
| -rw-r--r-- | kxsldbg/kxsldbgpart/Makefile.am | 4 | ||||
| -rw-r--r-- | quanta/components/debugger/dbgp/Makefile.am | 2 | ||||
| -rw-r--r-- | quanta/components/debugger/gubed/Makefile.am | 2 | ||||
| -rw-r--r-- | quanta/data/doc/faq.html | 4 | ||||
| -rw-r--r-- | quanta/data/doc/maindoc.html | 2 | ||||
| -rw-r--r-- | quanta/data/tips | 2 | ||||
| -rw-r--r-- | quanta/quanta_uml.xmi | 2 | ||||
| -rw-r--r-- | tdefilereplace/Makefile.am | 4 |
11 files changed, 14 insertions, 14 deletions
diff --git a/cmake b/cmake -Subproject 9a217903f9fa35ca12213a6e9ee3d2cb87d1131 +Subproject 274366fb8b90704586d7beef216b765cc0688b0 diff --git a/kimagemapeditor/Makefile.am b/kimagemapeditor/Makefile.am index 11c6e6d2..4bc17ea9 100644 --- a/kimagemapeditor/Makefile.am +++ b/kimagemapeditor/Makefile.am @@ -38,10 +38,10 @@ noinst_HEADERS = \ kimeshell.h -libkimagemapeditor_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP +libkimagemapeditor_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP libkimagemapeditor_la_LIBADD = libkimagemapeditorcommon.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KHTML) -kimagemapeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP +kimagemapeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP kimagemapeditor_LDADD = libkimagemapeditorcommon.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KHTML) # set the include path for X, qt and KDE diff --git a/kommander/part/Makefile.am b/kommander/part/Makefile.am index 4259b3fd..8f6e4b5a 100644 --- a/kommander/part/Makefile.am +++ b/kommander/part/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = -I$(top_srcdir)/kommander/executor -I$(top_srcdir)/kommander/factory $(all_includes) METASOURCES = AUTO kde_module_LTLIBRARIES = libkommander_part.la -libkommander_part_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP -L../../kommander/plugin/.libs -lkommanderplugin +libkommander_part_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP -L../../kommander/plugin/.libs -lkommanderplugin libkommander_part_la_LIBADD = $(top_builddir)/kommander/executor/libinstance.la $(top_builddir)/kommander/widget/libkommanderwidget.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KHTML) kde_services_DATA = kommander_part.desktop libkommander_part_la_SOURCES = kommander_part.cpp diff --git a/kxsldbg/kxsldbgpart/Makefile.am b/kxsldbg/kxsldbgpart/Makefile.am index 4c173a39..cd760045 100644 --- a/kxsldbg/kxsldbgpart/Makefile.am +++ b/kxsldbg/kxsldbgpart/Makefile.am @@ -1,7 +1,7 @@ noinst_LTLIBRARIES = libkxsldbgcommon.la libkxsldbgcommon_la_SOURCES = xsldbgwalkspeedimpl.cpp xsldbgtemplatesimpl.cpp xsldbgtemplatelistitem.cpp xsldbgsourcesimpl.cpp xsldbgoutputview.cpp xsldbglocalvariablesimpl.cpp xsldbglocallistitem.cpp xsldbglistitem.cpp xsldbginspector.cpp xsldbgglobalvariablesimpl.cpp xsldbggloballistitem.cpp xsldbgentitiesimpl.cpp xsldbgdoc.cpp xsldbgdialogbase.cpp xsldbgdebugger.cpp xsldbgconfigimpl.cpp xsldbgcallstackimpl.cpp xsldbgbreakpointsimpl.cpp xsldbgbreakpointlistitem.cpp qxsldbgdoc.cpp kxsldbg_part.cpp kxsldbg_partif.skel xsldbgwalkspeed.ui xsldbgtemplates.ui xsldbgsources.ui xsldbgmsgdialog.ui xsldbglocalvariables.ui xsldbgglobalvariables.ui xsldbgentities.ui xsldbgconfig.ui xsldbgcallstack.ui xsldbgbreakpoints.ui libkxsldbgcommon_la_METASOURCES = AUTO -libkxsldbgcommon_la_LDFLAGS = $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP -ltdetexteditor +libkxsldbgcommon_la_LDFLAGS = $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP -ltdetexteditor libkxsldbgcommon_la_LIBADD = libxsldbg/libxsldbg.la libqtnotfier/libqtnotfier.la noinst_HEADERS = kxsldbg_part.h qxsldbgdoc.h xsldbgbreakpointlistitem.h xsldbgbreakpointsimpl.h xsldbgcallstackimpl.h xsldbgconfigimpl.h xsldbgdebugger.h xsldbgdialogbase.h xsldbgdoc.h xsldbgdocmap.h xsldbgentitiesimpl.h xsldbggloballistitem.h xsldbgglobalvariablesimpl.h xsldbginspector.h xsldbglistitem.h xsldbglocallistitem.h xsldbglocalvariablesimpl.h xsldbgmsgdialogimpl.h xsldbgoutputview.h xsldbgsourcesimpl.h xsldbgtemplatelistitem.h xsldbgtemplatesimpl.h xsldbgwalkspeedimpl.h @@ -15,7 +15,7 @@ SUBDIRS = libqtnotfier libxsldbg INCLUDES = $(XSLDBG_CFLAGS) -I.. $(all_includes) -libkxsldbgpart_la_LDFLAGS = -module $(KDE_PLUGIN) -lkatepartinterfaces $(all_libraries) $(XSLDBG_EXTRA_LIBS)-ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP +libkxsldbgpart_la_LDFLAGS = -module $(KDE_PLUGIN) -lkatepartinterfaces $(all_libraries) $(XSLDBG_EXTRA_LIBS)-ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP libkxsldbgpart_la_LIBADD = libkxsldbgcommon.la $(LIB_KPARTS) diff --git a/quanta/components/debugger/dbgp/Makefile.am b/quanta/components/debugger/dbgp/Makefile.am index cb1d9d0c..edc2fbea 100644 --- a/quanta/components/debugger/dbgp/Makefile.am +++ b/quanta/components/debugger/dbgp/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = quantadebuggerdbgp.la quantadebuggerdbgp_la_SOURCES = quantadebuggerdbgp.cpp dbgpsettingss.ui \ dbgpsettings.cpp dbgpnetwork.cpp qbytearrayfifo.cpp -quantadebuggerdbgp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP -ltdetexteditor +quantadebuggerdbgp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP -ltdetexteditor quantadebuggerdbgp_la_LIBADD = ../interfaces/libdebuggerinterface.la $(LIB_KPARTS) kde_services_DATA = quantadebuggerdbgp.desktop diff --git a/quanta/components/debugger/gubed/Makefile.am b/quanta/components/debugger/gubed/Makefile.am index e5c0c826..92d1db20 100644 --- a/quanta/components/debugger/gubed/Makefile.am +++ b/quanta/components/debugger/gubed/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = quantadebuggergubed.la quantadebuggergubed_la_SOURCES = gubedsettingss.ui quantadebuggergubed.cpp gubedsettings.cpp -quantadebuggergubed_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP -ltdetexteditor +quantadebuggergubed_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP -ltdetexteditor quantadebuggergubed_la_LIBADD = ../interfaces/libdebuggerinterface.la $(LIB_KPARTS) kde_services_DATA = quantadebuggergubed.desktop diff --git a/quanta/data/doc/faq.html b/quanta/data/doc/faq.html index ff3886ca..c054b95f 100644 --- a/quanta/data/doc/faq.html +++ b/quanta/data/doc/faq.html @@ -160,9 +160,9 @@ <a name="3.1" /> <div class="minihdr">3.1. How can I open/edit a file on a remote server?</div> <div class="indent"> - <p>Quanta Plus uses KIO for its file operations. To whit, an e-mail from our benefactor:</p> + <p>Quanta Plus uses TDEIO for its file operations. To whit, an e-mail from our benefactor:</p> <p><i>Try this. Open the file open dialog... you can do this in the file name, but it's even cooler if you use the directory drop-down up top on the dialog. Enter this: ftp://user@mydomain.com and hit enter. It will prompt you for a password after which it will fill the file dialog with the available files and folders on the site location. You and now navigate your site like you were looking at your local directory, open and save files on line.</i></p> - <p><i>Two additional facts here. First if you are using projects you can set your project preview option to directly preview from the site and then see PHP files with data live as they would behave on site. Second, this is made possible by KDE's KIO slaves. So any functional KIO slave you have installed brings this same functionality. Try kio_fish for secure file access as well as other slaves for Samba, scp and other protocols.</i></p> + <p><i>Two additional facts here. First if you are using projects you can set your project preview option to directly preview from the site and then see PHP files with data live as they would behave on site. Second, this is made possible by KDE's TDEIO slaves. So any functional TDEIO slave you have installed brings this same functionality. Try tdeio_fish for secure file access as well as other slaves for Samba, scp and other protocols.</i></p> <p><i>--<br />Eric Laffoon</i></p> <p>That should about cover it.</p> </div> diff --git a/quanta/data/doc/maindoc.html b/quanta/data/doc/maindoc.html index 3deec1b0..90fa4424 100644 --- a/quanta/data/doc/maindoc.html +++ b/quanta/data/doc/maindoc.html @@ -50,7 +50,7 @@ <li>Assistance in understanding some of the more potentially difficult areas like interface customization, scripting and running a PHP debugger. </li> <li>Pointing out the less obvious things like the ability to open projects - remotely through kio. </li> + remotely through tdeio. </li> <li>Giving instruction on how you can customize Quanta (without writing a line of C++ and in many cases not even recompiling) with custom tags and documentation. </li> <li>Introductory instruction on how to be much more productive with Quanta. </li> diff --git a/quanta/data/tips b/quanta/data/tips index 91507c53..b0c40ef9 100644 --- a/quanta/data/tips +++ b/quanta/data/tips @@ -49,7 +49,7 @@ specific? You can customize any of Quanta's toolbars too. <tip category="Project"> <html> <p>...that you can create remote projects and manage them with the -<b>kio slave of your choice</b>? Look in the project settings dialog. +<b>tdeio slave of your choice</b>? Look in the project settings dialog. </p> </html> </tip> diff --git a/quanta/quanta_uml.xmi b/quanta/quanta_uml.xmi index 70e4747f..48793fe8 100644 --- a/quanta/quanta_uml.xmi +++ b/quanta/quanta_uml.xmi @@ -1559,7 +1559,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Attribute stereotype="" package="" xmi.id="1324" value="" type="bool" abstract="0" documentation="" name="suspendUpload" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1325" value="" type="bool" abstract="0" documentation="" name="uploadInProgress" static="0" scope="201" /> </UML:Class> - <UML:Class stereotype="" package="" xmi.id="1340" abstract="0" documentation="Create a new project from kio accessible files and folders." name="ProjectNewLocal" static="0" scope="200" > + <UML:Class stereotype="" package="" xmi.id="1340" abstract="0" documentation="Create a new project from tdeio accessible files and folders." name="ProjectNewLocal" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1342" type="" abstract="0" documentation="" name="ProjectNewLocal" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1343" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1344" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> diff --git a/tdefilereplace/Makefile.am b/tdefilereplace/Makefile.am index 8d2584c0..2f26d2c4 100644 --- a/tdefilereplace/Makefile.am +++ b/tdefilereplace/Makefile.am @@ -21,7 +21,7 @@ libtdefilereplacepart_la_SOURCES = tdefilereplacepart.cpp tdefilereplaceview.cpp knewprojectdlgs.ui koptionsdlg.cpp koptionsdlgs.ui tdefilereplacelib.cpp report.cpp \ commandengine.cpp configurationclasses.cpp -libtdefilereplacepart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP +libtdefilereplacepart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP libtdefilereplacepart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KHTML) messages: rc.cpp @@ -38,6 +38,6 @@ partrc_DATA = tdefilereplacepartui.rc shellrcdir = $(kde_datadir)/tdefilereplace shellrc_DATA = tdefilereplaceui.rc bin_PROGRAMS = tdefilereplace -tdefilereplace_LDFLAGS = $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP +tdefilereplace_LDFLAGS = $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP tdefilereplace_LDADD = $(LIB_KPARTS) tdefilereplace_SOURCES = tdefilereplace.cpp main.cpp |