diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-06 02:19:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-06 02:19:32 -0600 |
| commit | 5767aad9451713e0e50890c7af218cd62c552e9e (patch) | |
| tree | d96c692c2160ff0408596f79ad2b61b5f3316c2a /kiosktool | |
| parent | 3c99afe25cc68e92aa23e1ea7cf24de1b868b397 (diff) | |
| download | kiosktool-5767aad9451713e0e50890c7af218cd62c552e9e.tar.gz kiosktool-5767aad9451713e0e50890c7af218cd62c552e9e.zip | |
Additional kde to tde renaming
Diffstat (limited to 'kiosktool')
| -rw-r--r-- | kiosktool/Makefile.am | 6 | ||||
| -rw-r--r-- | kiosktool/componentPage.cpp | 4 | ||||
| -rw-r--r-- | kiosktool/kioskrun.cpp | 20 |
3 files changed, 15 insertions, 15 deletions
diff --git a/kiosktool/Makefile.am b/kiosktool/Makefile.am index 34a3c9d..ca6fb6b 100644 --- a/kiosktool/Makefile.am +++ b/kiosktool/Makefile.am @@ -12,10 +12,10 @@ bin_PROGRAMS = kiosktool kiosktool-kdedirs INCLUDES = $(all_includes) # the library search path. -kiosktool_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kiosktool_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor # the libraries to link against. -kiosktool_LDADD = $(LIB_KFILE) -lkdeprint +kiosktool_LDADD = $(LIB_KFILE) -ltdeprint # which sources should be compiled for kiosktool kiosktool_SOURCES = main.cpp kioskgui.cpp kioskdata.cpp kioskrun.cpp \ @@ -32,7 +32,7 @@ kiosktool_SOURCES = main.cpp kioskgui.cpp kioskdata.cpp kioskrun.cpp \ kiosksync.cpp # the library search path. -kiosktool_kdedirs_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kiosktool_kdedirs_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor # the libraries to link against. kiosktool_kdedirs_LDADD = $(LIB_KDECORE) diff --git a/kiosktool/componentPage.cpp b/kiosktool/componentPage.cpp index 3f7e3a7..0b519e0 100644 --- a/kiosktool/componentPage.cpp +++ b/kiosktool/componentPage.cpp @@ -204,7 +204,7 @@ void ComponentPage::slotSetupDone() KioskRun::self()->flushConfigCache(); if (m_data->setup.hasOption("restart")) - KApplication::kdeinitExec(m_data->setup.exec); + KApplication::tdeinitExec(m_data->setup.exec); } void ComponentPage::slotSetupAppRegistered( const TQCString &appid) @@ -288,7 +288,7 @@ void ComponentPage::slotPreviewDone() delete m_process; m_process = 0; if (m_data->preview.hasOption("restart")) - KApplication::kdeinitExec(m_data->preview.exec); + KApplication::tdeinitExec(m_data->preview.exec); } void ComponentPage::slotShowAction(TQListViewItem *item) diff --git a/kiosktool/kioskrun.cpp b/kiosktool/kioskrun.cpp index bdf7353..7e96004 100644 --- a/kiosktool/kioskrun.cpp +++ b/kiosktool/kioskrun.cpp @@ -672,7 +672,7 @@ KioskRun::makeMutable(bool bMutable) config->writeEntry("kiosk_exception", TQString()); } } - // Propagate to kdeinit + // Propagate to tdeinit dcopRef("klauncher", "klauncher").call("setLaunchEnv", TQCString("KDE_KIOSK_NO_RESTRICTIONS"), TQCString(m_noRestrictions ? "true" : "")); @@ -759,15 +759,15 @@ KioskRun::setupRuntimeEnv() TQString dcopServerFile = m_homeDir+"/.kde/DCOPserver"; - KProcess kdeinit; + KProcess tdeinit; - applyEnvironment(&kdeinit); + applyEnvironment(&tdeinit); - kdeinit << "kdeinit"; + tdeinit << "tdeinit"; - connect(&kdeinit, TQT_SIGNAL(processExited(KProcess *)), &dlg, TQT_SLOT(slotFinished())); + connect(&tdeinit, TQT_SIGNAL(processExited(KProcess *)), &dlg, TQT_SLOT(slotFinished())); - kdeinit.start(KProcess::NotifyOnExit); + tdeinit.start(KProcess::NotifyOnExit); dlg.exec(); @@ -811,12 +811,12 @@ KioskRun::shutdownRuntimeEnv() delete m_dcopClient; m_dcopClient = 0; - KProcess kdeinit; - applyEnvironment(&kdeinit); + KProcess tdeinit; + applyEnvironment(&tdeinit); - kdeinit << "kdeinit_shutdown"; + tdeinit << "tdeinit_shutdown"; - kdeinit.start(KProcess::Block); + tdeinit.start(KProcess::Block); KProcess dcopserver; applyEnvironment(&dcopserver); |