Additional kde to tde renaming

pull/2/head
Timothy Pearson 13 years ago
parent 66c0fa7079
commit 7574a7287e

@ -67,7 +67,7 @@ option( WITH_XDAMAGE "Enable xdamage support" OFF )
option( WITH_XEXT "Enable xext support" OFF ) option( WITH_XEXT "Enable xext support" OFF )
option( WITH_LIBUSB "Enable control of some mouse models through libusb" OFF ) option( WITH_LIBUSB "Enable control of some mouse models through libusb" OFF )
option( WITH_LIBRAW1394 "Enable visualization of ieee1394 devices through libraw1394" OFF ) option( WITH_LIBRAW1394 "Enable visualization of ieee1394 devices through libraw1394" OFF )
option( WITH_SUDO_KDESU_BACKEND "Use sudo as backend for kdesu (default is su)" OFF ) option( WITH_SUDO_KDESU_BACKEND "Use sudo as backend for tdesu (default is su)" OFF )
option( WITH_PAM "kdm should use PAM" OFF ) option( WITH_PAM "kdm should use PAM" OFF )
option( WITH_SHADOW "kdm should use shadow passwords" OFF ) option( WITH_SHADOW "kdm should use shadow passwords" OFF )
option( WITH_XDMCP "xdmcp support for kdm" OFF ) option( WITH_XDMCP "xdmcp support for kdm" OFF )
@ -96,14 +96,14 @@ option( BUILD_KDESKTOP "Build kdesktop" ${BUILD_ALL} )
option( BUILD_KONSOLE "Build konsole" ${BUILD_ALL} ) option( BUILD_KONSOLE "Build konsole" ${BUILD_ALL} )
option( BUILD_KLIPPER "Build klipper" ${BUILD_ALL} ) option( BUILD_KLIPPER "Build klipper" ${BUILD_ALL} )
option( BUILD_KMENUEDIT "Build kmenuedit" ${BUILD_ALL} ) option( BUILD_KMENUEDIT "Build kmenuedit" ${BUILD_ALL} )
option( BUILD_KDEPRINT "Build kdeprint" ${BUILD_ALL} ) option( BUILD_KDEPRINT "Build tdeprint" ${BUILD_ALL} )
option( BUILD_KPERSONALIZER "Build kpersonalizer" ${BUILD_ALL} ) option( BUILD_KPERSONALIZER "Build kpersonalizer" ${BUILD_ALL} )
option( BUILD_KDEPASSWD "Build kdepasswd" ${BUILD_ALL} ) option( BUILD_KDEPASSWD "Build kdepasswd" ${BUILD_ALL} )
option( BUILD_KTIP "Build ktip" ${BUILD_ALL} ) option( BUILD_KTIP "Build ktip" ${BUILD_ALL} )
option( BUILD_KDEEJECT "Build kdeeject" ${BUILD_ALL} ) option( BUILD_KDEEJECT "Build kdeeject" ${BUILD_ALL} )
option( BUILD_KDIALOG "Build kdialog" ${BUILD_ALL} ) option( BUILD_KDIALOG "Build kdialog" ${BUILD_ALL} )
option( BUILD_KREADCONFIG "Build kreadconfig" ${BUILD_ALL} ) option( BUILD_KREADCONFIG "Build kreadconfig" ${BUILD_ALL} )
option( BUILD_KDESU "Build kdesu" ${BUILD_ALL} ) option( BUILD_KDESU "Build tdesu" ${BUILD_ALL} )
option( BUILD_KDM "Build kdm" ${BUILD_ALL} ) option( BUILD_KDM "Build kdm" ${BUILD_ALL} )
option( BUILD_KSMSERVER "Build ksmserver" ${BUILD_ALL} ) option( BUILD_KSMSERVER "Build ksmserver" ${BUILD_ALL} )
option( BUILD_KSPLASHML "Build ksplashml" ${BUILD_ALL} ) option( BUILD_KSPLASHML "Build ksplashml" ${BUILD_ALL} )
@ -170,14 +170,14 @@ tde_conditional_add_subdirectory( BUILD_KDESKTOP kdesktop )
tde_conditional_add_subdirectory( BUILD_KONSOLE konsole ) tde_conditional_add_subdirectory( BUILD_KONSOLE konsole )
tde_conditional_add_subdirectory( BUILD_KLIPPER klipper ) tde_conditional_add_subdirectory( BUILD_KLIPPER klipper )
tde_conditional_add_subdirectory( BUILD_KMENUEDIT kmenuedit ) tde_conditional_add_subdirectory( BUILD_KMENUEDIT kmenuedit )
tde_conditional_add_subdirectory( BUILD_KDEPRINT kdeprint ) tde_conditional_add_subdirectory( BUILD_KDEPRINT tdeprint )
tde_conditional_add_subdirectory( BUILD_KPERSONALIZER kpersonalizer ) tde_conditional_add_subdirectory( BUILD_KPERSONALIZER kpersonalizer )
tde_conditional_add_subdirectory( BUILD_KDEPASSWD kdepasswd ) tde_conditional_add_subdirectory( BUILD_KDEPASSWD kdepasswd )
tde_conditional_add_subdirectory( BUILD_KTIP ktip ) tde_conditional_add_subdirectory( BUILD_KTIP ktip )
tde_conditional_add_subdirectory( BUILD_KDEEJECT kdeeject ) tde_conditional_add_subdirectory( BUILD_KDEEJECT kdeeject )
tde_conditional_add_subdirectory( BUILD_KDIALOG kdialog ) tde_conditional_add_subdirectory( BUILD_KDIALOG kdialog )
tde_conditional_add_subdirectory( BUILD_KREADCONFIG kreadconfig ) tde_conditional_add_subdirectory( BUILD_KREADCONFIG kreadconfig )
tde_conditional_add_subdirectory( BUILD_KDESU kdesu ) tde_conditional_add_subdirectory( BUILD_KDESU tdesu )
tde_conditional_add_subdirectory( BUILD_KDM kdm ) tde_conditional_add_subdirectory( BUILD_KDM kdm )
tde_conditional_add_subdirectory( BUILD_KSMSERVER ksmserver ) tde_conditional_add_subdirectory( BUILD_KSMSERVER ksmserver )
tde_conditional_add_subdirectory( BUILD_KSPLASHML ksplashml ) tde_conditional_add_subdirectory( BUILD_KSPLASHML ksplashml )

@ -50,13 +50,13 @@ libraries. Here is an overview of the directories:
* kdebugdialog * kdebugdialog
Allows you to specify which debug messages you want to see. Allows you to specify which debug messages you want to see.
* kdeprint * tdeprint
The KDE printing system. The KDE printing system.
* kdesktop * kdesktop
You guessed it: the desktop above the panel. You guessed it: the desktop above the panel.
* kdesu * tdesu
A graphical front end to "su". A graphical front end to "su".
* kdialog * kdialog

@ -173,74 +173,74 @@ Comment[zh_CN]=配置密码设置
Comment[zh_TW]=設定密碼 Comment[zh_TW]=設定密碼
Comment[zu]=Hlanganisela izilungiselelo zamagama-okudlula Comment[zu]=Hlanganisela izilungiselelo zamagama-okudlula
Keywords=Passwords,kdesu,Echo characters,Remember passwords,Timeout Keywords=Passwords,tdesu,Echo characters,Remember passwords,Timeout
Keywords[ar]=كلمات المرور ، kdesu ، رموز الصدى ، تذكّر كلمات المرور ، الفترات الزمنية Keywords[ar]=كلمات المرور ، tdesu ، رموز الصدى ، تذكّر كلمات المرور ، الفترات الزمنية
Keywords[az]=Şifrələr,kdesu,Əks etmə Xarakterləri,şifrələri yadda saxla,vaxt dolması Keywords[az]=Şifrələr,tdesu,Əks etmə Xarakterləri,şifrələri yadda saxla,vaxt dolması
Keywords[be]=Паролі,Запамінанне пароляў,Тэрмін чакання,Passwords,kdesu,Echo characters,Remember passwords,Timeout Keywords[be]=Паролі,Запамінанне пароляў,Тэрмін чакання,Passwords,tdesu,Echo characters,Remember passwords,Timeout
Keywords[bg]=парола, потребителска, знаци, Passwords, kdesu, Echo characters, Remember passwords, Timeout Keywords[bg]=парола, потребителска, знаци, Passwords, tdesu, Echo characters, Remember passwords, Timeout
Keywords[ca]=Contrasenyes,kdesu,Caràcters amb eco,Recordar contrasenyes,Temps d'expiració Keywords[ca]=Contrasenyes,tdesu,Caràcters amb eco,Recordar contrasenyes,Temps d'expiració
Keywords[cs]=Heslo,kdesu,Zapamatování hesla,Prodleva Keywords[cs]=Heslo,tdesu,Zapamatování hesla,Prodleva
Keywords[csb]=Parole,kdesu,pòwtôrzanié znaków,pòmión znaków,pamiãtanié parolów,limit czasu Keywords[csb]=Parole,tdesu,pòwtôrzanié znaków,pòmión znaków,pamiãtanié parolów,limit czasu
Keywords[cy]=Cyfrineiriau,kdesu,Nodau atsain,Cofio cyfrineiriau,Goramser Keywords[cy]=Cyfrineiriau,tdesu,Nodau atsain,Cofio cyfrineiriau,Goramser
Keywords[da]=Kodeord,kdesu,Ekko-tegn,Husk kodeord,Timeout,Udløb Keywords[da]=Kodeord,tdesu,Ekko-tegn,Husk kodeord,Timeout,Udløb
Keywords[de]=Passwörter,Kdesu,Timeout,Zeitlimit Keywords[de]=Passwörter,Kdesu,Timeout,Zeitlimit
Keywords[el]=Κωδικοί πρόσβασης,kdesu,Εμφάνιση χαρακτήρων,διατήρηση στη μνήμη κωδικών πρόσβασης,Χρονικό όριο Keywords[el]=Κωδικοί πρόσβασης,tdesu,Εμφάνιση χαρακτήρων,διατήρηση στη μνήμη κωδικών πρόσβασης,Χρονικό όριο
Keywords[eo]=pasvorto,kdesu,eĥosigno,memoru pasvorton,tempolimo Keywords[eo]=pasvorto,tdesu,eĥosigno,memoru pasvorton,tempolimo
Keywords[es]=Contraseñas,kdesu,Caracteres con eco,Recordar contraseñas,Tiempo de expiración Keywords[es]=Contraseñas,tdesu,Caracteres con eco,Recordar contraseñas,Tiempo de expiración
Keywords[et]=paroolid,kdesu,tagasiside,paroolide meeldejätmine,taimaut,aegumine Keywords[et]=paroolid,tdesu,tagasiside,paroolide meeldejätmine,taimaut,aegumine
Keywords[eu]=Pasahitzak,kdesu,Echo karaktereak,Gogoratu pasahitzak,Denbora-muga Keywords[eu]=Pasahitzak,tdesu,Echo karaktereak,Gogoratu pasahitzak,Denbora-muga
Keywords[fa]=اسم رمز‌ها، kdesu، پژواک نویسه‌ها، یادآوری اسم رمزها، اتمام وقت Keywords[fa]=اسم رمز‌ها، tdesu، پژواک نویسه‌ها، یادآوری اسم رمزها، اتمام وقت
Keywords[fi]=Salasanat,kdesu,Kaiutettavat merkit,Muista salasanat,Aikavalvonta Keywords[fi]=Salasanat,tdesu,Kaiutettavat merkit,Muista salasanat,Aikavalvonta
Keywords[fr]=mot de passe,mots de passe,kdesu,caractères d'affichage,mémoriser les mots de passe,mémorisation des mots de passe,enregistrement des mots de passe,enregistrer les mots de passe,délai,sécurité Keywords[fr]=mot de passe,mots de passe,tdesu,caractères d'affichage,mémoriser les mots de passe,mémorisation des mots de passe,enregistrement des mots de passe,enregistrer les mots de passe,délai,sécurité
Keywords[fy]=wachtwurden,kdesu,wachtwurden ûnthâlden,timeout,tiidslimyt,asterisken Keywords[fy]=wachtwurden,tdesu,wachtwurden ûnthâlden,timeout,tiidslimyt,asterisken
Keywords[ga]=Focail fhaire,kdesu,Carachtair macalla,Meabhraigh focail fhaire,Teorainn ama Keywords[ga]=Focail fhaire,tdesu,Carachtair macalla,Meabhraigh focail fhaire,Teorainn ama
Keywords[gl]=Contrasinais,kdesu,carácteres eco,Lembrar contrasinais,Tempo de espera Keywords[gl]=Contrasinais,tdesu,carácteres eco,Lembrar contrasinais,Tempo de espera
Keywords[he]=הצגת תווים,שמירת ססמאות,זמן מוקצב,kdesu,ססמאות, Passwords,kdesu,Echo characters,Remember passwords,Timeout Keywords[he]=הצגת תווים,שמירת ססמאות,זמן מוקצב,tdesu,ססמאות, Passwords,tdesu,Echo characters,Remember passwords,Timeout
Keywords[hi]=पासवर्ड,केडीईएसयू,अक्षरों को ऐसे दिखाएँ,पासवर्ड याद रखें,समय बीता Keywords[hi]=पासवर्ड,केडीईएसयू,अक्षरों को ऐसे दिखाएँ,पासवर्ड याद रखें,समय बीता
Keywords[hr]=Passwords,kdesu,Echo characters,Remember passwords,Timeout, šifre,zapamti šifre, prekoračenje vremena Keywords[hr]=Passwords,tdesu,Echo characters,Remember passwords,Timeout, šifre,zapamti šifre, prekoračenje vremena
Keywords[hsb]=Passwords,kdesu,Echo characters,Remember passwords,Timeout, maksimalny čas, spomjatkować, hesło Keywords[hsb]=Passwords,tdesu,Echo characters,Remember passwords,Timeout, maksimalny čas, spomjatkować, hesło
Keywords[hu]=jelszavak,kdesu,karakterkijelzés,jelszómentés,időtúllépés Keywords[hu]=jelszavak,tdesu,karakterkijelzés,jelszómentés,időtúllépés
Keywords[is]=Lykilorð,kdesu,muna lykilorð,útrunninn,tími Keywords[is]=Lykilorð,tdesu,muna lykilorð,útrunninn,tími
Keywords[it]=Password,kdesu,caratteri password,ricorda password,tempo massimo Keywords[it]=Password,tdesu,caratteri password,ricorda password,tempo massimo
Keywords[ja]=パスワード,kdesu,エコー文字,パスワードを保存,タイムアウト Keywords[ja]=パスワード,tdesu,エコー文字,パスワードを保存,タイムアウト
Keywords[ka]=პაროლები, kdesu, Echo სიმბოლოები, პაროლების დამახსოვრება, დრო ამოიწურა Keywords[ka]=პაროლები, tdesu, Echo სიმბოლოები, პაროლების დამახსოვრება, დრო ამოიწურა
Keywords[km]=ពាក្យ​សម្ងាត់,kdesu,បង្ហាញ​តួអក្សរ,ចងចាំ​ពាក្យ​សម្ងាត់,អស់​ពេល Keywords[km]=ពាក្យ​សម្ងាត់,tdesu,បង្ហាញ​តួអក្សរ,ចងចាំ​ពាក្យ​សម្ងាត់,អស់​ពេល
Keywords[lo]=ລະຫັດຜ່ານ,kdesu,ສະແດງອັກສອນ, ຈື່ລະຫັດຜ່ານ,ຫມົດເວລາ Keywords[lo]=ລະຫັດຜ່ານ,tdesu,ສະແດງອັກສອນ, ຈື່ລະຫັດຜ່ານ,ຫມົດເວລາ
Keywords[lt]=Slaptažodžiai,kdesu,Echo simboliai,Įsiminti slaptažodžius,Galiojimo laikas Keywords[lt]=Slaptažodžiai,tdesu,Echo simboliai,Įsiminti slaptažodžius,Galiojimo laikas
Keywords[lv]=Paroles,kdesu,Eho simboli,Atcerēties paroles,Noildze Keywords[lv]=Paroles,tdesu,Eho simboli,Atcerēties paroles,Noildze
Keywords[mk]=Passwords,kdesu,Echo characters,Remember passwords,Timeout,Лозинки,Ехо на знаци,памти лозинки,истек на време Keywords[mk]=Passwords,tdesu,Echo characters,Remember passwords,Timeout,Лозинки,Ехо на знаци,памти лозинки,истек на време
Keywords[mn]=Нууц үгс,Kdesu,Хугацааны хязгаар,Хугацааны хязгаар Keywords[mn]=Нууц үгс,Kdesu,Хугацааны хязгаар,Хугацааны хязгаар
Keywords[ms]=Katalaluan,kdesu,Gema aksara,Ingat katalaluan,Masa Tamat Keywords[ms]=Katalaluan,tdesu,Gema aksara,Ingat katalaluan,Masa Tamat
Keywords[nb]=Passord,kdesu,tegnekko,husk passord,tidsavbrudd Keywords[nb]=Passord,tdesu,tegnekko,husk passord,tidsavbrudd
Keywords[nds]=Passwöör,kdesu,Teken wiesen,Passwöör marken,Timeout,Tietgrenz Keywords[nds]=Passwöör,tdesu,Teken wiesen,Passwöör marken,Timeout,Tietgrenz
Keywords[ne]=पासवर्ड, केडीई एस यू, इको क्यारेक्टर, पासवर्ड स्मरण, समय समाप्ति Keywords[ne]=पासवर्ड, केडीई एस यू, इको क्यारेक्टर, पासवर्ड स्मरण, समय समाप्ति
Keywords[nl]=wachtwoorden,kdesu,wachtwoorden onthouden,timeout,tijdslimiet,asterisken Keywords[nl]=wachtwoorden,tdesu,wachtwoorden onthouden,timeout,tijdslimiet,asterisken
Keywords[nn]=passord,kdesu,teiknekko,hugs passord,ekko,tidsgrense Keywords[nn]=passord,tdesu,teiknekko,hugs passord,ekko,tidsgrense
Keywords[nso]=Mantsuphetiso,kdesu,dihlaka ts a Echo,Gopola mantsuphetiso,Phelelo ya Nako Keywords[nso]=Mantsuphetiso,tdesu,dihlaka ts a Echo,Gopola mantsuphetiso,Phelelo ya Nako
Keywords[pa]=Passwords,kdesu,Echo characters,Remember passwords,Timeout,ਗੁਪਤ-ਕੋਡ Keywords[pa]=Passwords,tdesu,Echo characters,Remember passwords,Timeout,ਗੁਪਤ-ਕੋਡ
Keywords[pl]=Hasła,kdesu,powtarzanie znaków,echo znaków,pamiętanie haseł,limit czasu Keywords[pl]=Hasła,tdesu,powtarzanie znaków,echo znaków,pamiętanie haseł,limit czasu
Keywords[pt]=Senhas,kdesu,caracteres de eco,lembrar a senha,tempo limite Keywords[pt]=Senhas,tdesu,caracteres de eco,lembrar a senha,tempo limite
Keywords[pt_BR]=senhas,kdesu,ecoar caracteres,lembrar senhas,tempo limite, timeout Keywords[pt_BR]=senhas,tdesu,ecoar caracteres,lembrar senhas,tempo limite, timeout
Keywords[ro]=parole,kdesu,ecou caractere,amintește parole,limită de timp Keywords[ro]=parole,tdesu,ecou caractere,amintește parole,limită de timp
Keywords[rw]=Amagambobanga,kdesu,Inyuguti Echo,Kwibuka amagambobanga, Igihecyarenze Keywords[rw]=Amagambobanga,tdesu,Inyuguti Echo,Kwibuka amagambobanga, Igihecyarenze
Keywords[se]=beassansánit,kdesu,mearaskádja,muitte beassansániid,áigemearri Keywords[se]=beassansánit,tdesu,mearaskádja,muitte beassansániid,áigemearri
Keywords[sk]=Heslá,kdesu,zobrazované znaky,zapamätanie hesiel,Timeout Keywords[sk]=Heslá,tdesu,zobrazované znaky,zapamätanie hesiel,Timeout
Keywords[sl]=gesla,kdesu,zapomni si gesla,zakasnitev Keywords[sl]=gesla,tdesu,zapomni si gesla,zakasnitev
Keywords[sr]=Passwords,kdesu,Echo characters,Remember passwords,Timeout,лозинке, запамти лозинке,прекорачење времена Keywords[sr]=Passwords,tdesu,Echo characters,Remember passwords,Timeout,лозинке, запамти лозинке,прекорачење времена
Keywords[sr@Latn]=Passwords,kdesu,Echo characters,Remember passwords,Timeout,lozinke, zapamti lozinke,prekoračenje vremena Keywords[sr@Latn]=Passwords,tdesu,Echo characters,Remember passwords,Timeout,lozinke, zapamti lozinke,prekoračenje vremena
Keywords[sv]=Lösenord,kdesu,Eka tecken,Kom ihåg lösenord,Tidsgräns Keywords[sv]=Lösenord,tdesu,Eka tecken,Kom ihåg lösenord,Tidsgräns
Keywords[ta]=கடவுச்சொற்கள்,kdesu,எதிரொலிக்கும் எழுத்துகள்,கடவுச்சொற்களை நினைவில் கொள்,நேரமுடிவு Keywords[ta]=கடவுச்சொற்கள்,tdesu,எதிரொலிக்கும் எழுத்துகள்,கடவுச்சொற்களை நினைவில் கொள்,நேரமுடிவு
Keywords[te]=పాస్ వర్డులు, కెడిఈఎస్ యూ, చూపించే అక్షరాలు, పాస్ వర్డులు గుర్తుపెట్టుకో, సమయం అయిపోయింది Keywords[te]=పాస్ వర్డులు, కెడిఈఎస్ యూ, చూపించే అక్షరాలు, పాస్ వర్డులు గుర్తుపెట్టుకో, సమయం అయిపోయింది
Keywords[th]=รหัสผ่าน,kdesu,แสดงอักขระ,จำรหัสผ่าน,หมดเวลา Keywords[th]=รหัสผ่าน,tdesu,แสดงอักขระ,จำรหัสผ่าน,หมดเวลา
Keywords[tr]=Paralolar,kdesu,Yankı karakterleri,paraloları hatırla,zaman aşımı Keywords[tr]=Paralolar,tdesu,Yankı karakterleri,paraloları hatırla,zaman aşımı
Keywords[uk]=паролі,kdesu,символ луни,запам'ятати паролі,тайм-аут Keywords[uk]=паролі,tdesu,символ луни,запам'ятати паролі,тайм-аут
Keywords[uz]=Maxfiy soʻzlar,kdesu,Echo characters,Maxfiy soʻzlarni eslab qolish,Taymaut Keywords[uz]=Maxfiy soʻzlar,tdesu,Echo characters,Maxfiy soʻzlarni eslab qolish,Taymaut
Keywords[uz@cyrillic]=Махфий сўзлар,kdesu,Echo characters,Махфий сўзларни эслаб қолиш,Таймаут Keywords[uz@cyrillic]=Махфий сўзлар,tdesu,Echo characters,Махфий сўзларни эслаб қолиш,Таймаут
Keywords[ven]=Phasiwede,kdesu,vhaanewa vha Echo,Humbula phasiwede,U fhela ha tshifhinga Keywords[ven]=Phasiwede,tdesu,vhaanewa vha Echo,Humbula phasiwede,U fhela ha tshifhinga
Keywords[vi]=Mật khẩu,kdesu,Ký tự vọng,Nhớ mật khẩu,Giới hạn thời gian Keywords[vi]=Mật khẩu,tdesu,Ký tự vọng,Nhớ mật khẩu,Giới hạn thời gian
Keywords[wa]=Sicrets, mots di passe,kdesu,caracteres echo,si sovni des screts, si sovni des mots d' passe,Timeout Keywords[wa]=Sicrets, mots di passe,tdesu,caracteres echo,si sovni des screts, si sovni des mots d' passe,Timeout
Keywords[xh]=Amagama okugqitha,kdesu,iimpawu zesandi somkhwazo,Khumbula amagama okugqitha,Ixesha lokuphuma Keywords[xh]=Amagama okugqitha,tdesu,iimpawu zesandi somkhwazo,Khumbula amagama okugqitha,Ixesha lokuphuma
Keywords[zh_CN]=Passwords,kdesu,Echo characters,Remember passwords,Timeout,密码,超时,密码,回显字符,记住密码 Keywords[zh_CN]=Passwords,tdesu,Echo characters,Remember passwords,Timeout,密码,超时,密码,回显字符,记住密码
Keywords[zh_TW]=Passwords,kdesu,Echo characters,Remember passwords,Timeout,密碼,回應字元,記住密碼,作業逾時 Keywords[zh_TW]=Passwords,tdesu,Echo characters,Remember passwords,Timeout,密碼,回應字元,記住密碼,作業逾時
Keywords[zu]=Amagama-okudlula,kdesu,Izimpawu zomsindo wokumemeza,Khumbula amagama-okudlula,Isikhathi sokuphuma Keywords[zu]=Amagama-okudlula,tdesu,Izimpawu zomsindo wokumemeza,Khumbula amagama-okudlula,Isikhathi sokuphuma

@ -79,11 +79,11 @@
// kcontrol/input // kcontrol/input
#cmakedefine HAVE_LIBUSB 1 #cmakedefine HAVE_LIBUSB 1
// kdeprint // tdeprint
#cmakedefine HAVE_SIGACTION 1 #cmakedefine HAVE_SIGACTION 1
#cmakedefine HAVE_SIGSET 1 #cmakedefine HAVE_SIGSET 1
// kdesu // tdesu
#cmakedefine HAVE_STRUCT_UCRED 1 #cmakedefine HAVE_STRUCT_UCRED 1
#cmakedefine HAVE_GETPEEREID 1 #cmakedefine HAVE_GETPEEREID 1
#cmakedefine HAVE_SYS_SELECT_H 1 #cmakedefine HAVE_SYS_SELECT_H 1

@ -167,7 +167,7 @@ server.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term>kdegames</term> <term>tdegames</term>
<listitem> <listitem>
<para>Optional</para> <para>Optional</para>
<para>Various games like &kmahjongg;, &ksnake;, &kasteroids;, and <para>Various games like &kmahjongg;, &ksnake;, &kasteroids;, and
@ -206,7 +206,7 @@ download manager &kget;, and several other network-related programs.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term>kdepim</term> <term>tdepim</term>
<listitem> <listitem>
<para>Optional</para> <para>Optional</para>
<para>Personal information management tools. Contains the email client &kmail;, the newsreader &knode; and other related programs.</para> <para>Personal information management tools. Contains the email client &kmail;, the newsreader &knode; and other related programs.</para>

@ -19,7 +19,7 @@ url="http://www.konqueror.org">http://www.konqueror.org</ulink> where a
<qandaentry> <qandaentry>
<question><para>Can I run &konqueror; without running &kde;?</para></question> <question><para>Can I run &konqueror; without running &kde;?</para></question>
<answer><para>Yes. Just install &Qt;, kdelibs and kdebase, and from your favorite window manager just launch &konqueror;. It should work just fine, but if it doesn't (&kde; developers don't test that case often), report it to http://bugs.kde.org and try running "kdeinit" before running &konqueror;, it usually helps. <answer><para>Yes. Just install &Qt;, kdelibs and kdebase, and from your favorite window manager just launch &konqueror;. It should work just fine, but if it doesn't (&kde; developers don't test that case often), report it to http://bugs.kde.org and try running "tdeinit" before running &konqueror;, it usually helps.
This is of course the same for any other &kde; application. </para> This is of course the same for any other &kde; application. </para>
</answer> </answer>
</qandaentry> </qandaentry>

@ -10,5 +10,5 @@
################################################# #################################################
tde_create_handbook( tde_create_handbook(
FILES checkxrefs index.docbook kdeprintingglossary.docbook FILES checkxrefs index.docbook tdeprintingglossary.docbook
DESTINATION khelpcenter/glossary ) DESTINATION khelpcenter/glossary )

@ -2,7 +2,7 @@
<!DOCTYPE glossary PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ <!DOCTYPE glossary PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY % addindex "IGNORE"> <!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE"> <!ENTITY % English "INCLUDE">
<!ENTITY glossary-kdeprinting SYSTEM "kdeprintingglossary.docbook"> <!ENTITY glossary-tdeprinting SYSTEM "tdeprintingglossary.docbook">
]> ]>
@ -10,7 +10,7 @@
<glossary id="glossary"> <glossary id="glossary">
&glossary-kdeprinting; &glossary-tdeprinting;
<glossdiv id="glossdiv-technologies"> <glossdiv id="glossdiv-technologies">
<title>Technologies</title> <title>Technologies</title>

@ -5,7 +5,7 @@
"customization/dtd/kdex.dtd" [ "customization/dtd/kdex.dtd" [
<!ENTITY % addindex "IGNORE"> <!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE"> <!ENTITY % English "INCLUDE">
<!ENTITY glossary-kdeprinting SYSTEM "kdeprintingglossary.docbook"> <!ENTITY glossary-tdeprinting SYSTEM "tdeprintingglossary.docbook">
]> ]>
<glossary id="glossary"> <glossary id="glossary">
@ -170,7 +170,7 @@
<glossseealso otherterm="gloss-authentication">Authentication</glossseealso> <glossseealso otherterm="gloss-authentication">Authentication</glossseealso>
<glossseealso otherterm="gloss-bsdstyleprinting">BSD-style printing</glossseealso> <glossseealso otherterm="gloss-bsdstyleprinting">BSD-style printing</glossseealso>
<glossseealso otherterm="gloss-ipp">IPP</glossseealso> <glossseealso otherterm="gloss-ipp">IPP</glossseealso>
<glossseealso otherterm="gloss-kdeprint">KDEPrint</glossseealso> <glossseealso otherterm="gloss-tdeprint">KDEPrint</glossseealso>
<glossseealso otherterm="gloss-lprlpd">LPR/LPD</glossseealso> <glossseealso otherterm="gloss-lprlpd">LPR/LPD</glossseealso>
<glossseealso otherterm="gloss-ppd">PPD</glossseealso> <glossseealso otherterm="gloss-ppd">PPD</glossseealso>
</glossdef> </glossdef>
@ -184,7 +184,7 @@
is a valuable resource to answer many questions that anyone new to is a valuable resource to answer many questions that anyone new to
&CUPS; printing might have at first. &CUPS; printing might have at first.
</para> </para>
<glossseealso otherterm="gloss-kdeprinthandbook">KDEPrint Handbook</glossseealso> <glossseealso otherterm="gloss-tdeprinthandbook">KDEPrint Handbook</glossseealso>
</glossdef> </glossdef>
</glossentry> </glossentry>
@ -715,7 +715,7 @@ now.
</glossdef> </glossdef>
</glossentry> </glossentry>
<glossentry id="gloss-kdeprint"> <glossentry id="gloss-tdeprint">
<glossterm><acronym>KDEPrint</acronym></glossterm> <glossterm><acronym>KDEPrint</acronym></glossterm>
<glossdef><para>The new printing functionality of &kde; since version 2.2 <glossdef><para>The new printing functionality of &kde; since version 2.2
consists of several modules that translate the features and settings consists of several modules that translate the features and settings
@ -736,16 +736,16 @@ now.
<glossseealso otherterm="gloss-bsdstyleprinting">BSD-style printing</glossseealso> <glossseealso otherterm="gloss-bsdstyleprinting">BSD-style printing</glossseealso>
<glossseealso otherterm="gloss-cups">&CUPS;</glossseealso> <glossseealso otherterm="gloss-cups">&CUPS;</glossseealso>
<glossseealso otherterm="gloss-kprinter">kprinter</glossseealso> <glossseealso otherterm="gloss-kprinter">kprinter</glossseealso>
<glossseealso otherterm="gloss-kdeprinthandbook">KDEPrint Handbook</glossseealso> <glossseealso otherterm="gloss-tdeprinthandbook">KDEPrint Handbook</glossseealso>
</glossdef> </glossdef>
</glossentry> </glossentry>
<glossentry id="gloss-kdeprinthandbook"> <glossentry id="gloss-tdeprinthandbook">
<glossterm><acronym>KDEPrint Handbook...</acronym></glossterm> <glossterm><acronym>KDEPrint Handbook...</acronym></glossterm>
<glossdef><para>...is the name of the reference document that describes KDEPrint <glossdef><para>...is the name of the reference document that describes KDEPrint
functions to users and administrators. You can load it into Konqueror by functions to users and administrators. You can load it into Konqueror by
typing "help:/kdeprint" into the address field. The <ulink typing "help:/tdeprint" into the address field. The <ulink
url="http://printing.kde.org/">KDEPrint website</ulink> url="http://printing.kde.org/">KDEPrint website</ulink>
is the resource for updates to this documentation, as well as PDF is the resource for updates to this documentation, as well as PDF
versions suitable for printing it. It is authored and maintained by Kurt versions suitable for printing it. It is authored and maintained by Kurt
@ -1260,7 +1260,7 @@ now.
has an "Add Printer Wizard" to make RLPR usage even easier. has an "Add Printer Wizard" to make RLPR usage even easier.
The kprinter command allows switching to RLPR "on The kprinter command allows switching to RLPR "on
the fly" at any time.</para> the fly" at any time.</para>
<glossseealso otherterm="gloss-kdeprint">KDEPrint</glossseealso> <glossseealso otherterm="gloss-tdeprint">KDEPrint</glossseealso>
<glossseealso otherterm="gloss-kprinter">kprinter</glossseealso> <glossseealso otherterm="gloss-kprinter">kprinter</glossseealso>
<glossseealso otherterm="gloss-printcap">printcap</glossseealso> <glossseealso otherterm="gloss-printcap">printcap</glossseealso>
</glossdef> </glossdef>

@ -31,7 +31,7 @@
<title>Introduction</title> <title>Introduction</title>
<para>This module of the &kcontrol; gives you options for configuring the way in <para>This module of the &kcontrol; gives you options for configuring the way in
which the &kdesu; program treats passwords. &kdesu; will ask you for a password which the &tdesu; program treats passwords. &tdesu; will ask you for a password
when you try to carry out some privileged actions, such as changing the when you try to carry out some privileged actions, such as changing the
date/time stored in your system clock, or adding new users on your date/time stored in your system clock, or adding new users on your
computer.</para> computer.</para>
@ -69,7 +69,7 @@ choose a time period in minutes using the spinner labeled
and 1200 minutes, or use the arrows on the spinner.)</para> and 1200 minutes, or use the arrows on the spinner.)</para>
<para>If the <guilabel>Remember passwords</guilabel> option has been selected, <para>If the <guilabel>Remember passwords</guilabel> option has been selected,
<application>kdesu</application> will not ask you for a password for the length <application>tdesu</application> will not ask you for a password for the length
of time specified, after you have given the password once. Keep in mind, of time specified, after you have given the password once. Keep in mind,
however, that this makes your workstation less secure.</para> however, that this makes your workstation less secure.</para>

@ -9,4 +9,4 @@
# #
################################################# #################################################
tde_create_handbook( DESTINATION kdeprint ) tde_create_handbook( DESTINATION tdeprint )

@ -20,7 +20,7 @@ your box.</para>
change a setting. </para> change a setting. </para>
<screenshot> <screenshot>
<screeninfo>The &kdeprint; wizard introduction screen</screeninfo> <screeninfo>The &tdeprint; wizard introduction screen</screeninfo>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="cupsaddprinterwizard1.png" <imagedata fileref="cupsaddprinterwizard1.png"
@ -93,13 +93,13 @@ configure your network settings directly.</para>
decide which setting could be useful. </para> decide which setting could be useful. </para>
<screenshot> <screenshot>
<screeninfo>&kdeprint; wizard network scan</screeninfo> <screeninfo>&tdeprint; wizard network scan</screeninfo>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="cupsaddprinterwizard3_networkscan.png" <imagedata fileref="cupsaddprinterwizard3_networkscan.png"
format="PNG"/></imageobject> format="PNG"/></imageobject>
<textobject> <textobject>
<phrase>In the &kdeprint; wizard, you can enter network details <phrase>In the &tdeprint; wizard, you can enter network details
directly, or you can scan the network directly, or you can scan the network
automatically.</phrase></textobject> automatically.</phrase></textobject>
</mediaobject> </mediaobject>
@ -115,14 +115,14 @@ printer with &IPP;), you have an option for scanning the network. Be careful
when applying this; in some environments network scanning is considered when applying this; in some environments network scanning is considered
to be hostile and harmful!</para> to be hostile and harmful!</para>
<para>In the case of <acronym>SMB</acronym>, &kdeprint; will use the <para>In the case of <acronym>SMB</acronym>, &tdeprint; will use the
Samba utilities <command>nmblookup</command> and Samba utilities <command>nmblookup</command> and
<command>smbclient</command> (which need to be installed for this to <command>smbclient</command> (which need to be installed for this to
work) to retrieve the information it presents in a tree work) to retrieve the information it presents in a tree
structure.</para> structure.</para>
<para>In the case of &IPP; (Port 631) and <acronym>TCP</acronym> <para>In the case of &IPP; (Port 631) and <acronym>TCP</acronym>
Network/AppSocket (Port 9100) &kdeprint; will try to open the port and, Network/AppSocket (Port 9100) &tdeprint; will try to open the port and,
if successful, send an <command>ipp-get-printer-attribute</command> if successful, send an <command>ipp-get-printer-attribute</command>
request to the printer. For newer &HP; printers the latter usually request to the printer. For newer &HP; printers the latter usually
works, because they support both AppSocket and &IPP;.</para> works, because they support both AppSocket and &IPP;.</para>
@ -137,13 +137,13 @@ timeout to use.</para>
your network, if you use the scanning technique.</para> your network, if you use the scanning technique.</para>
<screenshot> <screenshot>
<screeninfo>&kdeprint; wizard network configuration dialog</screeninfo> <screeninfo>&tdeprint; wizard network configuration dialog</screeninfo>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="cupsaddprinterwizard4_networkscan_config.png" <imagedata fileref="cupsaddprinterwizard4_networkscan_config.png"
format="PNG"/></imageobject> format="PNG"/></imageobject>
<textobject> <textobject>
<phrase>In the &kdeprint; wizard, you can enter parameters to have the <phrase>In the &tdeprint; wizard, you can enter parameters to have the
wizard scan parts of your network.</phrase></textobject> wizard scan parts of your network.</phrase></textobject>
</mediaobject> </mediaobject>
</screenshot> </screenshot>
@ -163,7 +163,7 @@ first, then the device model in the right part. This split window shows
all &PPD;s found by &CUPS; in its standard repository of installable all &PPD;s found by &CUPS; in its standard repository of installable
&PPD;s. This repository normally is <filename &PPD;s. This repository normally is <filename
class="directory">/usr/share/cups/model/</filename>. If you want your class="directory">/usr/share/cups/model/</filename>. If you want your
driver to be found automatically by &CUPS; and &kdeprint;, place it in driver to be found automatically by &CUPS; and &tdeprint;, place it in
there.</para> there.</para>
<!-- Insert Screenshot here: --> <!-- Insert Screenshot here: -->
@ -215,7 +215,7 @@ url="http://www.linuxprinting.org">http://www.linuxprinting.org</ulink>
<para>And ask for help. At a later stage, a document detailing the <para>And ask for help. At a later stage, a document detailing the
differences between the different driver and &PPD; models will appear at differences between the different driver and &PPD; models will appear at
<ulink <ulink
url="http://kdeprint.sourceforge.net">http://kdeprint.sourceforge.net/</ulink> url="http://tdeprint.sourceforge.net">http://tdeprint.sourceforge.net/</ulink>
Watch out for this!</para> Watch out for this!</para>
<para>Via the <guibutton>Other...</guibutton> button you are able to <para>Via the <guibutton>Other...</guibutton> button you are able to

@ -15,7 +15,7 @@ configuration file for that daemon is normally located in
<acronym>ASCII</acronym> file with a syntax similar to the configuration <acronym>ASCII</acronym> file with a syntax similar to the configuration
file of the <application>Apache</application> web server. It is a good file of the <application>Apache</application> web server. It is a good
idea to create a backup copy, just in case something goes wrong with the idea to create a backup copy, just in case something goes wrong with the
configuration through &kdeprint;/&CUPS; Server Configuration configuration through &tdeprint;/&CUPS; Server Configuration
dialogs:</para> dialogs:</para>
<screen><userinput><command>cp</command> <filename>/etc/cups/cupsd.conf</filename> <filename>/etc/cups/cupsd.conf.bak</filename></userinput></screen> <screen><userinput><command>cp</command> <filename>/etc/cups/cupsd.conf</filename> <filename>/etc/cups/cupsd.conf.bak</filename></userinput></screen>
@ -52,7 +52,7 @@ class="directory">/usr/share/doc/cups/</filename> or
always refer to the original &CUPS; documentation. &CUPS; is, much like always refer to the original &CUPS; documentation. &CUPS; is, much like
&kde; in a rapid development process. There are constantly new features &kde; in a rapid development process. There are constantly new features
being added. New features might for times be only configurable by being added. New features might for times be only configurable by
directly editing the configuration files. The &kdeprint; &GUI; might not directly editing the configuration files. The &tdeprint; &GUI; might not
have caught up with &CUPS; development.</para> have caught up with &CUPS; development.</para>
<para>Just in case you want to look at the original configuration files <para>Just in case you want to look at the original configuration files
@ -198,12 +198,12 @@ http://www.linuxprinting.org/newsportal/</ulink></term>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
<para>And finally, there will be a WebSite for &kdeprint; and related <para>And finally, there will be a WebSite for &tdeprint; and related
documentation, at <ulink url="http://kdeprint.sourceforge.net/"> documentation, at <ulink url="http://tdeprint.sourceforge.net/">
http://kdeprint.sourceforge.net/</ulink></para> http://tdeprint.sourceforge.net/</ulink></para>
<para>In the next section I will step you through most of the <para>In the next section I will step you through most of the
configuration options of &kdeprint; with &CUPS;.</para> configuration options of &tdeprint; with &CUPS;.</para>
</sect1> </sect1>
<sect1 id="explaining-different-gui-elements"> <sect1 id="explaining-different-gui-elements">
@ -442,7 +442,7 @@ to. By default &CUPS; will use <quote>root@hostname</quote>.</para>
<note> <note>
<para>Contrary to what the quickhelp suggests, it is also legal to <para>Contrary to what the quickhelp suggests, it is also legal to
send an email full of praise and enthusiasm about &CUPS; and send an email full of praise and enthusiasm about &CUPS; and
&kdeprint; to the server administrator.</para> &tdeprint; to the server administrator.</para>
</note> </note>
</listitem> </listitem>
</varlistentry> </varlistentry>

@ -2,14 +2,14 @@
<title>&CUPS; options presently not available through &kcontrol;</title> <title>&CUPS; options presently not available through &kcontrol;</title>
<para>This chapter gives you some hints about further configuration <para>This chapter gives you some hints about further configuration
possibilities which may not be available through the &kdeprint; &GUI; possibilities which may not be available through the &tdeprint; &GUI;
interface to &CUPS;.</para> interface to &CUPS;.</para>
<sect1> <sect1>
<title>Overview of provided features</title> <title>Overview of provided features</title>
<para>All of the most often used features and functions &CUPS; provides <para>All of the most often used features and functions &CUPS; provides
are supported in &kdeprint;.</para> are supported in &tdeprint;.</para>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
@ -38,13 +38,13 @@ a start. There you find a link to locally available &CUPS; documentation
in <acronym>HTML</acronym> and <acronym>PDF</acronym> if you are new to in <acronym>HTML</acronym> and <acronym>PDF</acronym> if you are new to
&CUPS;.</para> &CUPS;.</para>
<para>&CUPS; is accessible through other means than &kdeprint;: <para>&CUPS; is accessible through other means than &tdeprint;:
commandline and browser are two native &CUPS; interfaces. The many commandline and browser are two native &CUPS; interfaces. The many
commandline utilities add up to the most complete control you have on commandline utilities add up to the most complete control you have on
&CUPS;. The web interface is only a subset of all available &CUPS;. The web interface is only a subset of all available
configuration or control options. </para> configuration or control options. </para>
<para>This is also true for &kdeprint;. Generally, as &CUPS; develops, <para>This is also true for &tdeprint;. Generally, as &CUPS; develops,
most new features will first be implemented through the commandline. Be most new features will first be implemented through the commandline. Be
sure to check the latest versions of the man pages for &CUPS; to stay sure to check the latest versions of the man pages for &CUPS; to stay
up-to-date with new features after you install a new version.</para> up-to-date with new features after you install a new version.</para>
@ -103,7 +103,7 @@ filter (1) - cups file conversion filter interfaces
</sect1> </sect1>
<sect1 id="tips-and-tricks-for-cups"> <sect1 id="tips-and-tricks-for-cups">
<title>Outside &kdeprint;: Hints &amp; Tips Tricks with &CUPS; on the <title>Outside &tdeprint;: Hints &amp; Tips Tricks with &CUPS; on the
Commandline</title> Commandline</title>
<para>Here are a few examples of options that are presently only <para>Here are a few examples of options that are presently only
@ -288,9 +288,9 @@ handy.</para>
</sect1> </sect1>
<sect1 id="troubleshooting-cups"> <sect1 id="troubleshooting-cups">
<title>Troubleshooting &CUPS; in &kdeprint;</title> <title>Troubleshooting &CUPS; in &tdeprint;</title>
<para>This section of the &kdeprint; Handbook will live from the <para>This section of the &tdeprint; Handbook will live from the
readers' feedback. Here is just a small beginning.</para> readers' feedback. Here is just a small beginning.</para>
<sect2> <sect2>
@ -587,7 +587,7 @@ with the name <systemitem class="resource">lp</systemitem>. Maybe
printers it sees on the network into a <quote>Class</quote> name lp. All printers it sees on the network into a <quote>Class</quote> name lp. All
jobs destined to lp are sent to this class and the first available jobs destined to lp are sent to this class and the first available
member prints it. So if you had this nice fellow (who listened closely member prints it. So if you had this nice fellow (who listened closely
when you raved about &CUPS; and &kdeprint;) install &CUPS; and poke when you raved about &CUPS; and &tdeprint;) install &CUPS; and poke
around the system...get the idea?</para> around the system...get the idea?</para>
<para>Take my advice: choose a unique name for any network printer! <para>Take my advice: choose a unique name for any network printer!

@ -1,5 +1,5 @@
<chapter id="extensions-to-all-printsubsystems"> <chapter id="extensions-to-all-printsubsystems">
<title>&kdeprint; Extensions To All Print Subsystems</title> <title>&tdeprint; Extensions To All Print Subsystems</title>
<sect1> <sect1>
<title><quote>Virtual</quote> Printers</title> <title><quote>Virtual</quote> Printers</title>

@ -72,7 +72,7 @@ community. Not least within the &kde; project... ;-)
<listitem> <listitem>
<para>Jean-Eric Cuendet for starting <application>kups</application> <para>Jean-Eric Cuendet for starting <application>kups</application>
and <application>qtcups</application>, the predecessors of and <application>qtcups</application>, the predecessors of
&kdeprint;</para> &tdeprint;</para>
</listitem> </listitem>
<listitem> <listitem>
<para>Michael Goffioul for doing all the hard work recently</para> <para>Michael Goffioul for doing all the hard work recently</para>
@ -101,14 +101,14 @@ writing</quote></para>
<sect1 id="caveats"> <sect1 id="caveats">
<title>Caveats</title> <title>Caveats</title>
<para>&kdeprint; has been developed on a system using &CUPS; 1.1.6. <para>&tdeprint; has been developed on a system using &CUPS; 1.1.6.
&kdeprint; has been tested on other versions of &CUPS; and so &tdeprint; has been tested on other versions of &CUPS; and so
far no incompatibilities are known. By the time of writing far no incompatibilities are known. By the time of writing
this Handbook, &CUPS; 1.1.9 is out with a few new features this Handbook, &CUPS; 1.1.9 is out with a few new features
not yet supported by &kdeprint;. Of course you are able to not yet supported by &tdeprint;. Of course you are able to
access these features, but you will need to bypass &kdeprint; access these features, but you will need to bypass &tdeprint;
and use the &CUPS; command-line tools or edit configuration and use the &CUPS; command-line tools or edit configuration
files manually. &kdeprint;'s development will go on and this files manually. &tdeprint;'s development will go on and this
Handbook strives to always be the best available user documentation Handbook strives to always be the best available user documentation
resource for it.</para> resource for it.</para>

@ -1,11 +1,11 @@
<chapter id="getting-started"> <chapter id="getting-started">
<title>Getting Started</title> <title>Getting Started</title>
<para>This chapter of the &kdeprint; Handbook will walk you through most <para>This chapter of the &tdeprint; Handbook will walk you through most
of the configuration or selection options of &kdeprint;. It will mainly of the configuration or selection options of &tdeprint;. It will mainly
deal with &CUPS; in this version, as the author is most familiar with deal with &CUPS; in this version, as the author is most familiar with
it, and also because &kdeprint; started off with supporting &CUPS; it, and also because &tdeprint; started off with supporting &CUPS;
best. Later versions of the &kdeprint; software and editions of this best. Later versions of the &tdeprint; software and editions of this
handbook will support and explore other printing handbook will support and explore other printing
systems more closely.</para> systems more closely.</para>
@ -13,7 +13,7 @@ systems more closely.</para>
<title>Selecting Your Print Subsystem</title> <title>Selecting Your Print Subsystem</title>
<para>You need to define your print subsystem, before you are able to <para>You need to define your print subsystem, before you are able to
install any printer with the &kdeprint; framework. There are two areas install any printer with the &tdeprint; framework. There are two areas
where you can define this: either in &kcontrol; (The <guilabel>Printing where you can define this: either in &kcontrol; (The <guilabel>Printing
Manager</guilabel> section), or directly and <quote>on the fly</quote> Manager</guilabel> section), or directly and <quote>on the fly</quote>
from the print dialog.</para> from the print dialog.</para>
@ -51,7 +51,7 @@ your box prior to your selection, or before it takes effect. <!-- The -->
<!-- authors personal recommendation is &CUPS; --> <!-- authors personal recommendation is &CUPS; -->
</para> </para>
<para>On it's first startup, &kdeprint; will try an autodetection. This <para>On it's first startup, &tdeprint; will try an autodetection. This
only works for:</para> only works for:</para>
<itemizedlist> <itemizedlist>
@ -78,13 +78,13 @@ your selection. The author's personal recommendation is
subsystem will take effect for all &kde; applications. Different subsystem will take effect for all &kde; applications. Different
users may have different print subsystems in use, if those do exist on users may have different print subsystems in use, if those do exist on
the computer and are compliant with each other. Their settings are the computer and are compliant with each other. Their settings are
stored in the <filename>kdeprintrc</filename>. This file is unique to stored in the <filename>tdeprintrc</filename>. This file is unique to
every user, and is normally installed in every user, and is normally installed in
<filename>$<envar>HOME</envar>/.kde/share/config/kdeprintrc</filename>.</para> <filename>$<envar>HOME</envar>/.kde/share/config/tdeprintrc</filename>.</para>
<warning> <warning>
<para>This file is not intended to be directly editable, and all <para>This file is not intended to be directly editable, and all
available options can be set from the &kdeprint; &GUI;.</para> available options can be set from the &tdeprint; &GUI;.</para>
</warning> </warning>
<para>You may even select a different printer subsystem, on the fly, from <para>You may even select a different printer subsystem, on the fly, from
@ -97,7 +97,7 @@ the &kprinter; dialog box.</para>
<para>Once you have chosen your preferred and installed print subsystem, <para>Once you have chosen your preferred and installed print subsystem,
you are ready to investigate, configure administer and work with this you are ready to investigate, configure administer and work with this
system through the &kdeprint; framework.</para> system through the &tdeprint; framework.</para>
<para>Navigate to <menuchoice><guimenu>K Menu</guimenu> <para>Navigate to <menuchoice><guimenu>K Menu</guimenu>
<guisubmenu>Preferences</guisubmenu> <guisubmenu>System</guisubmenu> <guisubmenu>Preferences</guisubmenu> <guisubmenu>System</guisubmenu>
@ -131,10 +131,10 @@ choices at your fingertips than with any other printing
system. &CUPS; is new to most Linux users (even the senior system. &CUPS; is new to most Linux users (even the senior
hackers amongst us), and it is quite easy to use. But it hackers amongst us), and it is quite easy to use. But it
is at the same time very different from other printing systems. is at the same time very different from other printing systems.
Therfor the &CUPS; part in the &kdeprint; Handbook is naturally Therfor the &CUPS; part in the &tdeprint; Handbook is naturally
the most detailed. the most detailed.
Future editions of the &kdeprint; handbook will describe in Future editions of the &tdeprint; handbook will describe in
more detail the other systems. more detail the other systems.
--> -->

@ -1,19 +1,19 @@
<chapter id="kdeprint-highlights"> <chapter id="tdeprint-highlights">
<title>&kdeprint;'s Highlights</title> <title>&tdeprint;'s Highlights</title>
<para>The new &kdeprint; system includes more than one highlight. <para>The new &tdeprint; system includes more than one highlight.
Having worked in an environment in the past that is not exactly Having worked in an environment in the past that is not exactly
sophisticated, as far as printing is concerned, take a look at some of sophisticated, as far as printing is concerned, take a look at some of
the benefits that come with &kdeprint;</para> the benefits that come with &tdeprint;</para>
<sect1 id="add-printer-wizard"> <sect1 id="add-printer-wizard">
<title>The <quote>Add Printer</quote> Wizard</title> <title>The <quote>Add Printer</quote> Wizard</title>
<para>&kdeprint; has an <quote>Add Printer Wizard</quote>. The Add <para>&tdeprint; has an <quote>Add Printer Wizard</quote>. The Add
Printer Wizard helps you with adding and configuring a new printer. Of Printer Wizard helps you with adding and configuring a new printer. Of
course, you may do this manually as well.</para> course, you may do this manually as well.</para>
<para>&kdeprint; helps you <quote>discover</quote> printers. It is able <para>&tdeprint; helps you <quote>discover</quote> printers. It is able
to scan the environment for available devices and queues. This works for to scan the environment for available devices and queues. This works for
network connections using <acronym>TCP</acronym> (AppSocket, network connections using <acronym>TCP</acronym> (AppSocket,
<acronym>aka</acronym> &HP; <trademark <acronym>aka</acronym> &HP; <trademark
@ -67,22 +67,22 @@ subsystem.</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
<para>A screenshot of the &kdeprint; PrintJob Viewer shows the information <para>A screenshot of the &tdeprint; PrintJob Viewer shows the information
you get: Job-ID, target printer, job name, job owner, job status and job you get: Job-ID, target printer, job name, job owner, job status and job
size. In the next &kdeprint; release you will also see information about the size. In the next &tdeprint; release you will also see information about the
number of pages (as &CUPS; calculates it; see chapter on page accounting number of pages (as &CUPS; calculates it; see chapter on page accounting
for more information about its merits and limitations).</para> for more information about its merits and limitations).</para>
<screenshot> <screenshot>
<screeninfo>A screenshot of the &kdeprint; PrintJob Viewer</screeninfo> <screeninfo>A screenshot of the &tdeprint; PrintJob Viewer</screeninfo>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="kdeprint-jobviewer.png" format="PNG"/> <imagedata fileref="tdeprint-jobviewer.png" format="PNG"/>
</imageobject> </imageobject>
<textobject> <textobject>
<phrase>Here's a screenshot of the &kdeprint; PrintJob Viewer.</phrase> <phrase>Here's a screenshot of the &tdeprint; PrintJob Viewer.</phrase>
</textobject> </textobject>
<caption><para>A screenshot of the &kdeprint; PrintJob <caption><para>A screenshot of the &tdeprint; PrintJob
Viewer.</para></caption> Viewer.</para></caption>
</mediaobject> </mediaobject>
</screenshot> </screenshot>
@ -106,7 +106,7 @@ to see this:</para>
<imagedata fileref="kcontrolcenter-printmanager-jobcontrol-2.png" format="PNG"/> <imagedata fileref="kcontrolcenter-printmanager-jobcontrol-2.png" format="PNG"/>
</imageobject> </imageobject>
<textobject> <textobject>
<phrase>Here's a screenshot of the &kdeprint; PrintJob Viewer.</phrase> <phrase>Here's a screenshot of the &tdeprint; PrintJob Viewer.</phrase>
</textobject> </textobject>
</mediaobject> </mediaobject>
</screenshot> </screenshot>
@ -116,7 +116,7 @@ to see this:</para>
<sect1 id="modules-for-different-subsystems"> <sect1 id="modules-for-different-subsystems">
<title>Modules for different print subsystems</title> <title>Modules for different print subsystems</title>
<para>&kdeprint; uses different modules to realize the interface to the <para>&tdeprint; uses different modules to realize the interface to the
possible print subsystems. Not all the modules are yet developed fully, possible print subsystems. Not all the modules are yet developed fully,
but you will have basic printing functionality with:</para> but you will have basic printing functionality with:</para>
@ -142,7 +142,7 @@ Modules for other print subsystems, such as <acronym>PLP</acronym>,
<acronym>PPR</acronym> and <acronym>PDQ</acronym> may be available <acronym>PPR</acronym> and <acronym>PDQ</acronym> may be available
later.</para> later.</para>
<para>&kdeprint; makes &kde; much more flexible. It gives freedom of <para>&tdeprint; makes &kde; much more flexible. It gives freedom of
choice to &kde; 2.2 users. To use different available print subsystems, choice to &kde; 2.2 users. To use different available print subsystems,
these must, of course, be installed independently from &kde;. In these must, of course, be installed independently from &kde;. In
former versions, users were stuck with the old <acronym>LPD</acronym> former versions, users were stuck with the old <acronym>LPD</acronym>
@ -152,19 +152,19 @@ appear on the scene.</para>
</sect1> </sect1>
<sect1 id="kdeprint-goodies"> <sect1 id="tdeprint-goodies">
<title>More &kdeprint; <quote>Goodies</quote></title> <title>More &tdeprint; <quote>Goodies</quote></title>
<subtitle>Benefitting all Print SubSystems.</subtitle> <subtitle>Benefitting all Print SubSystems.</subtitle>
<para>Some specific features of &kdeprint; depend on the chosen print <para>Some specific features of &tdeprint; depend on the chosen print
subsystem. This dependency might exist because those features are only subsystem. This dependency might exist because those features are only
implemented there; remember, &kdeprint; is an intermediate layer between implemented there; remember, &tdeprint; is an intermediate layer between
&kde; applications, and the print subsystem, but it's no replacement for &kde; applications, and the print subsystem, but it's no replacement for
any print subsystem by itself. Such dependency may exist for another any print subsystem by itself. Such dependency may exist for another
reason: that &kdeprint; has not yet implemented an interface to all the reason: that &tdeprint; has not yet implemented an interface to all the
features of all the subsystems.</para> features of all the subsystems.</para>
<para>Other features include benefits from &kdeprint; that are <para>Other features include benefits from &tdeprint; that are
independent of the chosen print subsystem, and are available with all of independent of the chosen print subsystem, and are available with all of
them. At present there are <quote>special</quote> or them. At present there are <quote>special</quote> or
<quote>virtual</quote> printers, and some generic <quote>virtual</quote> printers, and some generic
@ -183,7 +183,7 @@ displaying on screen using &kghostview;.</para>
<varlistentry> <varlistentry>
<term><guilabel>Special Printers</guilabel></term> <term><guilabel>Special Printers</guilabel></term>
<listitem> <listitem>
<para>Amongst these additional &kdeprint; features are a few <para>Amongst these additional &tdeprint; features are a few
<quote>special</quote> or <quote>virtual</quote> printers:</para> <quote>special</quote> or <quote>virtual</quote> printers:</para>
<para>These special printers may:</para> <para>These special printers may:</para>
@ -232,7 +232,7 @@ configurable on a per-user basis.</para>
<varlistentry> <varlistentry>
<term><guilabel>Generic Pre-Filtering</guilabel></term> <term><guilabel>Generic Pre-Filtering</guilabel></term>
<listitem> <listitem>
<para>&kdeprint; provides you with a framework to define and configure <para>&tdeprint; provides you with a framework to define and configure
your own <quote>pre-filters</quote>. These pre-filters may take effect your own <quote>pre-filters</quote>. These pre-filters may take effect
<emphasis>before</emphasis> they are passed to your print subsystem for <emphasis>before</emphasis> they are passed to your print subsystem for
further processing, but <emphasis>after</emphasis> the (&PostScript;, further processing, but <emphasis>after</emphasis> the (&PostScript;,
@ -264,13 +264,13 @@ any one of those formats.</para>
This makes an extension of the concept very easy for experienced developers, This makes an extension of the concept very easy for experienced developers,
but end-user configuration is also done through an intuitive graphical but end-user configuration is also done through an intuitive graphical
user interface. So, fear not, you don't need to learn user interface. So, fear not, you don't need to learn
<acronym>XML</acronym> because of &kdeprint;!</para> <acronym>XML</acronym> because of &tdeprint;!</para>
<variablelist> <variablelist>
<varlistentry> <varlistentry>
<term><guilabel>Multiple Pages Per Sheet Filter</guilabel></term> <term><guilabel>Multiple Pages Per Sheet Filter</guilabel></term>
<listitem> <listitem>
<para>This is a predefined filter that installs with &kdeprint;. It <para>This is a predefined filter that installs with &tdeprint;. It
allows you to create a modified &PostScript; output, from &PostScript; allows you to create a modified &PostScript; output, from &PostScript;
input, that prints 1, 2, or 4 logical pages on a single sheet of input, that prints 1, 2, or 4 logical pages on a single sheet of
paper.</para> paper.</para>
@ -280,7 +280,7 @@ paper.</para>
<varlistentry> <varlistentry>
<term><guilabel>Enscript Text Filter</guilabel></term> <term><guilabel>Enscript Text Filter</guilabel></term>
<listitem> <listitem>
<para>This is a predefined filter that installs with &kdeprint;. It <para>This is a predefined filter that installs with &tdeprint;. It
allows you to create &PostScript; output from any text file input, that allows you to create &PostScript; output from any text file input, that
includes syntax highlighting for program listings, pretty-printing, and includes syntax highlighting for program listings, pretty-printing, and
nice configurable page frames and headers.</para> nice configurable page frames and headers.</para>
@ -315,9 +315,9 @@ side. These can then be folded to make a pamphlet.</para>
</variablelist> </variablelist>
</sect1> </sect1>
<sect1 id="cups-plugin"> <sect1 id="cups-plugin">
<title>&CUPS; Support: the Most Important Module in &kdeprint;</title> <title>&CUPS; Support: the Most Important Module in &tdeprint;</title>
<para>&kdeprint; contains a module for &CUPS;. &CUPS;, the <para>&tdeprint; contains a module for &CUPS;. &CUPS;, the
<quote>Common &UNIX; Printing System</quote> (<ulink <quote>Common &UNIX; Printing System</quote> (<ulink
url="http://www.cups.org">http://www.cups.org/</ulink>), is the most url="http://www.cups.org">http://www.cups.org/</ulink>), is the most
advanced, powerful and flexible of all print subsystems on &UNIX; and advanced, powerful and flexible of all print subsystems on &UNIX; and
@ -325,7 +325,7 @@ other &UNIX;-like operating systems. It is still quite new on the
horizon, but is based on <acronym>IPP</acronym>, the Internet Printing horizon, but is based on <acronym>IPP</acronym>, the Internet Printing
Protocol, the newly emerging standard for the future of network Protocol, the newly emerging standard for the future of network
printing. &CUPS; is clearly the print system of choice for Michael printing. &CUPS; is clearly the print system of choice for Michael
Goffioul, the principal &kdeprint; developer.</para> Goffioul, the principal &tdeprint; developer.</para>
<para>Experienced &kde; users may already be familiar with Michael's <para>Experienced &kde; users may already be familiar with Michael's
utilities <application>qtcups</application> and utilities <application>qtcups</application> and
@ -360,9 +360,9 @@ restart it.</para>
</sect2> </sect2>
<sect2> <sect2>
<title>&kdeprint; &mdash; The Heir</title> <title>&tdeprint; &mdash; The Heir</title>
<para>The &CUPS; Module in &kdeprint; now contains all (and more) <para>The &CUPS; Module in &tdeprint; now contains all (and more)
functions that were provided by <application>qtcups</application> and functions that were provided by <application>qtcups</application> and
<application>kups</application> in former &kde; versions.</para> <application>kups</application> in former &kde; versions.</para>
@ -372,7 +372,7 @@ functions that were provided by <application>qtcups</application> and
<command>kcmshell printers</command> from now on. <command>kcmshell printers</command> from now on.
</para> </para>
<para>The &kdeprint; module for &CUPS; also lets you fully administer <para>The &tdeprint; module for &CUPS; also lets you fully administer
the print subsystem, just like <application>kups</application> did the print subsystem, just like <application>kups</application> did
before. It can start, stop and configure your &CUPS; daemon. It can also before. It can start, stop and configure your &CUPS; daemon. It can also
start, stop, add and delete <quote>printers</quote> (&ie; printer start, stop, add and delete <quote>printers</quote> (&ie; printer
@ -385,7 +385,7 @@ different default setting of print options.</para>
<sect2> <sect2>
<title>&kprinter; &mdash; Graphical Print Command</title> <title>&kprinter; &mdash; Graphical Print Command</title>
<para>&kdeprint;'s &CUPS; module gives you access to a <quote>graphical <para>&tdeprint;'s &CUPS; module gives you access to a <quote>graphical
print command</quote>, like <application>qtcups</application> did print command</quote>, like <application>qtcups</application> did
before.</para> before.</para>
@ -469,16 +469,16 @@ for you. Read more about this in <xref linkend="ppd-files"/>.</para>
<title>Plans for Future Development</title> <title>Plans for Future Development</title>
<para>What you have now is the first, already very feature-rich <para>What you have now is the first, already very feature-rich
version of &kdeprint;. This version is, of course, fully usable for version of &tdeprint;. This version is, of course, fully usable for
printing. You might even think that <quote>it was never so printing. You might even think that <quote>it was never so
easy</quote> (not even back in the days when you had to use easy</quote> (not even back in the days when you had to use
&Microsoft; &Windows;).</para> &Microsoft; &Windows;).</para>
<para> In the future, &kdeprint; will become even better. It will do a <para> In the future, &tdeprint; will become even better. It will do a
better job of <quote>detecting</quote> your installed print subsystem better job of <quote>detecting</quote> your installed print subsystem
itself. Already &kdeprint; is doing quite well in automatically itself. Already &tdeprint; is doing quite well in automatically
sensing if you have &CUPS; on your system. But in many cases you will sensing if you have &CUPS; on your system. But in many cases you will
have to tell &kdeprint; what you are using, if you want to keep a have to tell &tdeprint; what you are using, if you want to keep a
legacy print system.</para> legacy print system.</para>
<para>The most important improvement in the near future will be a <para>The most important improvement in the near future will be a
@ -511,7 +511,7 @@ a virtual folder to the services section of the &konqueror; navigation
panel, giving a nice integrated way to browse and manage your print panel, giving a nice integrated way to browse and manage your print
system via the &URL; <userinput>print:/manager</userinput>.</para> system via the &URL; <userinput>print:/manager</userinput>.</para>
<para>Please contact Michael Goffioul at <email>kdeprint@swing.be</email> <para>Please contact Michael Goffioul at <email>tdeprint@swing.be</email>
with any further user or developer suggestions.</para> with any further user or developer suggestions.</para>
</sect1> </sect1>

@ -20,7 +20,7 @@
<!ENTITY external-command-doc SYSTEM "external-command.docbook"> <!ENTITY external-command-doc SYSTEM "external-command.docbook">
<!ENTITY extensions-doc SYSTEM "extensions.docbook"> <!ENTITY extensions-doc SYSTEM "extensions.docbook">
<!ENTITY final-word-doc SYSTEM "final-word.docbook"> <!ENTITY final-word-doc SYSTEM "final-word.docbook">
<!ENTITY kappname "&kdeprint;"><!-- replace kapp here --> <!ENTITY kappname "&tdeprint;"><!-- replace kapp here -->
<!ENTITY % addindex "IGNORE"> <!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE"><!-- change language only here --> <!ENTITY % English "INCLUDE"><!-- change language only here -->
]> ]>
@ -28,7 +28,7 @@
<book lang="&language;"> <book lang="&language;">
<bookinfo> <bookinfo>
<title>The &kdeprint; Handbook</title> <title>The &tdeprint; Handbook</title>
<authorgroup> <authorgroup>
<author> <author>
@ -43,7 +43,7 @@
<firstname>Michael</firstname> <firstname>Michael</firstname>
<surname>Goffioul</surname> <surname>Goffioul</surname>
<affiliation> <affiliation>
<address><email>kdeprint@swing.be</email></address> <address><email>tdeprint@swing.be</email></address>
</affiliation> </affiliation>
<contrib>Developer</contrib> <contrib>Developer</contrib>
</othercredit> </othercredit>
@ -72,8 +72,8 @@
<releaseinfo>1.00.04</releaseinfo> <releaseinfo>1.00.04</releaseinfo>
<abstract> <abstract>
<para>This handbook describes &kdeprint;. &kdeprint; is not a standalone <para>This handbook describes &tdeprint;. &tdeprint; is not a standalone
program. It is the new printing framework for &kde; 2.2. &kdeprint; program. It is the new printing framework for &kde; 2.2. &tdeprint;
is an intermediate layer between &kde; (or other) applications and the selected is an intermediate layer between &kde; (or other) applications and the selected
(and installed) print subsystem of your OS (&OS;).</para> (and installed) print subsystem of your OS (&OS;).</para>
</abstract> </abstract>
@ -81,7 +81,7 @@ is an intermediate layer between &kde; (or other) applications and the selected
<keywordset> <keywordset>
<keyword>KDE</keyword> <keyword>KDE</keyword>
<keyword>kdebase</keyword> <keyword>kdebase</keyword>
<keyword>kdeprint</keyword> <keyword>tdeprint</keyword>
<keyword>print</keyword> <keyword>print</keyword>
<keyword>printing</keyword> <keyword>printing</keyword>
<keyword>CUPS</keyword> <keyword>CUPS</keyword>
@ -93,8 +93,8 @@ is an intermediate layer between &kde; (or other) applications and the selected
<chapter id="introduction"> <chapter id="introduction">
<title>Introduction</title> <title>Introduction</title>
<para>This handbook describes &kdeprint;. &kdeprint; is not a standalone <para>This handbook describes &tdeprint;. &tdeprint; is not a standalone
program. It is the new printing framework for &kde; 2.2. &kdeprint; program. It is the new printing framework for &kde; 2.2. &tdeprint;
is an intermediate layer between &kde; (or other) applications and the selected is an intermediate layer between &kde; (or other) applications and the selected
(and installed) print subsystem of your OS (&OS;).</para> (and installed) print subsystem of your OS (&OS;).</para>
@ -104,7 +104,7 @@ printing system. At the time of writing, &CUPS; is the best supported
printing subsystem, and it is the best documented.</para> printing subsystem, and it is the best documented.</para>
<para>This handbook is a work in progress, and later versions of the <para>This handbook is a work in progress, and later versions of the
&kdeprint; software and editions of this handbook will support and &tdeprint; software and editions of this handbook will support and
explore more closely other printing systems.</para> explore more closely other printing systems.</para>
<para>In the meantime, even if your printing subsystem is not yet well <para>In the meantime, even if your printing subsystem is not yet well
@ -123,7 +123,7 @@ subsystem you use.</para>
<para>To configure your printing subsystem from &kcontrol;, go to <para>To configure your printing subsystem from &kcontrol;, go to
<menuchoice><guilabel>System</guilabel><guilabel>Printing <menuchoice><guilabel>System</guilabel><guilabel>Printing
Manager</guilabel></menuchoice> and select your subsystem. Or you can Manager</guilabel></menuchoice> and select your subsystem. Or you can
let &kdeprint; try to determine it... </para> let &tdeprint; try to determine it... </para>
<screenshot> <screenshot>
<screeninfo>&CUPS; Printing Manager dialog: overview via &kcontrol;</screeninfo> <screeninfo>&CUPS; Printing Manager dialog: overview via &kcontrol;</screeninfo>
@ -173,8 +173,8 @@ settings</phrase></textobject>
<chapter id="credits-and-license"> <chapter id="credits-and-license">
<title>Credits And Licenses</title> <title>Credits And Licenses</title>
<para>&kdeprint; copyright 2001, Michael Goffioul <para>&tdeprint; copyright 2001, Michael Goffioul
<email>kdeprint@swing.be</email></para> <email>tdeprint@swing.be</email></para>
&underGPL; &underGPL;
<para>Documentation copyright 2001, Kurt Pfeifle, <para>Documentation copyright 2001, Kurt Pfeifle,

@ -1,7 +1,7 @@
<chapter id="lprng-module"> <chapter id="lprng-module">
<title><application>LPRng</application></title> <title><application>LPRng</application></title>
<para>An <application>LPRng</application> module for &kdeprint; is in <para>An <application>LPRng</application> module for &tdeprint; is in
development, and hopefully available for the &kde; 2.3 release.</para> development, and hopefully available for the &kde; 2.3 release.</para>
</chapter> </chapter>

@ -1,25 +1,25 @@
<chapter id="technical-overview"> <chapter id="technical-overview">
<title>Technical Overview</title> <title>Technical Overview</title>
<para>This chapter aims to give a technical overview of &kdeprint; which <para>This chapter aims to give a technical overview of &tdeprint; which
non-programmers can comprehend.</para> non-programmers can comprehend.</para>
<para>&kdeprint; is a new and revolutionary tool to give easy access to <para>&tdeprint; is a new and revolutionary tool to give easy access to
printing services for both &kde; users and &kde; developers.</para> printing services for both &kde; users and &kde; developers.</para>
<sect1 id="brief-description"> <sect1 id="brief-description">
<title>A Brief Description of &kdeprint;</title> <title>A Brief Description of &tdeprint;</title>
<para>You can access the functions of &kdeprint; in different ways: <para>You can access the functions of &tdeprint; in different ways:
through the Printing Manger in the &kcontrol;, through the through the Printing Manger in the &kcontrol;, through the
<command>kprinter</command> command or through the dialog that pops up <command>kprinter</command> command or through the dialog that pops up
if you want to print.</para> if you want to print.</para>
<sect2 id="what-kdeprint-is-not"> <sect2 id="what-tdeprint-is-not">
<title>What it is <emphasis>not</emphasis></title> <title>What it is <emphasis>not</emphasis></title>
<para>&kdeprint; is <emphasis>not</emphasis> a replacement for the <para>&tdeprint; is <emphasis>not</emphasis> a replacement for the
printing subsystem itself. &kdeprint; does <emphasis>not</emphasis> printing subsystem itself. &tdeprint; does <emphasis>not</emphasis>
therefore give provision for spooling, and it does therefore give provision for spooling, and it does
<emphasis>not</emphasis> do the basic processing of &PostScript; or <emphasis>not</emphasis> do the basic processing of &PostScript; or
other print data.</para> other print data.</para>
@ -28,15 +28,15 @@ other print data.</para>
<sect2 id="what-kde-print-is"> <sect2 id="what-kde-print-is">
<title>What it <emphasis>is</emphasis></title> <title>What it <emphasis>is</emphasis></title>
<para>&kdeprint; is an intermediate layer between the spooling and the <para>&tdeprint; is an intermediate layer between the spooling and the
data processing print subsystem (as installed), and the application that data processing print subsystem (as installed), and the application that
seeks to print. &kdeprint; provides a common interface for &kde; seeks to print. &tdeprint; provides a common interface for &kde;
developers and &kde; users, to various supported print subsystems. At developers and &kde; users, to various supported print subsystems. At
the same time, it is customizable, and highly configurable.</para> the same time, it is customizable, and highly configurable.</para>
<para>&kdeprint; is easy to use for both &kde; developers and end-users. <para>&tdeprint; is easy to use for both &kde; developers and end-users.
Developers can port their applications, with minimal changes, to use Developers can port their applications, with minimal changes, to use
&kdeprint; instead of the old &Qt; print <quote>system</quote>. Users &tdeprint; instead of the old &Qt; print <quote>system</quote>. Users
can easily choose and configure their print subsystem.</para> can easily choose and configure their print subsystem.</para>
<para>For a reference to new &kde; users: &Qt; is the basic library and <para>For a reference to new &kde; users: &Qt; is the basic library and
@ -48,24 +48,24 @@ developed by TrollTech, a Norwegian software company.</para>
</sect1> </sect1>
<sect1 id="different-users"> <sect1 id="different-users">
<title>&kdeprint; -- Different Usage for Different People</title> <title>&tdeprint; -- Different Usage for Different People</title>
<para>&kdeprint; has different faces for different people.</para> <para>&tdeprint; has different faces for different people.</para>
<sect2 id="what-users-can-do"> <sect2 id="what-users-can-do">
<title>What users and administrators can do with &kdeprint;</title> <title>What users and administrators can do with &tdeprint;</title>
<para>&kdeprint; allows users and/or administrators, depending on their <para>&tdeprint; allows users and/or administrators, depending on their
rights, access to printing subsystems (&CUPS;, <acronym>LPD</acronym>, rights, access to printing subsystems (&CUPS;, <acronym>LPD</acronym>,
<acronym>RLPR</acronym>, <application>LPRng</application>, <acronym>RLPR</acronym>, <application>LPRng</application>,
<application>PDQ</application> &etc;) through a &kde; graphical user <application>PDQ</application> &etc;) through a &kde; graphical user
interface (&GUI;). Using &kdeprint;, they can print, administer jobs, interface (&GUI;). Using &tdeprint;, they can print, administer jobs,
printers and the printing daemon, all in a comfortable manner.</para> printers and the printing daemon, all in a comfortable manner.</para>
<para>Experienced users will like the capability to plug any working <para>Experienced users will like the capability to plug any working
filter for the print data between the output of their application and filter for the print data between the output of their application and
the input, into the chosen print subsystem. Some examples for this the input, into the chosen print subsystem. Some examples for this
already ship with <quote>plain vanilla</quote> &kdeprint;. Read already ship with <quote>plain vanilla</quote> &tdeprint;. Read
on.</para> on.</para>
</sect2> </sect2>
@ -80,34 +80,34 @@ service was provided by the <classname>QPrinter</classname> class, a
library function of the &Qt; Toolkit. The library function of the &Qt; Toolkit. The
<classname>QPrinter</classname> class relied on the out-moded <classname>QPrinter</classname> class relied on the out-moded
<quote>Line Printer Daemon</quote> (<acronym>LPD</acronym>). The <quote>Line Printer Daemon</quote> (<acronym>LPD</acronym>). The
&kdeprint; library bases itself firmly on the more modern Common &UNIX; &tdeprint; library bases itself firmly on the more modern Common &UNIX;
Printing System (&CUPS;), while at the same time keeping backward Printing System (&CUPS;), while at the same time keeping backward
compatibility with <acronym>LPD</acronym> and other legacy, or less compatibility with <acronym>LPD</acronym> and other legacy, or less
elaborate, print systems. It also <quote>leaves the door open</quote> elaborate, print systems. It also <quote>leaves the door open</quote>
for any new development that might occur.</para> for any new development that might occur.</para>
<para>For &kde; developers to use the new &kdeprint; class in their <para>For &kde; developers to use the new &tdeprint; class in their
applications, they require only minimal changes to their code: for every applications, they require only minimal changes to their code: for every
call of <classname>QPrinter</classname>, they just need to change this to call of <classname>QPrinter</classname>, they just need to change this to
<classname>KPrinter</classname>. Replacing one (!) letter in a few <classname>KPrinter</classname>. Replacing one (!) letter in a few
spots, and automatically they are done; their application can then use spots, and automatically they are done; their application can then use
all of the features of the new &kdeprint; library.</para> all of the features of the new &tdeprint; library.</para>
<para>More ambitious developers, or ones with special requirements, can <para>More ambitious developers, or ones with special requirements, can
do more: despite &kdeprint;'s feature-rich framework, they are still able do more: despite &tdeprint;'s feature-rich framework, they are still able
to customize the print dialog of their application to customize the print dialog of their application
by creating an additional <quote>Tab</quote>, where their by creating an additional <quote>Tab</quote>, where their
extensions to the standard &kdeprint; will feel right at home.</para> extensions to the standard &tdeprint; will feel right at home.</para>
<para>This last mentioned feature has not been used widely inside <para>This last mentioned feature has not been used widely inside
&kde; so far, as developers are not yet fully aware of &kdeprint;'s &kde; so far, as developers are not yet fully aware of &tdeprint;'s
power. Expect more of this in the near future. One example I power. Expect more of this in the near future. One example I
discovered is the &kcron; application. It lets you edit the crontab discovered is the &kcron; application. It lets you edit the crontab
through a &GUI;. The developers have implemented a printing feature through a &GUI;. The developers have implemented a printing feature
that lets you (or <systemitem class="username">root</systemitem>) that lets you (or <systemitem class="username">root</systemitem>)
choose if you want to print the whole of crontab (for all users) or choose if you want to print the whole of crontab (for all users) or
just the part that is marked. You can see the effects on &kdeprint; just the part that is marked. You can see the effects on &tdeprint;
in the following screenshots.</para> in the following screenshots.</para>
<para>This shot shows a sample from the &kcron; utility. <para>This shot shows a sample from the &kcron; utility.
@ -127,22 +127,22 @@ cron table or just the marked part of it.</phrase></textobject>
<para>The dialog to configure &kcron;'s printing options: the <para>The dialog to configure &kcron;'s printing options: the
additional tab titled <guilabel>Cron Options</guilabel> is from inside additional tab titled <guilabel>Cron Options</guilabel> is from inside
&kcron;, not &kdeprint;; it is a special extension added by the &kcron;, not &tdeprint;; it is a special extension added by the
&kcron; developers for printing purposes, not originating from, but &kcron; developers for printing purposes, not originating from, but
executed by &kdeprint;. Developers of other applications are free executed by &tdeprint;. Developers of other applications are free
to implement their own goodies, if they feel need for it.</para> to implement their own goodies, if they feel need for it.</para>
<screenshot> <screenshot>
<screeninfo>&kcron;'s addition to the &kdeprint; dialog.</screeninfo> <screeninfo>&kcron;'s addition to the &tdeprint; dialog.</screeninfo>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata fileref="kprinter_with_kcron_developer_special.png" <imagedata fileref="kprinter_with_kcron_developer_special.png"
format="PNG"/></imageobject> format="PNG"/></imageobject>
<textobject> <textobject>
<phrase>&kcron;'s addition to the &kdeprint; dialog.</phrase></textobject> <phrase>&kcron;'s addition to the &tdeprint; dialog.</phrase></textobject>
<caption> <caption>
<para>&kcron;'s addition to the &kdeprint; dialog.</para> <para>&kcron;'s addition to the &tdeprint; dialog.</para>
</caption> </caption>
</mediaobject> </mediaobject>
</screenshot> </screenshot>
@ -150,9 +150,9 @@ format="PNG"/></imageobject>
</sect2> </sect2>
<sect2> <sect2>
<title>What &kdeprint; offers to everybody...</title> <title>What &tdeprint; offers to everybody...</title>
<para>&kdeprint;'s easy-to-use interface for all supported print subsystems <para>&tdeprint;'s easy-to-use interface for all supported print subsystems
of course does not eliminate basic traditional weaknesses of some of of course does not eliminate basic traditional weaknesses of some of
those systems. But it smooths some rough edges. Different users may use those systems. But it smooths some rough edges. Different users may use
different printing systems on the same box. A user is free to even different printing systems on the same box. A user is free to even
@ -169,7 +169,7 @@ working remotely over any distance (like every TCP/IP based protocol),
<acronym>LPD</acronym> lacks bi-directional communication, <acronym>LPD</acronym> lacks bi-directional communication,
authentication, access control and encryption support.</para> authentication, access control and encryption support.</para>
<para>&kdeprint; can use &CUPS; to support:</para> <para>&tdeprint; can use &CUPS; to support:</para>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
@ -188,14 +188,14 @@ eavesdropping, or at least make it much more difficult.</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
<para>This makes &kdeprint; a much more robust and reliable solution <para>This makes &tdeprint; a much more robust and reliable solution
than using the venerable <acronym>LPD</acronym>.</para> than using the venerable <acronym>LPD</acronym>.</para>
</sect2> </sect2>
<sect2> <sect2>
<title>How to access &kdeprint; </title> <title>How to access &tdeprint; </title>
<para>You get access to &kdeprint;, or parts of it, in four different <para>You get access to &tdeprint;, or parts of it, in four different
ways:</para> ways:</para>
<itemizedlist> <itemizedlist>
@ -214,14 +214,14 @@ window: this also opens the printing dialog.</para></listitem>
fileref="kcontrol-icon.png" format="PNG"/></imageobject> fileref="kcontrol-icon.png" format="PNG"/></imageobject>
</inlinemediaobject> button, starting &kcontrol;, and then go to </inlinemediaobject> button, starting &kcontrol;, and then go to
<menuchoice><guilabel>System</guilabel><guilabel>Printing <menuchoice><guilabel>System</guilabel><guilabel>Printing
Manager</guilabel></menuchoice>. This opens the &kdeprint; Manager</guilabel></menuchoice>. This opens the &tdeprint;
administration which is part of the &kcontrolcenter; and also lets administration which is part of the &kcontrolcenter; and also lets
you switch to other parts of the &kcontrol;</para></listitem> you switch to other parts of the &kcontrol;</para></listitem>
<listitem><para>from a command line (&konsole; or <listitem><para>from a command line (&konsole; or
mini-<acronym>CLI</acronym>) type <userinput> mini-<acronym>CLI</acronym>) type <userinput>
<command>kcmshell</command> <option>printers</option></userinput>. <command>kcmshell</command> <option>printers</option></userinput>.
This opens just the &kdeprint; part of &kcontrol; to change your settings This opens just the &tdeprint; part of &kcontrol; to change your settings
</para></listitem> </para></listitem>
</itemizedlist> </itemizedlist>
<screenshot> <screenshot>

@ -348,7 +348,7 @@ anything other than the originally supported &OS;s: &Microsoft; &Windows; and
&MacOS;. Through its brilliant move to fully support and utilize &MacOS;. Through its brilliant move to fully support and utilize
the existing &PPD; specification, &CUPS; now gives the power to use the existing &PPD; specification, &CUPS; now gives the power to use
all features of modern printers to users of &Linux; and &Linux;-like all features of modern printers to users of &Linux; and &Linux;-like
systems. &kdeprint; makes its usage even more comfortable than the systems. &tdeprint; makes its usage even more comfortable than the
&CUPS; developers ever dreamed of.</para> &CUPS; developers ever dreamed of.</para>
<para>&CUPS; can use original &Windows; &PPD;s, distributed by the <para>&CUPS; can use original &Windows; &PPD;s, distributed by the
@ -568,7 +568,7 @@ internet and printed.</para>
<para>&CUPS; is the most advanced implementation of &IPP; on all &OS; <para>&CUPS; is the most advanced implementation of &IPP; on all &OS;
platforms. That makes &CUPS; a crucial ally to help "conquer the platforms. That makes &CUPS; a crucial ally to help "conquer the
desktop" for projects like &kde;. &kdeprint; is the best utility to desktop" for projects like &kde;. &tdeprint; is the best utility to
make &CUPS; core functionality available to &kde; Desktop make &CUPS; core functionality available to &kde; Desktop
users.</para> users.</para>

@ -9,4 +9,4 @@
# #
################################################# #################################################
tde_create_handbook( DESTINATION kdesu ) tde_create_handbook( DESTINATION tdesu )

@ -1,7 +1,7 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
"dtd/kdex.dtd" [ "dtd/kdex.dtd" [
<!ENTITY kappname "&kdesu;"> <!ENTITY kappname "&tdesu;">
<!ENTITY package "kdebase"> <!ENTITY package "kdebase">
<!ENTITY % addindex "IGNORE"> <!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE" > <!-- change language only here --> <!ENTITY % English "INCLUDE" > <!-- change language only here -->
@ -10,7 +10,7 @@
<book lang="&language;"> <book lang="&language;">
<bookinfo> <bookinfo>
<title>The &kdesu; handbook</title> <title>The &tdesu; handbook</title>
<authorgroup> <authorgroup>
<author>&Geert.Jansen; &Geert.Jansen.mail;</author> <author>&Geert.Jansen; &Geert.Jansen.mail;</author>
@ -28,7 +28,7 @@
<releaseinfo>1.00.00</releaseinfo> <releaseinfo>1.00.00</releaseinfo>
<abstract><para>&kdesu; is a graphical front end for the &UNIX; <abstract><para>&tdesu; is a graphical front end for the &UNIX;
<command>su</command> command.</para></abstract> <command>su</command> command.</para></abstract>
<keywordset> <keywordset>
@ -43,13 +43,13 @@
<chapter id="introduction"> <chapter id="introduction">
<title>Introduction</title> <title>Introduction</title>
<para>Welcome to &kdesu;! &kdesu; is a graphical front end for the <para>Welcome to &tdesu;! &tdesu; is a graphical front end for the
&UNIX; <command>su</command> command for the K Desktop Environment. &UNIX; <command>su</command> command for the K Desktop Environment.
It allows you to run a program as different user by supplying the It allows you to run a program as different user by supplying the
password for that user. &kdesu; is an unprivileged program; it uses password for that user. &tdesu; is an unprivileged program; it uses
the system's <command>su</command>.</para> the system's <command>su</command>.</para>
<para>&kdesu; has one additional feature: it can remember passwords <para>&tdesu; has one additional feature: it can remember passwords
for you. If you are using this feature, you only need to enter the for you. If you are using this feature, you only need to enter the
password once for each command. See <xref password once for each command. See <xref
linkend="sec-password-keeping"/> for more information on this and a linkend="sec-password-keeping"/> for more information on this and a
@ -63,13 +63,13 @@ glue instead of a pure &GUI; program.</para>
</chapter> </chapter>
<chapter id="using-kdesu"> <chapter id="using-tdesu">
<title>Using &kdesu;</title> <title>Using &tdesu;</title>
<para>Usage of &kdesu; is easy. The syntax is like this:</para> <para>Usage of &tdesu; is easy. The syntax is like this:</para>
<cmdsynopsis> <cmdsynopsis>
<command>kdesu</command> <command>tdesu</command>
<group choice="opt"><option>-c</option></group> <group choice="opt"><option>-c</option></group>
<group choice="opt"><option>-d</option></group> <group choice="opt"><option>-d</option></group>
@ -89,7 +89,7 @@ user</replaceable></group>
<arg rep="repeat"><replaceable></replaceable></arg></arg></group> <arg rep="repeat"><replaceable></replaceable></arg></arg></group>
</cmdsynopsis> </cmdsynopsis>
<cmdsynopsis> <cmdsynopsis>
<command>kdesu</command> <command>tdesu</command>
<arg choice="opt">&kde; Generic Options</arg> <arg choice="opt">&kde; Generic Options</arg>
<arg choice="opt">Qt Generic Options</arg> <arg choice="opt">Qt Generic Options</arg>
</cmdsynopsis> </cmdsynopsis>
@ -101,7 +101,7 @@ user</replaceable></group>
<term><option>-c <replaceable>program</replaceable></option></term> <term><option>-c <replaceable>program</replaceable></option></term>
<listitem><para>This specifies the program to run as root. It has to be passed <listitem><para>This specifies the program to run as root. It has to be passed
in one argument. So if, for example, you want to start a new file manager, you in one argument. So if, for example, you want to start a new file manager, you
would enter at the prompt: <userinput><command>kdesu <option>-c <replaceable>kfm would enter at the prompt: <userinput><command>tdesu <option>-c <replaceable>kfm
-sw</replaceable></option></command></userinput></para></listitem> -sw</replaceable></option></command></userinput></para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
@ -110,10 +110,10 @@ would enter at the prompt: <userinput><command>kdesu <option>-c <replaceable>kfm
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>-f <replaceable>file</replaceable></option></term> <term><option>-f <replaceable>file</replaceable></option></term>
<listitem><para>This option allow efficient use of &kdesu; in <listitem><para>This option allow efficient use of &tdesu; in
<filename>.desktop</filename> files. It tells &kdesu; to examine the <filename>.desktop</filename> files. It tells &tdesu; to examine the
file specified by <parameter>file</parameter>. If this file is file specified by <parameter>file</parameter>. If this file is
writable by the current user, &kdesu; will execute the command as the writable by the current user, &tdesu; will execute the command as the
current user. If it is not writable, the command is executed as user current user. If it is not writable, the command is executed as user
<parameter>user</parameter> (defaults to root).</para> <parameter>user</parameter> (defaults to root).</para>
<para><parameter>file</parameter> is evaluated like this: if <para><parameter>file</parameter> is evaluated like this: if
@ -121,7 +121,7 @@ current user. If it is not writable, the command is executed as user
taken as an absolute filename. Otherwise, it is taken as the name of a taken as an absolute filename. Otherwise, it is taken as the name of a
global &kde; configuration file. For example: to configure the K display global &kde; configuration file. For example: to configure the K display
manager, <application>kdm</application>, you could issue manager, <application>kdm</application>, you could issue
<command>kdesu <option>-c kdmconfig -f <command>tdesu <option>-c kdmconfig -f
kdmrc</option></command></para></listitem> kdmrc</option></command></para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
@ -130,7 +130,7 @@ kdmrc</option></command></para></listitem>
just the name, without any extension.</para> just the name, without any extension.</para>
<para>For instance to run <command>kfmclient</command> and show the <para>For instance to run <command>kfmclient</command> and show the
&konqueror; icon in the password dialog:</para> &konqueror; icon in the password dialog:</para>
<screen><userinput><command>kdesu</command> <option>-i konqueror</option> <command>kfmclient</command></userinput></screen> <screen><userinput><command>tdesu</command> <option>-i konqueror</option> <command>kfmclient</command></userinput></screen>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -155,7 +155,7 @@ password</guilabel> checkbox in the password dialog.</para></listitem>
<varlistentry> <varlistentry>
<term><option>-s</option></term> <term><option>-s</option></term>
<listitem><para>Stop the kdesu daemon. See <xref <listitem><para>Stop the tdesu daemon. See <xref
linkend="sec-password-keeping"/>.</para></listitem> linkend="sec-password-keeping"/>.</para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
@ -166,7 +166,7 @@ standard <command>su</command> instead.</para> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>-u</option> <replaceable> user</replaceable></term> <term><option>-u</option> <replaceable> user</replaceable></term>
<listitem><para>While the most common use for &kdesu; is to run a command as <listitem><para>While the most common use for &tdesu; is to run a command as
the superuser, you can supply any user name and the appropriate the superuser, you can supply any user name and the appropriate
password.</para> password.</para>
</listitem> </listitem>
@ -183,12 +183,12 @@ password.</para>
<title>X authentication</title> <title>X authentication</title>
<para>The program you execute will run under the root user id and will <para>The program you execute will run under the root user id and will
generally have no authority to access your X display. &kdesu; gets generally have no authority to access your X display. &tdesu; gets
around this by adding an authentication cookie for your display to a around this by adding an authentication cookie for your display to a
temporary <filename>.Xauthority</filename> file. After the command temporary <filename>.Xauthority</filename> file. After the command
exits, this file is removed. </para> exits, this file is removed. </para>
<para>If you don't use X cookies, you are on your own. &kdesu; will <para>If you don't use X cookies, you are on your own. &tdesu; will
detect this and will not add a cookie but you will have to make sure detect this and will not add a cookie but you will have to make sure
that root is allowed to access to your display.</para> that root is allowed to access to your display.</para>
@ -197,18 +197,18 @@ that root is allowed to access to your display.</para>
<sect1 id="interface-to-su"> <sect1 id="interface-to-su">
<title>Interface to <command>su</command></title> <title>Interface to <command>su</command></title>
<para>&kdesu; uses the sytem's <command>su</command> for acquiring <para>&tdesu; uses the sytem's <command>su</command> for acquiring
priviliges. In this section, I explain the details of how &kdesu; does priviliges. In this section, I explain the details of how &tdesu; does
this. </para> this. </para>
<para>Because some <command>su</command> implementations (&ie; the one <para>Because some <command>su</command> implementations (&ie; the one
from &RedHat;) don't want to read the password from from &RedHat;) don't want to read the password from
<literal>stdin</literal>, &kdesu; creates a pty/tty pair and executes <literal>stdin</literal>, &tdesu; creates a pty/tty pair and executes
<command>su</command> with it's standard filedescriptors connected to <command>su</command> with it's standard filedescriptors connected to
the tty.</para> the tty.</para>
<para>To execute the command the user selected, rather than an <para>To execute the command the user selected, rather than an
interactive shell, &kdesu; uses the <option>-c</option> argument with interactive shell, &tdesu; uses the <option>-c</option> argument with
<command>su</command>. This argument is understood by every shell that <command>su</command>. This argument is understood by every shell that
I know of so it should work portably. <command>su</command> passes I know of so it should work portably. <command>su</command> passes
this <option>-c</option> argument to the target user's shell, and the this <option>-c</option> argument to the target user's shell, and the
@ -216,9 +216,9 @@ shell executes the program. Example command: <command>su <option>root
-c <replaceable>the_program</replaceable></option></command>.</para> -c <replaceable>the_program</replaceable></option></command>.</para>
<para>Instead of executing the user command directly with <para>Instead of executing the user command directly with
<command>su</command>, &kdesu; executes a little stub program called <command>su</command>, &tdesu; executes a little stub program called
<application>kdesu_stub</application>. This stub (running as the <application>tdesu_stub</application>. This stub (running as the
target user), requests some information from &kdesu; over the pty/tty target user), requests some information from &tdesu; over the pty/tty
channel (the stub's stdin and stdout) and then executes the user's channel (the stub's stdin and stdout) and then executes the user's
program. The information passed over is: the X display, an X program. The information passed over is: the X display, an X
authentication cookie (if available), the <envar>PATH</envar> and the authentication cookie (if available), the <envar>PATH</envar> and the
@ -231,7 +231,7 @@ command line.</para>
<sect1 id="password-checking"> <sect1 id="password-checking">
<title>Password Checking</title> <title>Password Checking</title>
<para>&kdesu; will check the password you entered and gives an error <para>&tdesu; will check the password you entered and gives an error
message if it is not correct. The checking is done by executing a test message if it is not correct. The checking is done by executing a test
program: <filename>/bin/true</filename>. If this succeeds, the program: <filename>/bin/true</filename>. If this succeeds, the
password is assumed to be correct.</para> password is assumed to be correct.</para>
@ -241,25 +241,25 @@ password is assumed to be correct.</para>
<sect1 id="sec-password-keeping"> <sect1 id="sec-password-keeping">
<title>Password Keeping</title> <title>Password Keeping</title>
<para>For your comfort, &kdesu; implements a <quote>keep <para>For your comfort, &tdesu; implements a <quote>keep
password</quote> feature. If you are interested in security, you password</quote> feature. If you are interested in security, you
should read this paragraph.</para> should read this paragraph.</para>
<para>Allowing &kdesu; to remember passwords opens up a (small) <para>Allowing &tdesu; to remember passwords opens up a (small)
security hole in your system. Obviously, &kdesu; does not allow security hole in your system. Obviously, &tdesu; does not allow
anybody but your user id to use the passwords, but, if done without anybody but your user id to use the passwords, but, if done without
caution, this would lowers <systemitem caution, this would lowers <systemitem
class="username">root</systemitem>'s security level to that of a class="username">root</systemitem>'s security level to that of a
normal user (you). A hacker who breaks into your account, would get normal user (you). A hacker who breaks into your account, would get
<systemitem class="username">root</systemitem> access. &kdesu; tries <systemitem class="username">root</systemitem> access. &tdesu; tries
to prevent this. The security scheme it uses is, in my opinion at to prevent this. The security scheme it uses is, in my opinion at
least, reasonably safe and is explained here.</para> least, reasonably safe and is explained here.</para>
<para>&kdesu; uses a daemon, called <para>&tdesu; uses a daemon, called
<application>kdesud</application>. The daemon listens to a &UNIX; <application>tdesud</application>. The daemon listens to a &UNIX;
socket in <filename>/tmp</filename> for commands. The mode of the socket in <filename>/tmp</filename> for commands. The mode of the
socket is 0600 so that only your user id can connect to it. If socket is 0600 so that only your user id can connect to it. If
password keeping is enabled, &kdesu; executes commands through this password keeping is enabled, &tdesu; executes commands through this
daemon. It writes the command and <systemitem daemon. It writes the command and <systemitem
class="username">root</systemitem>'s password to the socket and the class="username">root</systemitem>'s password to the socket and the
daemon executes the command using <command>su</command>, as describe daemon executes the command using <command>su</command>, as describe
@ -271,7 +271,7 @@ not have to supply the password. To keep hackers who broke into your
account from stealing passwords from the daemon (for example, by account from stealing passwords from the daemon (for example, by
attaching a debugger), the daemon is installed set-group-id attaching a debugger), the daemon is installed set-group-id
nogroup. This should prevent all normal users (including you) from nogroup. This should prevent all normal users (including you) from
getting passwords from the <application>kdesud</application> getting passwords from the <application>tdesud</application>
process. Also, the daemon sets the <envar>DISPLAY</envar> environment process. Also, the daemon sets the <envar>DISPLAY</envar> environment
variable to the value it had when it was started. The only thing a variable to the value it had when it was started. The only thing a
hacker can do is execute an application on your display.</para> hacker can do is execute an application on your display.</para>
@ -292,12 +292,12 @@ yourself if you want to use it or not.</para>
<chapter id="Author"> <chapter id="Author">
<title>Author</title> <title>Author</title>
<para>&kdesu;</para> <para>&tdesu;</para>
<para>Copyright 2000 &Geert.Jansen;</para> <para>Copyright 2000 &Geert.Jansen;</para>
<para>&kdesu; is written by &Geert.Jansen;. It is somewhat based on <para>&tdesu; is written by &Geert.Jansen;. It is somewhat based on
Pietro Iglio's &kdesu;, version 0.3. Pietro and I agreed that I will Pietro Iglio's &tdesu;, version 0.3. Pietro and I agreed that I will
maintain this program in the future.</para> maintain this program in the future.</para>
<para>The author can be reached through email at &Geert.Jansen.mail;. <para>The author can be reached through email at &Geert.Jansen.mail;.

@ -12,18 +12,18 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle><command>kdesu</command></refentrytitle> <refentrytitle><command>tdesu</command></refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname><command>kdesu</command></refname> <refname><command>tdesu</command></refname>
<refpurpose>Runs a program with elevated privileges</refpurpose> <refpurpose>Runs a program with elevated privileges</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>kdesu</command> <command>tdesu</command>
<group choice="opt"><option>-c</option></group> <group choice="opt"><option>-c</option></group>
<group choice="opt"><option>-d</option></group> <group choice="opt"><option>-d</option></group>
@ -43,7 +43,7 @@ user</replaceable></group>
<arg rep="repeat"><replaceable></replaceable></arg></arg></group> <arg rep="repeat"><replaceable></replaceable></arg></arg></group>
</cmdsynopsis> </cmdsynopsis>
<cmdsynopsis> <cmdsynopsis>
<command>kdesu</command> <command>tdesu</command>
<arg choice="opt">KDE Generic Options</arg> <arg choice="opt">KDE Generic Options</arg>
<arg choice="opt">Qt Generic Options</arg> <arg choice="opt">Qt Generic Options</arg>
</cmdsynopsis> </cmdsynopsis>
@ -51,13 +51,13 @@ user</replaceable></group>
<refsect1> <refsect1>
<title>Description</title> <title>Description</title>
<para>&kdesu; is a graphical front end for the <para>&tdesu; is a graphical front end for the
&UNIX; <command>su</command> command for the K Desktop Environment. &UNIX; <command>su</command> command for the K Desktop Environment.
It allows you to run a program as different user by supplying the It allows you to run a program as different user by supplying the
password for that user. &kdesu; is an unprivileged program; it uses password for that user. &tdesu; is an unprivileged program; it uses
the system's <command>su</command>.</para> the system's <command>su</command>.</para>
<para>&kdesu; has one additional feature: it can optionally remember passwords <para>&tdesu; has one additional feature: it can optionally remember passwords
for you. If you are using this feature, you only need to enter the for you. If you are using this feature, you only need to enter the
password once for each command.</para> password once for each command.</para>
@ -73,7 +73,7 @@ from <filename>.desktop</filename> files.</para>
<term><option>-c <replaceable>program</replaceable></option></term> <term><option>-c <replaceable>program</replaceable></option></term>
<listitem><para>This specifies the program to run as root. It has to be passed <listitem><para>This specifies the program to run as root. It has to be passed
in one argument. So if, for example, you want to start a new file manager, you in one argument. So if, for example, you want to start a new file manager, you
would enter at the prompt: <userinput><command>kdesu <option>-c <replaceable>kfm would enter at the prompt: <userinput><command>tdesu <option>-c <replaceable>kfm
-sw</replaceable></option></command></userinput></para></listitem> -sw</replaceable></option></command></userinput></para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
@ -82,10 +82,10 @@ would enter at the prompt: <userinput><command>kdesu <option>-c <replaceable>kfm
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>-f <replaceable>file</replaceable></option></term> <term><option>-f <replaceable>file</replaceable></option></term>
<listitem><para>This option allow efficient use of &kdesu; in <listitem><para>This option allow efficient use of &tdesu; in
<filename>.desktop</filename> files. It tells &kdesu; to examine the <filename>.desktop</filename> files. It tells &tdesu; to examine the
file specified by <parameter>file</parameter>. If this file is file specified by <parameter>file</parameter>. If this file is
writable by the current user, &kdesu; will execute the command as the writable by the current user, &tdesu; will execute the command as the
current user. If it is not writable, the command is executed as user current user. If it is not writable, the command is executed as user
<parameter>user</parameter> (defaults to root).</para> <parameter>user</parameter> (defaults to root).</para>
<para><parameter>file</parameter> is evaluated like this: if <para><parameter>file</parameter> is evaluated like this: if
@ -93,7 +93,7 @@ current user. If it is not writable, the command is executed as user
taken as an absolute filename. Otherwise, it is taken as the name of a taken as an absolute filename. Otherwise, it is taken as the name of a
global &kde; configuration file. For example: to configure the K display global &kde; configuration file. For example: to configure the K display
manager, <application>kdm</application>, you could issue manager, <application>kdm</application>, you could issue
<command>kdesu <option>-c kdmconfig -f <command>tdesu <option>-c kdmconfig -f
kdmrc</option></command></para></listitem> kdmrc</option></command></para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
@ -124,9 +124,9 @@ password</guilabel> checkbox in the password dialog.</para></listitem>
<varlistentry> <varlistentry>
<term><option>-s</option></term> <term><option>-s</option></term>
<listitem><para>Stop the kdesu daemon. This is the daemon that caches <listitem><para>Stop the tdesu daemon. This is the daemon that caches
successful passwords in the background. This feature may also be disabled with successful passwords in the background. This feature may also be disabled with
<option>-n</option> when &kdesu; is initially run.</para></listitem> <option>-n</option> when &tdesu; is initially run.</para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>-t</option></term> <term><option>-t</option></term>
@ -136,7 +136,7 @@ standard <command>su</command> instead.</para> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>-u</option> <replaceable> user</replaceable></term> <term><option>-u</option> <replaceable> user</replaceable></term>
<listitem><para>While the most common use for &kdesu; is to run a command as <listitem><para>While the most common use for &tdesu; is to run a command as
the superuser, you can supply any user name and the appropriate the superuser, you can supply any user name and the appropriate
password.</para> password.</para>
</listitem> </listitem>
@ -151,10 +151,10 @@ password.</para>
<para>su(1)</para> <para>su(1)</para>
<para>More detailed user documentation is available from <ulink <para>More detailed user documentation is available from <ulink
url="help:/kdesu">help:/kdesu</ulink> url="help:/tdesu">help:/tdesu</ulink>
(either enter this <acronym>URL</acronym> into &konqueror;, or run (either enter this <acronym>URL</acronym> into &konqueror;, or run
<userinput><command>khelpcenter</command> <userinput><command>khelpcenter</command>
<parameter>help:/kdesu</parameter></userinput>).</para> <parameter>help:/tdesu</parameter></userinput>).</para>
</refsect1> </refsect1>
@ -163,13 +163,13 @@ url="help:/kdesu">help:/kdesu</ulink>
<para>Run <command>kfmclient</command> as user <systemitem <para>Run <command>kfmclient</command> as user <systemitem
class="username">jim</systemitem>, and show the &konqueror; icon in the class="username">jim</systemitem>, and show the &konqueror; icon in the
password dialog:</para> password dialog:</para>
<screen><userinput><command>kdesu</command> <option>-u jim</option> <option>-i konqueror</option> <command>kfmclient</command></userinput></screen> <screen><userinput><command>tdesu</command> <option>-u jim</option> <option>-i konqueror</option> <command>kfmclient</command></userinput></screen>
</refsect1> </refsect1>
<refsect1> <refsect1>
<title>Authors</title> <title>Authors</title>
<para>&kdesu; was written by <para>&tdesu; was written by
<personname><firstname>Geert</firstname><surname>Jansen</surname></personname> <email>jansen@kde.org</email> <personname><firstname>Geert</firstname><surname>Jansen</surname></personname> <email>jansen@kde.org</email>
and <personname><firstname>Pietro</firstname><surname>Iglio</surname></personname> and <personname><firstname>Pietro</firstname><surname>Iglio</surname></personname>
<email>iglio@fub.it</email>. <email>iglio@fub.it</email>.

@ -40,7 +40,7 @@
<!ENTITY kio-thumbnail SYSTEM "thumbnail.docbook"> <!ENTITY kio-thumbnail SYSTEM "thumbnail.docbook">
<!ENTITY kio-webdav SYSTEM "webdav.docbook"> <!ENTITY kio-webdav SYSTEM "webdav.docbook">
<!ENTITY kio-webdavs SYSTEM "webdavs.docbook"> <!ENTITY kio-webdavs SYSTEM "webdavs.docbook">
<!ENTITY kdeprint "<application>KDEPrint</application>"> <!ENTITY tdeprint "<application>KDEPrint</application>">
<!ENTITY Ferdinand.Gassauer '<personname><firstname>Ferdinand</firstname><surname>Gassauer</surname></personname>'> <!ENTITY Ferdinand.Gassauer '<personname><firstname>Ferdinand</firstname><surname>Gassauer</surname></personname>'>
<!ENTITY Ferdinand.Gassauer.mail '<email>f.gassauer@aon.at</email>'> <!ENTITY Ferdinand.Gassauer.mail '<email>f.gassauer@aon.at</email>'>
<!ENTITY % addindex "IGNORE"> <!ENTITY % addindex "IGNORE">

@ -13,7 +13,7 @@
</articleinfo> </articleinfo>
<para>The <acronym>print</acronym> KIOSlave gives quick access to browse <para>The <acronym>print</acronym> KIOSlave gives quick access to browse
different &kdeprint; sections via <quote>virtual folders</quote>. different &tdeprint; sections via <quote>virtual folders</quote>.
These folders provide some information about and quick access to your print These folders provide some information about and quick access to your print
subsystem.</para> subsystem.</para>
@ -116,7 +116,7 @@ or <userinput>print:printers/printer_name </userinput> </term>
<term><userinput>print:/manager </userinput> or <term><userinput>print:/manager </userinput> or
<userinput>print:manager </userinput> <userinput>print:manager </userinput>
</term> <listitem> </term> <listitem>
<para>opens a page very similar to the &kdeprint; <para>opens a page very similar to the &tdeprint;
Manager module inside the &kde; Control Center. Manager module inside the &kde; Control Center.
Switch to a different printing system here or do every Switch to a different printing system here or do every
other administrative task. </para> other administrative task. </para>
@ -157,9 +157,9 @@ or <userinput>print:printers/printer_name </userinput> </term>
the <quote>Quick Command</quote> utility (started via the <quote>Quick Command</quote> utility (started via
<keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo>)</para></tip> <keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo>)</para></tip>
<para>You can learn more about printing and &kdeprint;'s powerful abilities <para>You can learn more about printing and &tdeprint;'s powerful abilities
by reading the <ulink url="help:/kdeprint/index.html">&kdeprint; Handbook by reading the <ulink url="help:/tdeprint/index.html">&tdeprint; Handbook
locally</ulink> or at the <ulink url="http://printing.kde.org/">&kdeprint; locally</ulink> or at the <ulink url="http://printing.kde.org/">&tdeprint;
Website</ulink> where there are documents online (<acronym>HTML</acronym> and Website</ulink> where there are documents online (<acronym>HTML</acronym> and
<acronym>PDF</acronym>),containing <acronym>PDF</acronym>),containing
<ulink <ulink

@ -30,7 +30,7 @@ manager?</para></question>
window manager, launch &konqueror;. It should work just fine, but if it window manager, launch &konqueror;. It should work just fine, but if it
doesn't (&kde; developers don't test that case often), report it to <ulink doesn't (&kde; developers don't test that case often), report it to <ulink
url="http://bugs.kde.org">http://bugs.kde.org</ulink> and try running url="http://bugs.kde.org">http://bugs.kde.org</ulink> and try running
<application>kdeinit</application> before running &konqueror;; it usually <application>tdeinit</application> before running &konqueror;; it usually
helps.</para></answer> helps.</para></answer>
</qandaentry> </qandaentry>

@ -862,7 +862,7 @@ easier.</para>
<para><menuchoice><guimenu>Tools</guimenu><guimenuitem>Execute Shell Command... <para><menuchoice><guimenu>Tools</guimenu><guimenuitem>Execute Shell Command...
</guimenuitem></menuchoice> (<keycombo action="simul">&Ctrl; </guimenuitem></menuchoice> (<keycombo action="simul">&Ctrl;
<keycap>E</keycap></keycombo>) opens a small command line dialog window where <keycap>E</keycap></keycombo>) opens a small command line dialog window where
you can enter a shell command such as <userinput>ps -ax | grep kdeinit you can enter a shell command such as <userinput>ps -ax | grep tdeinit
</userinput>. Note that it does not support full featured terminal control </userinput>. Note that it does not support full featured terminal control
characters, so applications such as <userinput>top</userinput> and <userinput> characters, so applications such as <userinput>top</userinput> and <userinput>
less</userinput> will not work properly, but it is available immediately less</userinput> will not work properly, but it is available immediately

@ -128,7 +128,7 @@
</sect1> </sect1>
<sect1 id="base-applications-kdepim"> <sect1 id="base-applications-tdepim">
<sect1info> <sect1info>
<authorgroup> <authorgroup>
<author> <author>
@ -229,7 +229,7 @@
<itemizedlist> <itemizedlist>
<title>Related Information</title> <title>Related Information</title>
<listitem><para>See <ulink url="http://kontact.kde.org">http://kontact.kde.org</ulink> and <ulink url="http://kdepim.kde.org">http://kdepim.kde.org</ulink> for more information.</para></listitem> <listitem><para>See <ulink url="http://kontact.kde.org">http://kontact.kde.org</ulink> and <ulink url="http://tdepim.kde.org">http://tdepim.kde.org</ulink> for more information.</para></listitem>
<listitem><para><ulink url="help:kontact">&kontact; Handbook</ulink></para></listitem> <listitem><para><ulink url="help:kontact">&kontact; Handbook</ulink></para></listitem>
</itemizedlist> </itemizedlist>

@ -19,14 +19,14 @@
<para>Some &Linux; distributions have tried to stress this point so much that they have disabled the <systemitem class="username">root</systemitem> account altogether, and instead use the <command>sudo</command> model. Nevertheless, the basic security model in <command>sudo</command> is the same as <command>su</command>, and thus they share the same security strengths and weaknesses, essentially.</para> <para>Some &Linux; distributions have tried to stress this point so much that they have disabled the <systemitem class="username">root</systemitem> account altogether, and instead use the <command>sudo</command> model. Nevertheless, the basic security model in <command>sudo</command> is the same as <command>su</command>, and thus they share the same security strengths and weaknesses, essentially.</para>
<para>If you should ever need to run a program with Super User privileges, then it is always recommend that you use &kdesu;. From &konsole; or from hitting <keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo>, enter <userinput>kdesu <replaceable>application</replaceable></userinput>, and the application will be run with the appropriate Super User privileges. </para> <para>If you should ever need to run a program with Super User privileges, then it is always recommend that you use &tdesu;. From &konsole; or from hitting <keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo>, enter <userinput>tdesu <replaceable>application</replaceable></userinput>, and the application will be run with the appropriate Super User privileges. </para>
<para>Even if you have set up your system to use <command>sudo</command>, or you are on a distribution that uses <command>sudo</command>, such as &kubuntu;, you should still use &kdesu;. The program will be appropriately modified by the developers to use the correct settings. You should not, however, ever use <command>sudo <replaceable>application</replaceable></command> to run an application with <systemitem class="username">root</systemitem> permissions; it can derange permissions of certain configuration files for a program. Running a graphical applications as <systemitem class="username">root</systemitem> in general is not a good idea, but using &kdesu; will always be your safest bet with it.</para> <para>Even if you have set up your system to use <command>sudo</command>, or you are on a distribution that uses <command>sudo</command>, such as &kubuntu;, you should still use &tdesu;. The program will be appropriately modified by the developers to use the correct settings. You should not, however, ever use <command>sudo <replaceable>application</replaceable></command> to run an application with <systemitem class="username">root</systemitem> permissions; it can derange permissions of certain configuration files for a program. Running a graphical applications as <systemitem class="username">root</systemitem> in general is not a good idea, but using &tdesu; will always be your safest bet with it.</para>
<!-- Add links to "further reading" here --> <!-- Add links to "further reading" here -->
<itemizedlist> <itemizedlist>
<title>Related Information</title> <title>Related Information</title>
<listitem><para><ulink url="help:kdesu">&kdesu; Handbook</ulink></para> <listitem><para><ulink url="help:tdesu">&tdesu; Handbook</ulink></para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>

@ -833,22 +833,22 @@ are two very important lines in the <filename>startkde</filename>
script:</para> script:</para>
<programlisting> <programlisting>
LD_BIND_NOW=true kdeinit +kcminit +knotify and kwrapper LD_BIND_NOW=true tdeinit +kcminit +knotify and kwrapper
ksmserver $KDEWM ksmserver $KDEWM
</programlisting> </programlisting>
<para>The first line starts the <command>kdeinit</command> master process. <para>The first line starts the <command>tdeinit</command> master process.
The <command>kdeinit</command> master process is used to start all other The <command>tdeinit</command> master process is used to start all other
&kde; processes. It show up in the output of <command>ps &kde; processes. It show up in the output of <command>ps
<option>aux</option></command> as <computeroutput>kdeinit: <option>aux</option></command> as <computeroutput>tdeinit:
Running...</computeroutput>. The arguments after <command>kdeinit</command> Running...</computeroutput>. The arguments after <command>tdeinit</command>
are the names of additional processes to be started. The <token>+</token> are the names of additional processes to be started. The <token>+</token>
indicates that <command>kdeinit</command> needs to wait till the process has indicates that <command>tdeinit</command> needs to wait till the process has
finished. <command>kdeinit</command> also starts finished. <command>tdeinit</command> also starts
<command>dcopserver</command>, <command>klauncher</command> and <command>dcopserver</command>, <command>klauncher</command> and
<command>kded</command>.</para> <command>kded</command>.</para>
<para>The second of the two lines asks <command>kdeinit</command> to start <para>The second of the two lines asks <command>tdeinit</command> to start
the <command>ksmserver</command> session manager process. The session the <command>ksmserver</command> session manager process. The session
manager determines the lifetime of the session. When this process exits, the manager determines the lifetime of the session. When this process exits, the
user is logged out.</para> user is logged out.</para>
@ -910,18 +910,18 @@ needed</para>
</variablelist> </variablelist>
<sect2 id="kdeinit"> <sect2 id="tdeinit">
<title><command>kdeinit</command></title> <title><command>tdeinit</command></title>
<para><command>kdeinit</command> is used to start all other &kde; <para><command>tdeinit</command> is used to start all other &kde;
programs. <command>kdeinit</command> can start normal binary program files programs. <command>tdeinit</command> can start normal binary program files
as well as <command>kdeinit</command> loadable modules as well as <command>tdeinit</command> loadable modules
(<acronym>KLM</acronym>s). <acronym>KLM</acronym>s work just like binary (<acronym>KLM</acronym>s). <acronym>KLM</acronym>s work just like binary
program files but can be started more efficiently. <acronym>KLM</acronym>s program files but can be started more efficiently. <acronym>KLM</acronym>s
live in <filename live in <filename
class="directory">$<envar>KDEDIR</envar>/lib/trinity</filename></para> class="directory">$<envar>KDEDIR</envar>/lib/trinity</filename></para>
<para>The drawback is that programs started this way appear as <para>The drawback is that programs started this way appear as
<computeroutput><command>kdeinit</command></computeroutput> in the output of <computeroutput><command>tdeinit</command></computeroutput> in the output of
<command>top</command> and <command>ps</command>. Use <command>top <command>top</command> and <command>ps</command>. Use <command>top
<option>-c</option></command> or <command>ps <option>aux</option></command> <option>-c</option></command> or <command>ps <option>aux</option></command>
to see the actual program name:</para> to see the actual program name:</para>
@ -929,20 +929,20 @@ to see the actual program name:</para>
<screen> <screen>
<prompt>%</prompt><userinput><command>ps <option>aux</option></command></userinput> <prompt>%</prompt><userinput><command>ps <option>aux</option></command></userinput>
<computeroutput> <computeroutput>
waba 23184 0.2 2.1 23428 11124 ? S 21:41 0:00 kdeinit: Running... waba 23184 0.2 2.1 23428 11124 ? S 21:41 0:00 tdeinit: Running...
waba 23187 0.1 2.1 23200 11124 ? S 21:41 0:00 kdeinit: dcopserver --nosid waba 23187 0.1 2.1 23200 11124 ? S 21:41 0:00 tdeinit: dcopserver --nosid
waba 23189 0.2 2.4 25136 12496 ? S 21:41 0:00 kdeinit: klauncher waba 23189 0.2 2.4 25136 12496 ? S 21:41 0:00 tdeinit: klauncher
waba 23192 0.7 2.8 25596 14772 ? S 21:41 0:00 kdeinit: kded waba 23192 0.7 2.8 25596 14772 ? S 21:41 0:00 tdeinit: kded
waba 23203 0.8 3.4 31516 17892 ? S 21:41 0:00 kdeinit: waba 23203 0.8 3.4 31516 17892 ? S 21:41 0:00 tdeinit:
knotify knotify
</computeroutput> </computeroutput>
</screen> </screen>
<para><computeroutput>kdeinit: Running...</computeroutput> indicates the <para><computeroutput>tdeinit: Running...</computeroutput> indicates the
master <command>kdeinit</command> process. The other processes listed are master <command>tdeinit</command> process. The other processes listed are
programs started as <acronym>KLM</acronym>s.</para> programs started as <acronym>KLM</acronym>s.</para>
<para>When <command>kdeinit</command> starts for the first time it will <para>When <command>tdeinit</command> starts for the first time it will
launch <command>dcopserver</command>, <command>klauncher</command>, and launch <command>dcopserver</command>, <command>klauncher</command>, and
<command>kded</command>, as well as any additional programs specified on its <command>kded</command>, as well as any additional programs specified on its
command line in the <command>startkde</command> script, normally command line in the <command>startkde</command> script, normally
@ -1019,7 +1019,7 @@ startup problems.</para>
<para><command>klauncher</command> is a daemon which is responsible for <para><command>klauncher</command> is a daemon which is responsible for
service activation within &kde;. It operates in close connection with the service activation within &kde;. It operates in close connection with the
<command>kdeinit</command> master process to start new processes. &kde; <command>tdeinit</command> master process to start new processes. &kde;
applications communicate with <command>klauncher</command> over &DCOP; in applications communicate with <command>klauncher</command> over &DCOP; in
order to start new applications or services.</para> order to start new applications or services.</para>
@ -1029,7 +1029,7 @@ either indicates a serious problem with the <command>dcopserver</command> or
that <command>klauncher</command> crashed.</para> that <command>klauncher</command> crashed.</para>
<para><command>klauncher</command> can be restarted by restarting <para><command>klauncher</command> can be restarted by restarting
<command>kdeinit</command> from a console window. Make sure that <command>tdeinit</command> from a console window. Make sure that
$<envar>HOME</envar>, $<envar>DISPLAY</envar> and the various $<envar>HOME</envar>, $<envar>DISPLAY</envar> and the various
$<envar>KDEDIR(S)</envar> are set correctly when doing so!</para> $<envar>KDEDIR(S)</envar> are set correctly when doing so!</para>
@ -1205,7 +1205,7 @@ on a multi-head system.</para>
<listitem><para>(Since &kde; 3.2.3) Set this variable to spawn <listitem><para>(Since &kde; 3.2.3) Set this variable to spawn
<acronym>KIO</acronym>-slaves directly from the application process <acronym>KIO</acronym>-slaves directly from the application process
itself. By default <acronym>KIO</acronym>-slaves are spawned using itself. By default <acronym>KIO</acronym>-slaves are spawned using
<command>klauncher</command>/<command>kdeinit</command>. This option is <command>klauncher</command>/<command>tdeinit</command>. This option is
useful if the <acronym>KIO</acronym>-slave should run in the same useful if the <acronym>KIO</acronym>-slave should run in the same
environment as the application. This can be the case with environment as the application. This can be the case with
<application>Clearcase</application>.</para> <application>Clearcase</application>.</para>
@ -1228,7 +1228,7 @@ lookups.</para>
<varlistentry><term>$<envar>KDE_IS_PRELINKED</envar></term><listitem><para> <varlistentry><term>$<envar>KDE_IS_PRELINKED</envar></term><listitem><para>
(Since &kde; 3.2) - Set this variable to indicate that you have prelinked (Since &kde; 3.2) - Set this variable to indicate that you have prelinked
your &kde; binaries and libraries. This will turn off your &kde; binaries and libraries. This will turn off
<command>kdeinit</command>.</para> <command>tdeinit</command>.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -1243,7 +1243,7 @@ locale.</para>
(Since &kde; 3.2) Automatically set to true by &kde; startup, it is used (Since &kde; 3.2) Automatically set to true by &kde; startup, it is used
by &eg; &konqueror; to know if it should consider remaining in memory by &eg; &konqueror; to know if it should consider remaining in memory
for future re-use when being closed. If not set, &konqueror; will exit for future re-use when being closed. If not set, &konqueror; will exit
after being closed (&eg; &kdesu; does that, it's also useful for after being closed (&eg; &tdesu; does that, it's also useful for
debugging).</para> debugging).</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -1314,21 +1314,21 @@ $<envar>KDEDIRS</envar> and profiles as well. Used by <literal role="extension">
</sect1> </sect1>
<sect1 id="the-kdeinit-mystery"> <sect1 id="the-tdeinit-mystery">
<title>The kdeinit Mystery</title> <title>The tdeinit Mystery</title>
<!-- FIXME: Add more words. Fix markup --> <!-- FIXME: Add more words. Fix markup -->
<para><command>kdeinit</command> is used to start all other &kde; <para><command>tdeinit</command> is used to start all other &kde;
programs. <command>kdeinit</command> can start normal binary program f iles programs. <command>tdeinit</command> can start normal binary program f iles
as well as <command>kdeinit</command> loadable modules as well as <command>tdeinit</command> loadable modules
(<acronym>KLM</acronym>s). <acronym>KLM</acronym>s work just like binary (<acronym>KLM</acronym>s). <acronym>KLM</acronym>s work just like binary
program files but can be started more efficiently. <acronym>KLM</acronym>s program files but can be started more efficiently. <acronym>KLM</acronym>s
live in <filename live in <filename
class="directory">$<envar>KDEDIR</envar>/lib/trinity</filename></para> class="directory">$<envar>KDEDIR</envar>/lib/trinity</filename></para>
<para>The drawback is that programs started this way appear as <para>The drawback is that programs started this way appear as
<computeroutput><command>kdeinit</command></computeroutput> in the <computeroutput><command>tdeinit</command></computeroutput> in the
output of <command>top</command> and <command>ps</command>. Use output of <command>top</command> and <command>ps</command>. Use
<command>top <option>-c</option></command> or <command>ps <command>top <option>-c</option></command> or <command>ps
<option>aux</option></command> to see the actual program name:</para> <option>aux</option></command> to see the actual program name:</para>
@ -1336,14 +1336,14 @@ output of <command>top</command> and <command>ps</command>. Use
<screen> <screen>
<prompt>%</prompt> <userinput><command>ps aux | grep bastian</command></userinput> <prompt>%</prompt> <userinput><command>ps aux | grep bastian</command></userinput>
<computeroutput> <computeroutput>
bastian 26061 0.0 2.2 24284 11492 ? S 21:27 0:00 kdeinit: Running... bastian 26061 0.0 2.2 24284 11492 ? S 21:27 0:00 tdeinit: Running...
bastian 26064 0.0 2.2 24036 11524 ? S 21:27 0:00 kdeinit: dcopserver bastian 26064 0.0 2.2 24036 11524 ? S 21:27 0:00 tdeinit: dcopserver
bastian 26066 0.1 2.5 26056 12988 ? S 21:27 0:00 kdeinit: klauncher bastian 26066 0.1 2.5 26056 12988 ? S 21:27 0:00 tdeinit: klauncher
bastian 26069 0.4 3.2 27356 16744 ? S 21:27 0:00 kdeinit: kded bastian 26069 0.4 3.2 27356 16744 ? S 21:27 0:00 tdeinit: kded
bastian 26161 0.2 2.7 25344 14096 ? S 21:27 0:00 kdeinit: ksmserver bastian 26161 0.2 2.7 25344 14096 ? S 21:27 0:00 tdeinit: ksmserver
bastian 26179 1.1 3.4 29716 17812 ? S 21:27 0:00 kdeinit: kicker bastian 26179 1.1 3.4 29716 17812 ? S 21:27 0:00 tdeinit: kicker
bastian 26192 0.4 3.0 26776 15452 ? S 21:27 0:00 kdeinit: klipper bastian 26192 0.4 3.0 26776 15452 ? S 21:27 0:00 tdeinit: klipper
bastian 26195 1.0 3.5 29200 18368 ? S 21:27 0:00 kdeinit: kdesktop bastian 26195 1.0 3.5 29200 18368 ? S 21:27 0:00 tdeinit: kdesktop
</computeroutput> </computeroutput>
</screen> </screen>
<para>As you might have noticed, this has another side effect, making it <para>As you might have noticed, this has another side effect, making it
@ -1353,7 +1353,7 @@ difficult to kill a process that is causing trouble:</para>
<computeroutput>kdesktop: no process killed</computeroutput></screen> <computeroutput>kdesktop: no process killed</computeroutput></screen>
<para>You might be tempted to try <userinput><command>killall <para>You might be tempted to try <userinput><command>killall
kdeinit</command></userinput>, but killing all kdeinit processes will have tdeinit</command></userinput>, but killing all tdeinit processes will have
the effect of shutting down all of &kde;. In effect, total the effect of shutting down all of &kde;. In effect, total
destruction!</para> destruction!</para>

@ -81,8 +81,8 @@ action="simul">&Ctrl;&Alt;<keycap>S</keycap></keycombo> and enter the new
name.</para> name.</para>
<para>If you find the need to run any &kde; program with <systemitem <para>If you find the need to run any &kde; program with <systemitem
class="username">root</systemitem> privileges, you can use the &kdesu; command with the <option>-c</option> switch class="username">root</systemitem> privileges, you can use the &tdesu; command with the <option>-c</option> switch
from the command line like this: <userinput><command>kdesu</command> from the command line like this: <userinput><command>tdesu</command>
<option>-c -n <replaceable>PROGRAM</replaceable></option></userinput>, using <option>-c -n <replaceable>PROGRAM</replaceable></option></userinput>, using
the <option>-n</option> switch will prevent &kde; from remembering your the <option>-n</option> switch will prevent &kde; from remembering your
passwords.</para> passwords.</para>

@ -11,7 +11,7 @@ EXTRA_DIST = LICENSE
bin_PROGRAMS = drkonqi bin_PROGRAMS = drkonqi
# Libraries: # Libraries:
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
LDADD = $(LIB_KDEUI) $(LIB_KIO) LDADD = $(LIB_KDEUI) $(LIB_KIO)
# toplevel.cpp must be last in row due to X-headers being included. (--enable-final) # toplevel.cpp must be last in row due to X-headers being included. (--enable-final)

@ -63,7 +63,7 @@ void KrashConfig :: readConfig()
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
m_signalnum = args->getOption( "signal" ).toInt(); m_signalnum = args->getOption( "signal" ).toInt();
m_pid = args->getOption( "pid" ).toInt(); m_pid = args->getOption( "pid" ).toInt();
m_startedByKdeinit = args->isSet("kdeinit"); m_startedByKdeinit = args->isSet("tdeinit");
m_safeMode = args->isSet("safer"); m_safeMode = args->isSet("safer");
m_execname = args->getOption( "appname" ); m_execname = args->getOption( "appname" );
if ( !args->getOption( "apppath" ).isEmpty() ) if ( !args->getOption( "apppath" ).isEmpty() )
@ -150,7 +150,7 @@ void KrashConfig :: expandString(TQString &str, bool shell, const TQString &temp
{ {
TQMap<TQString,TQString> map; TQMap<TQString,TQString> map;
map[TQString::tqfromLatin1("appname")] = TQString::tqfromLatin1(appName()); map[TQString::tqfromLatin1("appname")] = TQString::tqfromLatin1(appName());
map[TQString::tqfromLatin1("execname")] = startedByKdeinit() ? TQString::tqfromLatin1("kdeinit") : m_execname; map[TQString::tqfromLatin1("execname")] = startedByKdeinit() ? TQString::tqfromLatin1("tdeinit") : m_execname;
map[TQString::tqfromLatin1("signum")] = TQString::number(signalNumber()); map[TQString::tqfromLatin1("signum")] = TQString::number(signalNumber());
map[TQString::tqfromLatin1("signame")] = signalName(); map[TQString::tqfromLatin1("signame")] = signalName();
map[TQString::tqfromLatin1("progname")] = programName(); map[TQString::tqfromLatin1("progname")] = programName();

@ -52,7 +52,7 @@ static const KCmdLineOptions options[] =
{"programname <name>", I18N_NOOP("Translated name of the program"), 0}, {"programname <name>", I18N_NOOP("Translated name of the program"), 0},
{"pid <pid>", I18N_NOOP("The PID of the program"), 0}, {"pid <pid>", I18N_NOOP("The PID of the program"), 0},
{"startupid <id>", I18N_NOOP("Startup ID of the program"), 0}, {"startupid <id>", I18N_NOOP("Startup ID of the program"), 0},
{"kdeinit", I18N_NOOP("The program was started by kdeinit"), 0}, {"tdeinit", I18N_NOOP("The program was started by tdeinit"), 0},
{"safer", I18N_NOOP("Disable arbitrary disk access"), 0}, {"safer", I18N_NOOP("Disable arbitrary disk access"), 0},
KCmdLineLastOption KCmdLineLastOption
}; };

@ -42,5 +42,5 @@ tde_add_executable( kappfinder AUTOMOC
tde_add_executable( kappfinder_install AUTOMOC tde_add_executable( kappfinder_install AUTOMOC
SOURCES main_install.cpp common.cpp SOURCES main_install.cpp common.cpp
LINK kdeui-shared LINK tdeui-shared
) )

@ -3,12 +3,12 @@ SUBDIRS = apps
bin_PROGRAMS = kappfinder bin_PROGRAMS = kappfinder
kappfinder_SOURCES = main.cpp toplevel.cpp common.cpp kappfinder_SOURCES = main.cpp toplevel.cpp common.cpp
kappfinder_LDADD = $(LIB_KDEUI) $(LIB_KIO) kappfinder_LDADD = $(LIB_KDEUI) $(LIB_KIO)
kappfinder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kappfinder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
noinst_PROGRAMS = kappfinder_install noinst_PROGRAMS = kappfinder_install
kappfinder_install_SOURCES = main_install.cpp common.cpp kappfinder_install_SOURCES = main_install.cpp common.cpp
kappfinder_install_LDADD = $(LIB_KDEUI) kappfinder_install_LDADD = $(LIB_KDEUI)
kappfinder_install_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kappfinder_install_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO

@ -51,21 +51,21 @@ tde_add_library( ${target} SHARED AUTOMOC
) )
##### kate (kdeinit) ############################ ##### kate (tdeinit) ############################
set( target kate ) set( target kate )
tde_add_kdeinit_executable( ${target} tde_add_tdeinit_executable( ${target}
SOURCES katemain.cpp SOURCES katemain.cpp
LINK kateinterfaces-shared LINK kateinterfaces-shared
) )
##### kwrite (kdeinit) ########################## ##### kwrite (tdeinit) ##########################
set( target kwrite ) set( target kwrite )
tde_add_kdeinit_executable( ${target} AUTOMOC tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES kwritemain.cpp SOURCES kwritemain.cpp
LINK kateinterfaces-shared katepartinterfaces-shared LINK kateinterfaces-shared katepartinterfaces-shared
) )

@ -1,6 +1,6 @@
lib_LTLIBRARIES = libkateinterfaces.la lib_LTLIBRARIES = libkateinterfaces.la
bin_PROGRAMS = bin_PROGRAMS =
kdeinit_LTLIBRARIES = kate.la kwrite.la tdeinit_LTLIBRARIES = kate.la kwrite.la
libkateinterfaces_la_SOURCES = kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp \ libkateinterfaces_la_SOURCES = kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp \
kateconsole.cpp katedocmanager.cpp katefilelist.cpp katefileselector.cpp \ kateconsole.cpp katedocmanager.cpp katefilelist.cpp katefileselector.cpp \

@ -162,7 +162,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
if (!kateApp.isEmpty()) if (!kateApp.isEmpty())
{ {
kdDebug () << "kate app: " << kateApp << endl; kdDebug () << "kate app: " << kateApp << endl;
// make kdeinit happy // make tdeinit happy
client.registerAs( "kate" ); client.registerAs( "kate" );
DCOPRef kRef (kateApp, "KateApplication"); DCOPRef kRef (kateApp, "KateApplication");

@ -6,7 +6,7 @@ libkateinterfacesprivate_la_SOURCES = application.cpp mainwindow.cpp documentman
pluginmanager.cpp plugin.cpp pluginconfiginterface.cpp pluginconfiginterfaceextension.cpp pluginmanager.cpp plugin.cpp pluginconfiginterface.cpp pluginconfiginterfaceextension.cpp
libkateinterfacesprivate_la_LIBADD = -lkatepartinterfaces libkateinterfacesprivate_la_LIBADD = -lkatepartinterfaces
libkateinterfacesprivate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor libkateinterfacesprivate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kateinclude_HEADERS = application.h documentmanager.h mainwindow.h plugin.h viewmanager.h pluginconfiginterface.h pluginconfiginterfaceextension.h toolviewmanager.h pluginmanager.h kateinclude_HEADERS = application.h documentmanager.h mainwindow.h plugin.h viewmanager.h pluginconfiginterface.h pluginconfiginterfaceextension.h toolviewmanager.h pluginmanager.h
kateincludedir = $(includedir)/kate kateincludedir = $(includedir)/kate

@ -36,5 +36,5 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
VERSION 0.0.0 VERSION 0.0.0
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${LIB_INSTALL_DIR} ) DESTINATION ${LIB_INSTALL_DIR} )

@ -26,7 +26,7 @@ tde_add_executable( kcheckpass AUTOMOC
SOURCES SOURCES
kcheckpass.c checkpass_etcpasswd.c checkpass_pam.c kcheckpass.c checkpass_etcpasswd.c checkpass_pam.c
checkpass_shadow.c checkpass_osfc2passwd.c checkpass_aix.c checkpass_shadow.c checkpass_osfc2passwd.c checkpass_aix.c
LINK kdefakes-shared ${CRYPT_LIBRARY} ${PAM_LIBRARY} LINK tdefakes-shared ${CRYPT_LIBRARY} ${PAM_LIBRARY}
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -9,7 +9,7 @@ bin_PROGRAMS = kcheckpass
kcheckpass_SOURCES = kcheckpass.c \ kcheckpass_SOURCES = kcheckpass.c \
checkpass_etcpasswd.c checkpass_pam.c checkpass_shadow.c \ checkpass_etcpasswd.c checkpass_pam.c checkpass_shadow.c \
checkpass_osfc2passwd.c checkpass_aix.c checkpass_osfc2passwd.c checkpass_aix.c
kcheckpass_LDADD = -lkdefakes $(PASSWDLIBS) $(LIBSOCKET) kcheckpass_LDADD = -ltdefakes $(PASSWDLIBS) $(LIBSOCKET)
kcheckpass_LDFLAGS = $(KDE_USE_PIE) $(all_libraries) kcheckpass_LDFLAGS = $(KDE_USE_PIE) $(all_libraries)
noinst_HEADERS = kcheckpass.h noinst_HEADERS = kcheckpass.h

@ -21,17 +21,17 @@ link_directories(
) )
##### kcminit (kdeinit) ######################### ##### kcminit (tdeinit) #########################
tde_add_kdeinit_executable( kcminit AUTOMOC tde_add_tdeinit_executable( kcminit AUTOMOC
SOURCES main.cpp main.skel SOURCES main.cpp main.skel
LINK kutils-shared LINK kutils-shared
) )
##### kcminit_startup (kdeinit) ################# ##### kcminit_startup (tdeinit) #################
tde_add_kdeinit_executable( kcminit_startup AUTOMOC tde_add_tdeinit_executable( kcminit_startup AUTOMOC
SOURCES main.cpp main.skel SOURCES main.cpp main.skel
LINK kutils-shared LINK kutils-shared
) )

@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# #
kdeinit_LTLIBRARIES = kcminit.la kcminit_startup.la tdeinit_LTLIBRARIES = kcminit.la kcminit_startup.la
bin_PROGRAMS= bin_PROGRAMS=
lib_LTLIBRARIES= lib_LTLIBRARIES=

@ -179,7 +179,7 @@ KCMInit::KCMInit( KCmdLineArgs* args )
config.setGroup("X11"); config.setGroup("X11");
bool multihead = !config.readBoolEntry( "disableMultihead", false) && bool multihead = !config.readBoolEntry( "disableMultihead", false) &&
(ScreenCount(qt_xdisplay()) > 1); (ScreenCount(qt_xdisplay()) > 1);
// Pass env. var to kdeinit. // Pass env. var to tdeinit.
TQCString name = "KDE_MULTIHEAD"; TQCString name = "KDE_MULTIHEAD";
TQCString value = multihead ? "true" : "false"; TQCString value = multihead ? "true" : "false";
TQByteArray params; TQByteArray params;
@ -220,7 +220,7 @@ void KCMInit::runPhase2()
extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
{ {
// kdeinit waits for kcminit to finish, but during KDE startup // tdeinit waits for kcminit to finish, but during KDE startup
// only important kcm's are started very early in the login process, // only important kcm's are started very early in the login process,
// the rest is delayed, so fork and make parent return after the initial phase // the rest is delayed, so fork and make parent return after the initial phase
pipe( ready ); pipe( ready );

@ -36,9 +36,9 @@ tde_add_kpart( kcm_access AUTOMOC
) )
##### kaccess (kdeinit) ######################### ##### kaccess (tdeinit) #########################
tde_add_kdeinit_executable( kaccess AUTOMOC tde_add_tdeinit_executable( kaccess AUTOMOC
SOURCES kaccess.cpp main.cpp SOURCES kaccess.cpp main.cpp
LINK kdeui-shared LINK tdeui-shared
) )

@ -5,7 +5,7 @@ METASOURCES = AUTO
bin_PROGRAMS = bin_PROGRAMS =
lib_LTLIBRARIES = lib_LTLIBRARIES =
kde_module_LTLIBRARIES = kcm_access.la kde_module_LTLIBRARIES = kcm_access.la
kdeinit_LTLIBRARIES = kaccess.la tdeinit_LTLIBRARIES = kaccess.la
kaccess_la_SOURCES = kaccess.cpp main.cpp kaccess_la_SOURCES = kaccess.cpp main.cpp
kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version

@ -74,7 +74,7 @@ static bool startArts()
delete config; delete config;
if (startServer) if (startServer)
kapp->kdeinitExec(startRealtime?"artswrapper":"artsd", kapp->tdeinitExec(startRealtime?"artswrapper":"artsd",
TQStringList::split(" ",args)); TQStringList::split(" ",args));
return startServer; return startServer;
} }

@ -28,6 +28,6 @@ install( FILES bell.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
tde_add_kpart( kcm_bell AUTOMOC tde_add_kpart( kcm_bell AUTOMOC
SOURCES bell.cpp SOURCES bell.cpp
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_bell.la
kcm_bell_la_SOURCES = bell.cpp kcm_bell_la_SOURCES = bell.cpp
kcm_bell_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined kcm_bell_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_bell_la_LIBADD = -lkdeui kcm_bell_la_LIBADD = -ltdeui
AM_CPPFLAGS= $(all_includes) AM_CPPFLAGS= $(all_includes)

@ -6,7 +6,7 @@ kcm_crypto_la_SOURCES = crypto.cpp certexport.cpp kdatetimedlg.cpp
AM_CXXFLAGS = $(CXXFLAGS) -DLIBDIR=$(libdir) AM_CXXFLAGS = $(CXXFLAGS) -DLIBDIR=$(libdir)
kcm_crypto_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(SSL_LDFLAGS) -module -avoid-version -no-undefined kcm_crypto_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(SSL_LDFLAGS) -module -avoid-version -no-undefined
kcm_crypto_la_LIBADD = -lkdeui $(LIB_KIO) $(LIBSSL) kcm_crypto_la_LIBADD = -ltdeui $(LIB_KIO) $(LIBSSL)
METASOURCES = AUTO METASOURCES = AUTO

@ -2029,7 +2029,7 @@ void KCryptoConfig::offerImportToKMail( const TQString& certFile )
proc << "--import-certificate"; proc << "--import-certificate";
proc << certFile; proc << certFile;
if ( !proc.start( KProcess::DontCare ) ) if ( !proc.start( KProcess::DontCare ) )
KMessageBox::error( this, i18n( "Could not execute Kleopatra. You might have to install or update the kdepim package." ) ); KMessageBox::error( this, i18n( "Could not execute Kleopatra. You might have to install or update the tdepim package." ) );
} }
} }

@ -6,7 +6,7 @@ templatedir = $(kde_datadir)/kcmcss
kde_module_LTLIBRARIES = kcm_css.la kde_module_LTLIBRARIES = kcm_css.la
kcm_css_la_SOURCES = template.cpp cssconfig.ui csscustom.ui kcmcss.cpp preview.ui kcm_css_la_SOURCES = template.cpp cssconfig.ui csscustom.ui kcmcss.cpp preview.ui
kcm_css_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined kcm_css_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_css_la_LIBADD = -lkdeui $(LIB_KIO) kcm_css_la_LIBADD = -ltdeui $(LIB_KIO)
METASOURCES = AUTO METASOURCES = AUTO

@ -5,7 +5,7 @@ kcm_displayconfig_la_SOURCES = displayconfig.cpp displayconfigbase.ui displaycon
kcm_displayconfig_la_LDFLAGS = $(all_libraries) -lkrandr -module -avoid-version -no-undefined kcm_displayconfig_la_LDFLAGS = $(all_libraries) -lkrandr -module -avoid-version -no-undefined
kcm_displayconfig_la_LIBADD = -lkdeui $(LIB_KIO) $(LIB_XRANDR) kcm_displayconfig_la_LIBADD = -ltdeui $(LIB_KIO) $(LIB_XRANDR)
METASOURCES = AUTO METASOURCES = AUTO

@ -31,6 +31,6 @@ set_source_files_properties( kcmdnssd.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDIR
tde_add_kpart( kcm_kdnssd AUTOMOC tde_add_kpart( kcm_kdnssd AUTOMOC
SOURCES configdialog.ui kcmdnssd.cpp SOURCES configdialog.ui kcmdnssd.cpp
LINK kdnssd-shared kdeui-shared LINK kdnssd-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -97,7 +97,7 @@ void KCMDnssd::save()
KProcess *proc = new KProcess; KProcess *proc = new KProcess;
*proc << "kdesu"; *proc << "tdesu";
if (enableZeroconf->isChecked()) { if (enableZeroconf->isChecked()) {
if (KMessageBox::warningYesNo( this, scaryMessage, i18n("Enable Zeroconf Network Browsing"), KGuiItem(i18n("Enable Browsing")), KGuiItem(i18n("Don't Enable Browsing")) ) == KMessageBox::Yes) { if (KMessageBox::warningYesNo( this, scaryMessage, i18n("Enable Zeroconf Network Browsing"), KGuiItem(i18n("Enable Browsing")), KGuiItem(i18n("Don't Enable Browsing")) ) == KMessageBox::Yes) {

@ -21,7 +21,7 @@ libfiletypes_la_SOURCES = filetypesview.cpp filetypedetails.cpp filegroupdetails
keditfiletype_SOURCES = keditfiletype.cpp keditfiletype_SOURCES = keditfiletype.cpp
keditfiletype_LDADD = libfiletypes.la $(LIB_KIO) keditfiletype_LDADD = libfiletypes.la $(LIB_KIO)
keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
messages: messages:
$(XGETTEXT) *.cpp -o $(podir)/filetypes.pot $(XGETTEXT) *.cpp -o $(podir)/filetypes.pot

@ -53,7 +53,7 @@ install( FILES fonts.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
tde_add_kpart( kcm_fonts AUTOMOC tde_add_kpart( kcm_fonts AUTOMOC
SOURCES fonts.cpp SOURCES fonts.cpp
LINK kxftconfig-static krdb-static kdeui-shared LINK kxftconfig-static krdb-static tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -522,7 +522,7 @@ KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &)
TQValueList<TQFont> defaultFontList; TQValueList<TQFont> defaultFontList;
// Keep in sync with kdelibs/kdecore/kglobalsettings.cpp // Keep in sync with kdelibs/tdecore/kglobalsettings.cpp
TQFont f0("Sans Serif", 10); TQFont f0("Sans Serif", 10);
TQFont f1("Monospace", 10); TQFont f1("Monospace", 10);

@ -5,7 +5,7 @@ kcm_iccconfig_la_SOURCES = iccconfig.cpp iccconfigbase.ui iccconfig.skel
kcm_iccconfig_la_LDFLAGS = $(all_libraries) -lkrandr -module -avoid-version -no-undefined kcm_iccconfig_la_LDFLAGS = $(all_libraries) -lkrandr -module -avoid-version -no-undefined
kcm_iccconfig_la_LIBADD = -lkdeui $(LIB_KIO) $(LIB_XRANDR) kcm_iccconfig_la_LIBADD = -ltdeui $(LIB_KIO) $(LIB_XRANDR)
METASOURCES = AUTO METASOURCES = AUTO

@ -36,6 +36,6 @@ install( FILES
tde_add_kpart( kcm_info AUTOMOC tde_add_kpart( kcm_info AUTOMOC
SOURCES main.cpp memory.cpp opengl.cpp SOURCES main.cpp memory.cpp opengl.cpp
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_ioslaveinfo.la
kcm_ioslaveinfo_la_SOURCES = kcmioslaveinfo.cpp kcm_ioslaveinfo_la_SOURCES = kcmioslaveinfo.cpp
kcm_ioslaveinfo_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined kcm_ioslaveinfo_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_ioslaveinfo_la_LIBADD = -lkdeui $(LIB_KIO) kcm_ioslaveinfo_la_LIBADD = -ltdeui $(LIB_KIO)
AM_CPPFLAGS= $(all_includes) AM_CPPFLAGS= $(all_includes)

@ -31,6 +31,6 @@ tde_add_kpart( kcm_joystick AUTOMOC
SOURCES SOURCES
joystick.cpp joywidget.cpp poswidget.cpp joystick.cpp joywidget.cpp poswidget.cpp
joydevice.cpp caldialog.cpp joydevice.cpp caldialog.cpp
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -30,7 +30,7 @@ install( FILES kinfocenterui.rc DESTINATION ${DATA_INSTALL_DIR}/kinfocenter )
install( FILES KControl.desktop kinfocenter.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( FILES KControl.desktop kinfocenter.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
##### kcontrol (kdeinit) ######################## ##### kcontrol (tdeinit) ########################
set( target kcontrol ) set( target kcontrol )
@ -42,7 +42,7 @@ set( ${target}_SRCS
searchwidget.cpp searchwidget.cpp
) )
tde_add_kdeinit_executable( ${target} AUTOMOC tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK khtml-shared LINK khtml-shared
) )

@ -24,7 +24,7 @@ SUBDIRS = . about
bin_PROGRAMS = bin_PROGRAMS =
lib_LTLIBRARIES = lib_LTLIBRARIES =
kdeinit_LTLIBRARIES = kcontrol.la tdeinit_LTLIBRARIES = kcontrol.la
kcontrol_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp \ kcontrol_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp \
helpwidget.cpp dockcontainer.cpp aboutwidget.cpp \ helpwidget.cpp dockcontainer.cpp aboutwidget.cpp \

@ -111,9 +111,9 @@ void AboutWidget::updatePixmap()
TQTextStream t( &f ); TQTextStream t( &f );
TQString res = t.read(); TQString res = t.read();
res = res.arg( locate( "data", "kdeui/about/kde_infopage.css" ) ); res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
if ( kapp->reverseLayout() ) if ( kapp->reverseLayout() )
res = res.arg( "@import \"%1\";" ).arg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
else else
res = res.arg( "" ); res = res.arg( "" );

@ -168,10 +168,10 @@ void ConfigModule::runAsRoot()
// prepare the process to run the kcmshell // prepare the process to run the kcmshell
TQString cmd = service()->exec().stripWhiteSpace(); TQString cmd = service()->exec().stripWhiteSpace();
bool kdeshell = false; bool kdeshell = false;
if (cmd.left(5) == "kdesu") if (cmd.left(5) == "tdesu")
{ {
cmd = TQString(cmd.remove(0,5)).stripWhiteSpace(); cmd = TQString(cmd.remove(0,5)).stripWhiteSpace();
// remove all kdesu switches // remove all tdesu switches
while( cmd.length() > 1 && cmd[ 0 ] == '-' ) while( cmd.length() > 1 && cmd[ 0 ] == '-' )
{ {
int pos = cmd.find( ' ' ); int pos = cmd.find( ' ' );
@ -186,14 +186,14 @@ void ConfigModule::runAsRoot()
} }
// run the process // run the process
TQString kdesu = KStandardDirs::findExe("kdesu"); TQString tdesu = KStandardDirs::findExe("tdesu");
if (!kdesu.isEmpty()) if (!tdesu.isEmpty())
{ {
_rootProcess = new KProcess; _rootProcess = new KProcess;
*_rootProcess << kdesu; *_rootProcess << tdesu;
*_rootProcess << "--nonewdcop"; *_rootProcess << "--nonewdcop";
// We have to disable the keep-password feature because // We have to disable the keep-password feature because
// in that case the modules is started through kdesud and kdesu // in that case the modules is started through tdesud and tdesu
// returns before the module is running and that doesn't work. // returns before the module is running and that doesn't work.
// We also don't have a way to close the module in that case. // We also don't have a way to close the module in that case.
*_rootProcess << "--n"; // Don't keep password. *_rootProcess << "--n"; // Don't keep password.

@ -1,7 +1,7 @@
kde_module_LTLIBRARIES = kcm_keys.la kde_module_LTLIBRARIES = kcm_keys.la
kcm_keys_la_SOURCES = shortcuts.cpp modifiers.cpp main.cpp khotkeys.cpp treeview.cpp commandShortcuts.cpp kcm_keys_la_SOURCES = shortcuts.cpp modifiers.cpp main.cpp khotkeys.cpp treeview.cpp commandShortcuts.cpp
kcm_keys_la_LIBADD = -lkdeui -lkio kcm_keys_la_LIBADD = -ltdeui -lkio
kcm_keys_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined kcm_keys_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
AM_CPPFLAGS= $(all_includes) AM_CPPFLAGS= $(all_includes)

@ -1,4 +1,4 @@
// THIS FILE IS A COPY OF kdelibs/kdecore/kaccelaction.h AND MUST BE KEPT // THIS FILE IS A COPY OF kdelibs/tdecore/kaccelaction.h AND MUST BE KEPT
// IN SYNC WITH THAT FILE. // IN SYNC WITH THAT FILE.
/* This file is part of the KDE libraries /* This file is part of the KDE libraries

@ -115,7 +115,7 @@ void ModifiersModule::save()
if( bMacSwap ) if( bMacSwap )
setupMacModifierKeys(); setupMacModifierKeys();
else else
kapp->kdeinitExec("kxkb"); kapp->tdeinitExec("kxkb");
m_bMacSwapOrig = bMacSwap; m_bMacSwapOrig = bMacSwap;
updateWidgets(); updateWidgets();
} }

@ -345,7 +345,7 @@ KDE3.1 -> KDE3.2
0.8.2->0.8.3 0.8.2->0.8.3
============ ============
1. Modified 'kfontinst.kdelnk' so that kdesu is now used - so that a user will automatically be prompted 1. Modified 'kfontinst.kdelnk' so that tdesu is now used - so that a user will automatically be prompted
for the root password. for the root password.
2. Modified dialogs to use the KDE caption ("Font Installer") instead of the app name ("kfontinst") 2. Modified dialogs to use the KDE caption ("Font Installer") instead of the app name ("kfontinst")
3. Corrected size of Configure dialog. 3. Corrected size of Configure dialog.

@ -34,6 +34,6 @@ install( FILES folder.desktop system-folder.desktop package.desktop DESTINATION
tde_add_kpart( kio_fonts AUTOMOC tde_add_kpart( kio_fonts AUTOMOC
SOURCES KioFonts.cpp SOURCES KioFonts.cpp
LINK kxftconfig-static kfontinst-shared kdesu-shared LINK kxftconfig-static kfontinst-shared tdesu-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -59,7 +59,7 @@
#include <kinstance.h> #include <kinstance.h>
#include <klargefile.h> #include <klargefile.h>
#include <ktempfile.h> #include <ktempfile.h>
#include <kdesu/su.h> #include <tdesu/su.h>
#include <kprocess.h> #include <kprocess.h>
#include <kdebug.h> #include <kdebug.h>
#include <ktar.h> #include <ktar.h>

@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = kio_fonts.la
kio_fonts_la_SOURCES = \ kio_fonts_la_SOURCES = \
KioFonts.cpp KioFonts.cpp
kio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) -lkdesu ../lib/libkfontinst.la kio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) -ltdesu ../lib/libkfontinst.la
kio_fonts_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -module -avoid-version -no-undefined kio_fonts_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -module -avoid-version -no-undefined
AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE

@ -51,5 +51,5 @@ tde_add_executable( kfontview AUTOMOC
tde_add_library( kfontinstprint STATIC_PIC tde_add_library( kfontinstprint STATIC_PIC
SOURCES KfiPrint.cpp SOURCES KfiPrint.cpp
LINK kdeprint-shared LINK tdeprint-shared
) )

@ -17,7 +17,7 @@ AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFR
METASOURCES = AUTO METASOURCES = AUTO
kfontview_LDADD = $(LIB_KPARTS) kfontview_LDADD = $(LIB_KPARTS)
kfontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kfontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
bin_PROGRAMS = kfontview bin_PROGRAMS = kfontview
xdg_apps_DATA = kfontview.desktop xdg_apps_DATA = kfontview.desktop

@ -13,7 +13,7 @@ kcm_konqhtml_la_SOURCES = advancedTabDialog.cpp htmlopts.cpp jsopts.cpp \
filteropts.cpp filteropts.cpp
kcm_konqhtml_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined kcm_konqhtml_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_konqhtml_la_LIBADD = -lkhtml -lkdeui kcm_konqhtml_la_LIBADD = -lkhtml -ltdeui
xdg_apps_DATA = khtml_behavior.desktop khtml_java_js.desktop khtml_fonts.desktop khtml_filter.desktop xdg_apps_DATA = khtml_behavior.desktop khtml_java_js.desktop khtml_fonts.desktop khtml_filter.desktop

@ -4,7 +4,7 @@ kcm_konsole_la_SOURCES = schemaeditor.cpp sessioneditor.cpp kcmkonsole.cpp \
schemadialog.ui sessiondialog.ui kcmkonsoledialog.ui schemadialog.ui sessiondialog.ui kcmkonsoledialog.ui
kcm_konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined kcm_konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_konsole_la_LIBADD = -lkdeui $(LIB_KIO) kcm_konsole_la_LIBADD = -ltdeui $(LIB_KIO)
AM_CPPFLAGS = $(all_includes) AM_CPPFLAGS = $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO

@ -34,5 +34,5 @@ install( FILES kcmdisplayrc.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
tde_add_library( krdb STATIC_PIC AUTOMOC tde_add_library( krdb STATIC_PIC AUTOMOC
SOURCES krdb.cpp SOURCES krdb.cpp
LINK kdecore-shared LINK tdecore-shared
) )

@ -88,7 +88,7 @@ static void applyGtkStyles(bool active, int version)
if (!active) if (!active)
::unlink(TQFile::encodeName(gtkkde)); ::unlink(TQFile::encodeName(gtkkde));
// Pass env. var to kdeinit. // Pass env. var to tdeinit.
TQCString name = gtkEnvVar(version); TQCString name = gtkEnvVar(version);
TQCString value = TQFile::encodeName(list.join(":")); TQCString value = TQFile::encodeName(list.join(":"));
TQByteArray params; TQByteArray params;

@ -28,6 +28,6 @@ install( FILES kcmlaunch.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
tde_add_kpart( kcm_launch AUTOMOC tde_add_kpart( kcm_launch AUTOMOC
SOURCES kcmlaunch.cpp SOURCES kcmlaunch.cpp
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -124,7 +124,7 @@ void KLocaleConfig::slotInstallLanguage()
{ {
KProcess *proc = new KProcess; KProcess *proc = new KProcess;
*proc << "kdesu"; *proc << "tdesu";
*proc << "qt-language-selector --mode install"; *proc << "qt-language-selector --mode install";
TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)), TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)),
this, TQT_SLOT(slotLanguageSelectorExited(KProcess *))); this, TQT_SLOT(slotLanguageSelectorExited(KProcess *)));
@ -136,7 +136,7 @@ void KLocaleConfig::slotUninstallLanguage()
{ {
KProcess *proc = new KProcess; KProcess *proc = new KProcess;
*proc << "kdesu"; *proc << "tdesu";
*proc << "qt-language-selector --mode uninstall"; *proc << "qt-language-selector --mode uninstall";
TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)), TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)),
this, TQT_SLOT(slotLanguageSelectorExited(KProcess *))); this, TQT_SLOT(slotLanguageSelectorExited(KProcess *)));
@ -148,7 +148,7 @@ void KLocaleConfig::slotSelectLanguage()
{ {
KProcess *proc = new KProcess; KProcess *proc = new KProcess;
*proc << "kdesu"; *proc << "tdesu";
*proc << "qt-language-selector --mode select"; *proc << "qt-language-selector --mode select";
TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)), TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)),
this, TQT_SLOT(slotLanguageSelectorExited(KProcess *))); this, TQT_SLOT(slotLanguageSelectorExited(KProcess *)));

@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_nic.la
kcm_nic_la_SOURCES = nic.cpp kcm_nic_la_SOURCES = nic.cpp
kcm_nic_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined kcm_nic_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_nic_la_LIBADD = -lkdeui $(LIB_KIO) $(LIBSOCKET) kcm_nic_la_LIBADD = -ltdeui $(LIB_KIO) $(LIBSOCKET)
AM_CPPFLAGS= $(all_includes) AM_CPPFLAGS= $(all_includes)

@ -29,6 +29,6 @@ install( FILES kcmkonqyperformance.desktop DESTINATION ${APPS_INSTALL_DIR}/.hidd
tde_add_kpart( kcm_performance AUTOMOC tde_add_kpart( kcm_performance AUTOMOC
SOURCES kcmperformance.cpp konqueror.cpp konqueror_ui.ui system.cpp system_ui.ui SOURCES kcmperformance.cpp konqueror.cpp konqueror_ui.ui system.cpp system_ui.ui
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = kcm_performance.la
kcm_performance_la_SOURCES = kcmperformance.cpp konqueror.cpp konqueror_ui.ui system.cpp system_ui.ui kcm_performance_la_SOURCES = kcmperformance.cpp konqueror.cpp konqueror_ui.ui system.cpp system_ui.ui
kcm_performance_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined kcm_performance_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_performance_la_LIBADD = -lkdeui kcm_performance_la_LIBADD = -ltdeui
AM_CPPFLAGS= $(all_includes) AM_CPPFLAGS= $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO

@ -134,7 +134,7 @@ bool KPrivacyManager::clearWebHistory()
if(!isApplicationRegistered("konqueror")) if(!isApplicationRegistered("konqueror"))
{ {
kdDebug() << "couldn't find Konqueror instance, preloading." << endl; kdDebug() << "couldn't find Konqueror instance, preloading." << endl;
kapp->kdeinitExec("konqueror", args, 0,0); kapp->tdeinitExec("konqueror", args, 0,0);
} }
return kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager", return kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",

@ -31,7 +31,7 @@ install( FILES krandrtray-autostart.desktop DESTINATION ${AUTOSTART_INSTALL_DIR}
tde_add_kpart( kcm_randr AUTOMOC tde_add_kpart( kcm_randr AUTOMOC
SOURCES krandrmodule.cpp SOURCES krandrmodule.cpp
LINK kdeui-shared krandr-shared LINK tdeui-shared krandr-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -5,7 +5,7 @@ kcm_smartcard_la_SOURCES = smartcard.cpp smartcardbase.ui nosmartcardbase.ui sma
kcm_smartcard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined kcm_smartcard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_smartcard_la_LIBADD = -lkdeui -lksmartcard $(LIB_KIO) kcm_smartcard_la_LIBADD = -ltdeui -lksmartcard $(LIB_KIO)
METASOURCES = AUTO METASOURCES = AUTO

@ -44,7 +44,7 @@
</property> </property>
<property name="text"> <property name="text">
<string> <string>
1) The KDE daemon, 'kded' is not running. You can restart it by running the command 'kdeinit' and then try reloading the KDE Control Center to see if this message goes away. 1) The KDE daemon, 'kded' is not running. You can restart it by running the command 'tdeinit' and then try reloading the KDE Control Center to see if this message goes away.
2) You don't appear to have smartcard support in the KDE libraries. You will need to recompile the kdelibs package with libpcsclite installed.</string> 2) You don't appear to have smartcard support in the KDE libraries. You will need to recompile the kdelibs package with libpcsclite installed.</string>
</property> </property>

@ -28,6 +28,6 @@ install( FILES kcmsmserver.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
tde_add_kpart( kcm_smserver AUTOMOC tde_add_kpart( kcm_smserver AUTOMOC
SOURCES kcmsmserver.cpp smserverconfigdlg.ui smserverconfigimpl.cpp SOURCES kcmsmserver.cpp smserverconfigdlg.ui smserverconfigimpl.cpp
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = kcm_smserver.la
kcm_smserver_la_SOURCES = kcmsmserver.cpp smserverconfigdlg.ui smserverconfigimpl.cpp kcm_smserver_la_SOURCES = kcmsmserver.cpp smserverconfigdlg.ui smserverconfigimpl.cpp
kcm_smserver_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined kcm_smserver_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_smserver_la_LIBADD = -lkdeui kcm_smserver_la_LIBADD = -ltdeui
AM_CPPFLAGS= $(all_includes) AM_CPPFLAGS= $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO

@ -28,6 +28,6 @@ install( FILES spellchecking.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
tde_add_kpart( kcm_spellchecking AUTOMOC tde_add_kpart( kcm_spellchecking AUTOMOC
SOURCES spellchecking.cpp SOURCES spellchecking.cpp
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_spellchecking.la
kcm_spellchecking_la_SOURCES = spellchecking.cpp kcm_spellchecking_la_SOURCES = spellchecking.cpp
kcm_spellchecking_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined kcm_spellchecking_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_spellchecking_la_LIBADD = -lkdeui kcm_spellchecking_la_LIBADD = -ltdeui
AM_CPPFLAGS= $(all_includes) AM_CPPFLAGS= $(all_includes)

@ -24,6 +24,6 @@ link_directories(
tde_add_kpart( kstyle_keramik_config AUTOMOC tde_add_kpart( kstyle_keramik_config AUTOMOC
SOURCES keramikconf.cpp SOURCES keramikconf.cpp
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = kcm_taskbar.la
kcm_taskbar_la_SOURCES = kcmtaskbarui.ui kcmtaskbar.cpp kcm_taskbar_la_SOURCES = kcmtaskbarui.ui kcmtaskbar.cpp
kcm_taskbar_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined kcm_taskbar_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_taskbar_la_LIBADD = $(top_builddir)/kicker/taskbar/libtaskbar.la -lkdeui kcm_taskbar_la_LIBADD = $(top_builddir)/kicker/taskbar/libtaskbar.la -ltdeui
AM_CPPFLAGS = -I$(top_builddir)/kicker/taskbar $(all_includes) AM_CPPFLAGS = -I$(top_builddir)/kicker/taskbar $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO

@ -37,6 +37,6 @@ endif( )
tde_add_kpart( kcm_usb AUTOMOC tde_add_kpart( kcm_usb AUTOMOC
SOURCES SOURCES
kcmusb.cpp usbdevices.cpp usbdb.cpp kcmusb.cpp usbdevices.cpp usbdb.cpp
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -30,6 +30,6 @@ install( FILES oui.db DESTINATION ${DATA_INSTALL_DIR}/kcmview1394 )
tde_add_kpart( kcm_view1394 AUTOMOC tde_add_kpart( kcm_view1394 AUTOMOC
SOURCES view1394widget.ui view1394.cpp SOURCES view1394widget.ui view1394.cpp
LINK kdeui-shared ${LIBRAW1394_LIBRARIES} LINK tdeui-shared ${LIBRAW1394_LIBRARIES}
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -28,6 +28,6 @@ install( FILES xinerama.desktop DESTINATION ${APPS_INSTALL_DIR}/.hidden )
tde_add_kpart( kcm_xinerama AUTOMOC tde_add_kpart( kcm_xinerama AUTOMOC
SOURCES kcmxinerama.cpp xineramawidget.ui SOURCES kcmxinerama.cpp xineramawidget.ui
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kcm_xinerama.la
kcm_xinerama_la_SOURCES = kcmxinerama.cpp xineramawidget.ui kcm_xinerama_la_SOURCES = kcmxinerama.cpp xineramawidget.ui
kcm_xinerama_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined kcm_xinerama_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_xinerama_la_LIBADD = -lkdeui kcm_xinerama_la_LIBADD = -ltdeui
METASOURCES = AUTO METASOURCES = AUTO

@ -27,6 +27,6 @@ tde_add_executable( kdebugdialog AUTOMOC
SOURCES SOURCES
main.cpp kabstractdebugdialog.cpp kdebugdialog.cpp main.cpp kabstractdebugdialog.cpp kdebugdialog.cpp
klistdebugdialog.cpp klistdebugdialog.cpp
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -3,7 +3,7 @@ SUBDIRS = kcm
bin_PROGRAMS = kdepasswd bin_PROGRAMS = kdepasswd
kdepasswd_SOURCES = kdepasswd.cpp passwd.cpp passwddlg.cpp kdepasswd_SOURCES = kdepasswd.cpp passwd.cpp passwddlg.cpp
kdepasswd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kdepasswd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kdepasswd_LDADD = $(LIB_KIO) kdepasswd_LDADD = $(LIB_KIO)
METASOURCES = AUTO METASOURCES = AUTO

@ -18,7 +18,7 @@
#include <tqcstring.h> #include <tqcstring.h>
#include <kdesu/process.h> #include <tdesu/process.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdebug.h> #include <kdebug.h>
#include "chfnprocess.h" #include "chfnprocess.h"

@ -12,7 +12,7 @@
#define CHFNPROC_H #define CHFNPROC_H
#include <tqcstring.h> #include <tqcstring.h>
#include <kdesu/process.h> #include <tdesu/process.h>
class ChfnProcess : public PtyProcess class ChfnProcess : public PtyProcess
{ {

@ -2,7 +2,7 @@
* *
* $Id$ * $Id$
* *
* This file is part of the KDE project, module kdesu. * This file is part of the KDE project, module tdesu.
* Copyright (C) 2000 Geert Jansen <jansen@kde.org> * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
*/ */

@ -2,7 +2,7 @@
* *
* $Id$ * $Id$
* *
* This file is part of the KDE project, module kdesu. * This file is part of the KDE project, module tdesu.
* Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org> * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
* *
* passwd.cpp: Change a user's password. * passwd.cpp: Change a user's password.
@ -28,7 +28,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kdesu/process.h> #include <tdesu/process.h>
#include "passwd.h" #include "passwd.h"

@ -2,7 +2,7 @@
* *
* $Id$ * $Id$
* *
* This file is part of the KDE project, module kdesu. * This file is part of the KDE project, module tdesu.
* Copyright (C) 2000 Geert Jansen <jansen@kde.org> * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
*/ */
@ -10,7 +10,7 @@
#define __Passwd_h_Included__ #define __Passwd_h_Included__
#include <tqcstring.h> #include <tqcstring.h>
#include <kdesu/process.h> #include <tdesu/process.h>
/** /**
* A C++ API to passwd. * A C++ API to passwd.

@ -2,7 +2,7 @@
* *
* $Id$ * $Id$
* *
* This file is part of the KDE project, module kdesu. * This file is part of the KDE project, module tdesu.
* Copyright (C) 2000 Geert Jansen <jansen@kde.org> * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
*/ */

@ -2,7 +2,7 @@
* *
* $Id$ * $Id$
* *
* This file is part of the KDE project, module kdesu. * This file is part of the KDE project, module tdesu.
* Copyright (C) 2000 Geert Jansen <jansen@kde.org> * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
*/ */

@ -12,6 +12,6 @@
add_subdirectory( printmgr ) add_subdirectory( printmgr )
add_subdirectory( kjobviewer ) add_subdirectory( kjobviewer )
add_subdirectory( kprinter ) add_subdirectory( kprinter )
add_subdirectory( kdeprintfax ) add_subdirectory( tdeprintfax )
add_subdirectory( slave ) add_subdirectory( slave )
add_subdirectory( kdeprint_part ) add_subdirectory( tdeprint_part )

@ -1 +1 @@
SUBDIRS = printmgr kjobviewer kprinter kdeprintfax slave kdeprint_part SUBDIRS = printmgr kjobviewer kprinter tdeprintfax slave tdeprint_part

@ -24,14 +24,14 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES kdeprint_part.rc DESTINATION ${DATA_INSTALL_DIR}/kdeprint_part ) install( FILES tdeprint_part.rc DESTINATION ${DATA_INSTALL_DIR}/tdeprint_part )
install( FILES kdeprint_part.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES tdeprint_part.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
##### libtdeprint_part (module) ################# ##### libtdeprint_part (module) #################
tde_add_kpart( libtdeprint_part AUTOMOC tde_add_kpart( libtdeprint_part AUTOMOC
SOURCES printpart.cpp SOURCES printpart.cpp
LINK kdeprint_management-shared kparts-shared LINK tdeprint_management-shared kparts-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libtdeprint_part.la
libtdeprint_part_la_SOURCES = printpart.cpp libtdeprint_part_la_SOURCES = printpart.cpp
libtdeprint_part_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined libtdeprint_part_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
libtdeprint_part_la_LIBADD = -lkdeprint_management $(LIB_KPARTS) libtdeprint_part_la_LIBADD = -ltdeprint_management $(LIB_KPARTS)
noinst_HEADERS = printpart.h noinst_HEADERS = printpart.h
@ -12,13 +12,13 @@ METASOURCES = AUTO
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
# service # service
myservice_DATA = kdeprint_part.desktop myservice_DATA = tdeprint_part.desktop
myservicedir = $(kde_servicesdir) myservicedir = $(kde_servicesdir)
# UI file # UI file
myrcfile_DATA = kdeprint_part.rc myrcfile_DATA = tdeprint_part.rc
myrcfiledir = $(kde_datadir)/kdeprint_part myrcfiledir = $(kde_datadir)/tdeprint_part
messages: rc.cpp messages: rc.cpp
$(EXTRACTRC) kdeprint_part.rc >> rc.cpp $(EXTRACTRC) tdeprint_part.rc >> rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kdeprint_part.pot $(XGETTEXT) *.cpp -o $(podir)/tdeprint_part.pot

@ -1,5 +1,5 @@
<!DOCTYPE kpartgui> <!DOCTYPE kpartgui>
<kpartgui name="kdeprint_part"> <kpartgui name="tdeprint_part">
<ToolBar name="Kdeprint-Toolbar" newline="false"><text>Print Manager Toolbar</text> <ToolBar name="Kdeprint-Toolbar" newline="false"><text>Print Manager Toolbar</text>
<Action name="printer_add" /> <Action name="printer_add" />
<Action name="printer_add_special" /> <Action name="printer_add_special" />

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -19,8 +19,8 @@
#include "printpart.h" #include "printpart.h"
#include <kdeprint/kmmainview.h> #include <tdeprint/kmmainview.h>
#include <kdeprint/kiconselectaction.h> #include <tdeprint/kiconselectaction.h>
#include <kaction.h> #include <kaction.h>
#include <klocale.h> #include <klocale.h>
#include <kinstance.h> #include <kinstance.h>
@ -39,7 +39,7 @@ PrintPart::PrintPart(TQWidget *parentWidget, const char * /*widgetName*/ ,
: KParts::ReadOnlyPart(parent, name) : KParts::ReadOnlyPart(parent, name)
{ {
setInstance(PrintPartFactory::instance()); setInstance(PrintPartFactory::instance());
instance()->iconLoader()->addAppDir("kdeprint"); instance()->iconLoader()->addAppDir("tdeprint");
m_extension = new PrintPartExtension(this); m_extension = new PrintPartExtension(this);
m_view = new KMMainView(parentWidget, "MainView", actionCollection()); m_view = new KMMainView(parentWidget, "MainView", actionCollection());
@ -56,7 +56,7 @@ PrintPart::~PrintPart()
KAboutData *PrintPart::createAboutData() KAboutData *PrintPart::createAboutData()
{ {
return new KAboutData(I18N_NOOP("kdeprint_part"), I18N_NOOP("A Konqueror Plugin for Print Management"), "0.1"); return new KAboutData(I18N_NOOP("tdeprint_part"), I18N_NOOP("A Konqueror Plugin for Print Management"), "0.1");
} }
bool PrintPart::openFile() bool PrintPart::openFile()
@ -66,7 +66,7 @@ bool PrintPart::openFile()
void PrintPart::initActions() void PrintPart::initActions()
{ {
setXMLFile("kdeprint_part.rc"); setXMLFile("tdeprint_part.rc");
} }
PrintPartExtension::PrintPartExtension(PrintPart *parent) PrintPartExtension::PrintPartExtension(PrintPart *parent)

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -22,21 +22,21 @@ link_directories(
##### other data ################################ ##### other data ################################
tde_install_icons( kdeprintfax ) tde_install_icons( tdeprintfax )
tde_install_icons( abentry DESTINATION ${DATA_INSTALL_DIR}/kdeprintfax/icons ) tde_install_icons( abentry DESTINATION ${DATA_INSTALL_DIR}/tdeprintfax/icons )
install( FILES kdeprintfax.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( FILES tdeprintfax.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
install( FILES kdeprintfaxui.rc faxfilters DESTINATION ${DATA_INSTALL_DIR}/kdeprintfax ) install( FILES tdeprintfaxui.rc faxfilters DESTINATION ${DATA_INSTALL_DIR}/tdeprintfax )
install( PROGRAMS anytops DESTINATION ${DATA_INSTALL_DIR}/kdeprintfax ) install( PROGRAMS anytops DESTINATION ${DATA_INSTALL_DIR}/tdeprintfax )
##### kdeprintfax (executable) ################## ##### tdeprintfax (executable) ##################
tde_add_executable( kdeprintfax AUTOMOC tde_add_executable( tdeprintfax AUTOMOC
SOURCES SOURCES
main.cpp kdeprintfax.cpp faxab.cpp faxctrl.cpp main.cpp tdeprintfax.cpp faxab.cpp faxctrl.cpp
confgeneral.cpp configdlg.cpp conffax.cpp confgeneral.cpp configdlg.cpp conffax.cpp
confsystem.cpp conffilters.cpp filterdlg.cpp confsystem.cpp conffilters.cpp filterdlg.cpp
defcmds.cpp defcmds.cpp
LINK kabc-shared kdeprint-shared LINK kabc-shared tdeprint-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -1,23 +1,23 @@
INCLUDES= $(all_includes) INCLUDES= $(all_includes)
bin_PROGRAMS = kdeprintfax bin_PROGRAMS = tdeprintfax
kdeprintfax_SOURCES = main.cpp kdeprintfax.cpp faxab.cpp faxctrl.cpp confgeneral.cpp configdlg.cpp \ tdeprintfax_SOURCES = main.cpp tdeprintfax.cpp faxab.cpp faxctrl.cpp confgeneral.cpp configdlg.cpp \
conffax.cpp confsystem.cpp conffilters.cpp filterdlg.cpp defcmds.cpp conffax.cpp confsystem.cpp conffilters.cpp filterdlg.cpp defcmds.cpp
kdeprintfax_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor tdeprintfax_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kdeprintfax_LDADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDEPRINT) -lkabc tdeprintfax_LDADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDEPRINT) -lkabc
kdeprintfax_METASOURCES = AUTO tdeprintfax_METASOURCES = AUTO
xdg_apps_DATA = kdeprintfax.desktop xdg_apps_DATA = tdeprintfax.desktop
uidir = $(kde_datadir)/kdeprintfax uidir = $(kde_datadir)/tdeprintfax
ui_DATA = kdeprintfaxui.rc faxfilters ui_DATA = tdeprintfaxui.rc faxfilters
private_SCRIPTS = anytops private_SCRIPTS = anytops
privatedir = $(kde_datadir)/kdeprintfax privatedir = $(kde_datadir)/tdeprintfax
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) `find . -name \*.h -o -name \*.cpp -o -name \*.cc` -o $(podir)/kdeprintfax.pot $(XGETTEXT) `find . -name \*.h -o -name \*.cpp -o -name \*.cc` -o $(podir)/tdeprintfax.pot
KDE_ICON = kdeprintfax KDE_ICON = tdeprintfax
pic_ICON = abentry pic_ICON = abentry
picdir = $(kde_datadir)/kdeprintfax/icons picdir = $(kde_datadir)/tdeprintfax/icons

@ -29,8 +29,8 @@ while true; do
shift shift
;; ;;
-v) -v)
echo "Anytops v1.0: (c) 2001, Michael Goffioul <kdeprint@swing.be>"; echo "Anytops v1.0: (c) 2001, Michael Goffioul <tdeprint@swing.be>";
echo "Small script to convert any file type into PS. Part of kdeprintfax." echo "Small script to convert any file type into PS. Part of tdeprintfax."
exit 0 exit 0
;; ;;
*) *)

@ -1,5 +1,5 @@
/* /*
* kdeprintfax - a small fax utility * tdeprintfax - a small fax utility
* Copyright (C) 2001 Michael Goffioul * Copyright (C) 2001 Michael Goffioul
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

@ -1,5 +1,5 @@
/* /*
* kdeprintfax - a small fax utility * tdeprintfax - a small fax utility
* Copyright (C) 2001 Michael Goffioul * Copyright (C) 2001 Michael Goffioul
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

@ -1,5 +1,5 @@
/* /*
* kdeprintfax - a small fax utility * tdeprintfax - a small fax utility
* Copyright (C) 2001 Michael Goffioul * Copyright (C) 2001 Michael Goffioul
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -85,7 +85,7 @@ ConfFilters::ConfFilters(TQWidget *parent, const char *name)
void ConfFilters::load() void ConfFilters::load()
{ {
TQFile f(locate("data","kdeprintfax/faxfilters")); TQFile f(locate("data","tdeprintfax/faxfilters"));
if (f.exists() && f.open(IO_ReadOnly)) if (f.exists() && f.open(IO_ReadOnly))
{ {
TQTextStream t(&f); TQTextStream t(&f);
@ -108,7 +108,7 @@ void ConfFilters::load()
void ConfFilters::save() void ConfFilters::save()
{ {
TQListViewItem *item = m_filters->firstChild(); TQListViewItem *item = m_filters->firstChild();
TQFile f(locateLocal("data","kdeprintfax/faxfilters")); TQFile f(locateLocal("data","tdeprintfax/faxfilters"));
if (f.open(IO_WriteOnly)) if (f.open(IO_WriteOnly))
{ {
TQTextStream t(&f); TQTextStream t(&f);

@ -1,5 +1,5 @@
/* /*
* kdeprintfax - a small fax utility * tdeprintfax - a small fax utility
* Copyright (C) 2001 Michael Goffioul * Copyright (C) 2001 Michael Goffioul
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

@ -1,5 +1,5 @@
/* /*
* kdeprintfax - a small fax utility * tdeprintfax - a small fax utility
* Copyright (C) 2001 Michael Goffioul * Copyright (C) 2001 Michael Goffioul
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

@ -1,5 +1,5 @@
/* /*
* kdeprintfax - a small fax utility * tdeprintfax - a small fax utility
* Copyright (C) 2001 Michael Goffioul * Copyright (C) 2001 Michael Goffioul
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

@ -1,5 +1,5 @@
/* /*
* kdeprintfax - a small fax utility * tdeprintfax - a small fax utility
* Copyright (C) 2001 Michael Goffioul * Copyright (C) 2001 Michael Goffioul
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -37,7 +37,7 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name)
TQVBox *page2 = addVBoxPage(i18n("Page setup"), i18n("Page Setup"), DesktopIcon("editcopy")); TQVBox *page2 = addVBoxPage(i18n("Page setup"), i18n("Page Setup"), DesktopIcon("editcopy"));
m_fax = new ConfFax(page2, "Fax"); m_fax = new ConfFax(page2, "Fax");
TQVBox *page3 = addVBoxPage(i18n("System"), i18n("Fax System Selection"), DesktopIcon("kdeprintfax")); TQVBox *page3 = addVBoxPage(i18n("System"), i18n("Fax System Selection"), DesktopIcon("tdeprintfax"));
m_system = new ConfSystem(page3, "System"); m_system = new ConfSystem(page3, "System");
TQVBox *page4 = addVBoxPage(i18n("Filters"), i18n("Filters Configuration"), DesktopIcon("filter")); TQVBox *page4 = addVBoxPage(i18n("Filters"), i18n("Filters Configuration"), DesktopIcon("filter"));

@ -1,5 +1,5 @@
/* /*
* kdeprintfax - a small fax utility * tdeprintfax - a small fax utility
* Copyright (C) 2001 Michael Goffioul * Copyright (C) 2001 Michael Goffioul
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

@ -1,5 +1,5 @@
/* /*
* kdeprintfax - a small fax utility * tdeprintfax - a small fax utility
* Copyright (C) 2001 Michael Goffioul * Copyright (C) 2001 Michael Goffioul
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

@ -1,5 +1,5 @@
/* /*
* kdeprintfax - a small fax utility * tdeprintfax - a small fax utility
* Copyright (C) 2001 Michael Goffioul * Copyright (C) 2001 Michael Goffioul
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,5 +1,5 @@
/* /*
* kdeprintfax - a small fax utility * tdeprintfax - a small fax utility
* Copyright (C) 2001 Michael Goffioul * Copyright (C) 2001 Michael Goffioul
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

@ -1,5 +1,5 @@
/* /*
* kdeprintfax - a small fax utility * tdeprintfax - a small fax utility
* Copyright (C) 2001 Michael Goffioul * Copyright (C) 2001 Michael Goffioul
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

@ -1,5 +1,5 @@
/* /*
* kdeprintfax - a small fax utility * tdeprintfax - a small fax utility
* Copyright (C) 2001 Michael Goffioul * Copyright (C) 2001 Michael Goffioul
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

@ -1,5 +1,5 @@
/* /*
* kdeprintfax - a small fax utility * tdeprintfax - a small fax utility
* Copyright (C) 2001 Michael Goffioul * Copyright (C) 2001 Michael Goffioul
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -19,7 +19,7 @@
*/ */
#include "faxctrl.h" #include "faxctrl.h"
#include "kdeprintfax.h" #include "tdeprintfax.h"
#include "defcmds.h" #include "defcmds.h"
#include <ktextedit.h> #include <ktextedit.h>
@ -486,11 +486,11 @@ void FaxCtrl::filter()
} }
else else
{ {
TQString tmp = locateLocal("tmp","kdeprintfax_") + kapp->randomString(8); TQString tmp = locateLocal("tmp","tdeprintfax_") + kapp->randomString(8);
m_filteredfiles.prepend(tmp); m_filteredfiles.prepend(tmp);
m_tempfiles.append(tmp); m_tempfiles.append(tmp);
m_process->clearArguments(); m_process->clearArguments();
*m_process << locate("data","kdeprintfax/anytops") << "-m" << KProcess::quote(locate("data","kdeprintfax/faxfilters")) *m_process << locate("data","tdeprintfax/anytops") << "-m" << KProcess::quote(locate("data","tdeprintfax/faxfilters"))
<< TQString::tqfromLatin1("--mime=%1").arg(mimeType) << TQString::tqfromLatin1("--mime=%1").arg(mimeType)
<< "-p" << pageSize() << "-p" << pageSize()
<< KProcess::quote(m_files[0]) << KProcess::quote(tmp); << KProcess::quote(m_files[0]) << KProcess::quote(tmp);

@ -1,5 +1,5 @@
/* /*
* kdeprintfax - a small fax utility * tdeprintfax - a small fax utility
* Copyright (C) 2001 Michael Goffioul * Copyright (C) 2001 Michael Goffioul
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -25,7 +25,7 @@
#include <tqstring.h> #include <tqstring.h>
#include <tqstringlist.h> #include <tqstringlist.h>
#include "kdeprintfax.h" #include "tdeprintfax.h"
class KProcess; class KProcess;
class TQTextEdit; class TQTextEdit;

@ -1,5 +1,5 @@
/* /*
* kdeprintfax - a small fax utility * tdeprintfax - a small fax utility
* Copyright (C) 2001 Michael Goffioul * Copyright (C) 2001 Michael Goffioul
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

@ -1,5 +1,5 @@
/* /*
* kdeprintfax - a small fax utility * tdeprintfax - a small fax utility
* Copyright (C) 2001 Michael Goffioul * Copyright (C) 2001 Michael Goffioul
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

@ -1,5 +1,5 @@
/* /*
* kdeprintfax - a small fax utility * tdeprintfax - a small fax utility
* Copyright (C) 2001 Michael Goffioul * Copyright (C) 2001 Michael Goffioul
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -18,7 +18,7 @@
* *
*/ */
#include "kdeprintfax.h" #include "tdeprintfax.h"
#include "faxab.h" #include "faxab.h"
#include "faxctrl.h" #include "faxctrl.h"
#include "configdlg.h" #include "configdlg.h"
@ -106,7 +106,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)
connect( m_delbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotFaxRemove() ) ); connect( m_delbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotFaxRemove() ) );
TQLabel *m_commentlabel = new TQLabel(i18n("&Comment:"), mainw); TQLabel *m_commentlabel = new TQLabel(i18n("&Comment:"), mainw);
KSystemTray *m_tray = new KSystemTray(this); KSystemTray *m_tray = new KSystemTray(this);
m_tray->setPixmap(SmallIcon("kdeprintfax")); m_tray->setPixmap(SmallIcon("tdeprintfax"));
m_tray->show(); m_tray->show();
m_comment = new TQTextEdit(mainw); m_comment = new TQTextEdit(mainw);
// I don't understand why anyone would want to turn off word wrap. It makes // I don't understand why anyone would want to turn off word wrap. It makes
@ -604,4 +604,4 @@ bool KdeprintFax::manualFaxDialog( TQString& number, TQString& name, TQString& e
return false; return false;
} }
#include "kdeprintfax.moc" #include "tdeprintfax.moc"

@ -90,8 +90,8 @@ GenericName[zh_TW]=傳真工具
GenericName[zu]=Isisebenzi se-Fax GenericName[zu]=Isisebenzi se-Fax
Type=Application Type=Application
Exec=kdeprintfax -caption "%c" %i %m %u Exec=tdeprintfax -caption "%c" %i %m %u
Icon=kdeprintfax Icon=tdeprintfax
Terminal=false Terminal=false
X-DCOP-ServiceType=Multi X-DCOP-ServiceType=Multi
Categories=Qt;KDE;Utility;X-KDE-Utilities-Peripherals; Categories=Qt;KDE;Utility;X-KDE-Utilities-Peripherals;

@ -1,5 +1,5 @@
/* /*
* kdeprintfax - a small fax utility * tdeprintfax - a small fax utility
* Copyright (C) 2001 Michael Goffioul * Copyright (C) 2001 Michael Goffioul
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

@ -1,5 +1,5 @@
<!DOCTYPE kpartgui> <!DOCTYPE kpartgui>
<kpartgui name="kdeprintfax"> <kpartgui name="tdeprintfax">
<MenuBar> <MenuBar>
<Menu name="file"><text>&amp;File</text> <Menu name="file"><text>&amp;File</text>
<Action name="file_add" /> <Action name="file_add" />

@ -1,5 +1,5 @@
/* /*
* kdeprintfax - a interface to fax-packages * tdeprintfax - a interface to fax-packages
* Copyright (C) 2001 Michael Goffioul * Copyright (C) 2001 Michael Goffioul
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -18,7 +18,7 @@
* *
*/ */
#include "kdeprintfax.h" #include "tdeprintfax.h"
#include <tqfile.h> #include <tqfile.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
@ -30,7 +30,7 @@ TQString debugFlag;
int oneShotFlag = false; int oneShotFlag = false;
static const char description[] = static const char description[] =
I18N_NOOP("A small fax utility to be used with kdeprint."); I18N_NOOP("A small fax utility to be used with tdeprint.");
// INSERT A DESCRIPTION FOR YOUR APPLICATION HERE // INSERT A DESCRIPTION FOR YOUR APPLICATION HERE
@ -47,10 +47,10 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KAboutData aboutData( "kdeprintfax", I18N_NOOP("KdeprintFax"), KAboutData aboutData( "tdeprintfax", I18N_NOOP("KdeprintFax"),
"1.0", description, KAboutData::License_GPL, "1.0", description, KAboutData::License_GPL,
"(c), 2001 Michael Goffioul", 0, "http://printing.kde.org"); "(c), 2001 Michael Goffioul", 0, "http://printing.kde.org");
aboutData.addAuthor("Michael Goffioul",0, "kdeprint@swing.be"); aboutData.addAuthor("Michael Goffioul",0, "tdeprint@swing.be");
KCmdLineArgs::init( argc, argv, &aboutData ); KCmdLineArgs::init( argc, argv, &aboutData );
KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
KApplication::addCmdLineOptions(); KApplication::addCmdLineOptions();

@ -29,9 +29,9 @@ install( FILES kjobviewer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
install( FILES kjobviewerui.rc DESTINATION ${DATA_INSTALL_DIR}/kjobviewer ) install( FILES kjobviewerui.rc DESTINATION ${DATA_INSTALL_DIR}/kjobviewer )
##### kjobviewer (kdeinit) ###################### ##### kjobviewer (tdeinit) ######################
tde_add_kdeinit_executable( kjobviewer AUTOMOC tde_add_tdeinit_executable( kjobviewer AUTOMOC
SOURCES kjobviewer.cpp main.cpp SOURCES kjobviewer.cpp main.cpp
LINK kdeprint_management-shared LINK tdeprint_management-shared
) )

@ -4,11 +4,11 @@ INCLUDES = $(all_includes)
bin_PROGRAMS= bin_PROGRAMS=
lib_LTLIBRARIES= lib_LTLIBRARIES=
kdeinit_LTLIBRARIES = kjobviewer.la tdeinit_LTLIBRARIES = kjobviewer.la
kjobviewer_la_SOURCES = kjobviewer.cpp main.cpp kjobviewer_la_SOURCES = kjobviewer.cpp main.cpp
kjobviewer_la_METASOURCES = AUTO kjobviewer_la_METASOURCES = AUTO
kjobviewer_la_LIBADD = -lkdeprint_management $(LIB_KDEUI) kjobviewer_la_LIBADD = -ltdeprint_management $(LIB_KDEUI)
kjobviewer_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH) kjobviewer_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH)
noinst_HEADERS = kjobviewer.h noinst_HEADERS = kjobviewer.h

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -18,9 +18,9 @@
**/ **/
#include "kjobviewer.h" #include "kjobviewer.h"
#include <kdeprint/kmjobviewer.h> #include <tdeprint/kmjobviewer.h>
#include <kdeprint/kmtimer.h> #include <tdeprint/kmtimer.h>
#include <kdeprint/kmmanager.h> #include <tdeprint/kmmanager.h>
#include <stdlib.h> #include <stdlib.h>
#include <tqpixmap.h> #include <tqpixmap.h>

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -21,7 +21,7 @@
#define KJOBVIEWER_H #define KJOBVIEWER_H
#include <kuniqueapplication.h> #include <kuniqueapplication.h>
#include <kdeprint/kpreloadobject.h> #include <tdeprint/kpreloadobject.h>
#include <tqdict.h> #include <tqdict.h>
class KMJobViewer; class KMJobViewer;

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -36,7 +36,7 @@ static KCmdLineOptions options[] = {
extern "C" int KDE_EXPORT kdemain(int argc, char *argv[]) extern "C" int KDE_EXPORT kdemain(int argc, char *argv[])
{ {
KAboutData aboutData("kjobviewer",I18N_NOOP("KJobViewer"),"0.1",I18N_NOOP("A print job viewer"),KAboutData::License_GPL,"(c) 2001, Michael Goffioul", 0, "http://printing.kde.org"); KAboutData aboutData("kjobviewer",I18N_NOOP("KJobViewer"),"0.1",I18N_NOOP("A print job viewer"),KAboutData::License_GPL,"(c) 2001, Michael Goffioul", 0, "http://printing.kde.org");
aboutData.addAuthor("Michael Goffioul",0,"kdeprint@swing.be"); aboutData.addAuthor("Michael Goffioul",0,"tdeprint@swing.be");
KCmdLineArgs::init(argc,argv,&aboutData); KCmdLineArgs::init(argc,argv,&aboutData);
KCmdLineArgs::addCmdLineOptions(options); KCmdLineArgs::addCmdLineOptions(options);
KJobViewerApp::addCmdLineOptions(); KJobViewerApp::addCmdLineOptions();

@ -26,9 +26,9 @@ link_directories(
) )
##### kprinter (kdeinit) ######################## ##### kprinter (tdeinit) ########################
tde_add_kdeinit_executable( kprinter AUTOMOC tde_add_tdeinit_executable( kprinter AUTOMOC
SOURCES main.cpp printwrapper.cpp SOURCES main.cpp printwrapper.cpp
LINK kdeprint-shared LINK tdeprint-shared
) )

@ -4,10 +4,10 @@ INCLUDES = $(all_includes)
bin_PROGRAMS = bin_PROGRAMS =
lib_LTLIBRARIES = lib_LTLIBRARIES =
kdeinit_LTLIBRARIES = kprinter.la tdeinit_LTLIBRARIES = kprinter.la
kprinter_la_SOURCES = main.cpp printwrapper.cpp kprinter_la_SOURCES = main.cpp printwrapper.cpp
kprinter_la_LIBADD = -lkdeprint kprinter_la_LIBADD = -ltdeprint
kprinter_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH) kprinter_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH)
kprinter_la_METASOURCES = AUTO kprinter_la_METASOURCES = AUTO

@ -3,7 +3,7 @@ Exec=kprinter
Icon=kjobviewer Icon=kjobviewer
Terminal=false Terminal=false
Type=Application Type=Application
DocPath=kdeprint/index.html DocPath=tdeprint/index.html
X-KDE-StartupNotify=true X-KDE-StartupNotify=true
Name=KPrinter Name=KPrinter
Name[af]=KDrukker Name[af]=KDrukker

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -42,9 +42,9 @@
#include <ktempfile.h> #include <ktempfile.h>
#include <kprinter.h> #include <kprinter.h>
#include <kdeprint/kmmanager.h> #include <tdeprint/kmmanager.h>
#include <kdeprint/kmprinter.h> #include <tdeprint/kmprinter.h>
#include <kdeprint/kprintdialog.h> #include <tdeprint/kprintdialog.h>
void signal_handler(int); void signal_handler(int);
TQString tempFile; TQString tempFile;

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -32,6 +32,6 @@ install( FILES printers.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
tde_add_kpart( kcm_printmgr AUTOMOC tde_add_kpart( kcm_printmgr AUTOMOC
SOURCES kcmprintmgr.cpp SOURCES kcmprintmgr.cpp
LINK kdeprint_management-shared LINK tdeprint_management-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_printmgr.la
kcm_printmgr_la_SOURCES = kcmprintmgr.cpp kcm_printmgr_la_SOURCES = kcmprintmgr.cpp
kcm_printmgr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined kcm_printmgr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_printmgr_la_LIBADD = -lkdeprint_management kcm_printmgr_la_LIBADD = -ltdeprint_management
noinst_HEADERS = kcmprintmgr.h noinst_HEADERS = kcmprintmgr.h

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -18,7 +18,7 @@
**/ **/
#include "kcmprintmgr.h" #include "kcmprintmgr.h"
#include "kdeprint/kmmainview.h" #include "tdeprint/kmmainview.h"
#include <tqlayout.h> #include <tqlayout.h>
@ -51,7 +51,7 @@ KCMPrintMgr::KCMPrintMgr(TQWidget *parent, const char *name, const TQStringList
new KAboutData(I18N_NOOP("kcmprintmgr"), I18N_NOOP("KDE Printing Management"), new KAboutData(I18N_NOOP("kcmprintmgr"), I18N_NOOP("KDE Printing Management"),
0, 0, KAboutData::License_GPL, 0, 0, KAboutData::License_GPL,
I18N_NOOP("(c) 2000 - 2002 Michael Goffioul")); I18N_NOOP("(c) 2000 - 2002 Michael Goffioul"));
about->addAuthor("Michael Goffioul", 0, "kdeprint@swing.be"); about->addAuthor("Michael Goffioul", 0, "tdeprint@swing.be");
setAboutData(about); setAboutData(about);
} }

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -2,7 +2,7 @@
Exec=kcmshell printers Exec=kcmshell printers
Icon=printmgr Icon=printmgr
Type=Application Type=Application
DocPath=kdeprint/index.html DocPath=tdeprint/index.html
MimeType=print/manager; MimeType=print/manager;
X-KDE-ModuleType=Library X-KDE-ModuleType=Library

@ -34,6 +34,6 @@ install( FILES print.protocol printdb.protocol DESTINATION ${SERVICES_INSTALL_DI
tde_add_kpart( kio_print AUTOMOC tde_add_kpart( kio_print AUTOMOC
SOURCES kio_print.cpp SOURCES kio_print.cpp
LINK kdeprint-shared LINK tdeprint-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -7,7 +7,7 @@ INCLUDES= $(all_includes)
kde_module_LTLIBRARIES = kio_print.la kde_module_LTLIBRARIES = kio_print.la
kio_print_la_SOURCES = kio_print.cpp kio_print_la_SOURCES = kio_print.cpp
kio_print_la_LIBADD = $(LIB_KIO) -lkdeprint kio_print_la_LIBADD = $(LIB_KIO) -ltdeprint
kio_print_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) kio_print_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
METASOURCES = AUTO METASOURCES = AUTO

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -18,11 +18,11 @@
**/ **/
#include "kio_print.h" #include "kio_print.h"
#include <kdeprint/kmprinter.h> #include <tdeprint/kmprinter.h>
#include <kdeprint/kmmanager.h> #include <tdeprint/kmmanager.h>
#include <kdeprint/kmjobmanager.h> #include <tdeprint/kmjobmanager.h>
#include <kdeprint/kmjob.h> #include <tdeprint/kmjob.h>
#include <kdeprint/driver.h> #include <tdeprint/driver.h>
#include <tqfile.h> #include <tqfile.h>
#include <tqtextstream.h> #include <tqtextstream.h>
@ -755,7 +755,7 @@ void KIO_Print::showSpecialInfo(KMPrinter *printer)
bool KIO_Print::loadTemplate(const TQString& filename, TQString& buffer) bool KIO_Print::loadTemplate(const TQString& filename, TQString& buffer)
{ {
TQFile f(locate("data", TQString::tqfromLatin1("kdeprint/template/")+filename)); TQFile f(locate("data", TQString::tqfromLatin1("tdeprint/template/")+filename));
if (f.exists() && f.open(IO_ReadOnly)) if (f.exists() && f.open(IO_ReadOnly))
{ {
TQTextStream t(&f); TQTextStream t(&f);
@ -789,12 +789,12 @@ void KIO_Print::showData(const TQString& pathname)
/** /**
* Locate a data in this order: * Locate a data in this order:
* - $KDEDIR/share/apps/kdeprint/template/ * - $KDEDIR/share/apps/tdeprint/template/
* - as a desktop icon * - as a desktop icon
*/ */
TQString KIO_Print::locateData(const TQString& item) TQString KIO_Print::locateData(const TQString& item)
{ {
TQString path = locate("data", "kdeprint/template/"+item); TQString path = locate("data", "tdeprint/template/"+item);
if (path.isEmpty()) if (path.isEmpty())
path = KGlobal::iconLoader()->iconPath(item, KIcon::Desktop, true); path = KGlobal::iconLoader()->iconPath(item, KIcon::Desktop, true);
return path; return path;

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2001 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2001 Michael Goffioul <tdeprint@swing.be>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public

@ -16,10 +16,10 @@ install( FILES
box-top-middle.png bar-bottom-middle.png box-top-middle.png bar-bottom-middle.png
bar-top-right.png box-bottom-right.png bar-top-right.png box-bottom-right.png
box-top-right.png bar-bottom-right.png box-top-right.png bar-bottom-right.png
bottom-left.png box-centre-kdeprint.png bottom-left.png box-centre-tdeprint.png
top-left.png bar-middle-left.png bottom-middle.png top-left.png bar-middle-left.png bottom-middle.png
box-middle-left.png top-middle.png bar-middle-right.png box-middle-left.png top-middle.png bar-middle-right.png
bottom-right.png box-middle-right.png top-right-kdeprint.png bottom-right.png box-middle-right.png top-right-tdeprint.png
bar-top-left.png box-bottom-left.png box-top-left.png bar-top-left.png box-bottom-left.png box-top-left.png
htmlstyles.css htmlstyles.css
DESTINATION ${DATA_INSTALL_DIR}/kdeprint/template ) DESTINATION ${DATA_INSTALL_DIR}/tdeprint/template )

@ -13,7 +13,7 @@ template_DATA = class.template \
box-top-right.png \ box-top-right.png \
bar-bottom-right.png \ bar-bottom-right.png \
bottom-left.png \ bottom-left.png \
box-centre-kdeprint.png \ box-centre-tdeprint.png \
top-left.png \ top-left.png \
bar-middle-left.png \ bar-middle-left.png \
bottom-middle.png \ bottom-middle.png \
@ -22,10 +22,10 @@ template_DATA = class.template \
bar-middle-right.png \ bar-middle-right.png \
bottom-right.png \ bottom-right.png \
box-middle-right.png \ box-middle-right.png \
top-right-kdeprint.png \ top-right-tdeprint.png \
bar-top-left.png \ bar-top-left.png \
box-bottom-left.png \ box-bottom-left.png \
box-top-left.png \ box-top-left.png \
htmlstyles.css htmlstyles.css
templatedir = $(kde_datadir)/kdeprint/template templatedir = $(kde_datadir)/tdeprint/template

@ -22,7 +22,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;}
<div style= <div style=
"background-image: url(top-middle.png); width: 100%; height: 131px;"> "background-image: url(top-middle.png); width: 100%; height: 131px;">
<div style="position: absolute; right: 0px;"> <div style="position: absolute; right: 0px;">
<img src="top-right-kdeprint.png" style="margin: 0px" alt="" /> <img src="top-right-tdeprint.png" style="margin: 0px" alt="" />
</div> </div>
<div style="position: absolute; left: 0px;"> <div style="position: absolute; left: 0px;">
@ -88,7 +88,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;}
<div style= <div style=
"width: 100%; background-image: url(box-middle-left.png); background-repeat: repeat-y; text-align: center"> "width: 100%; background-image: url(box-middle-left.png); background-repeat: repeat-y; text-align: center">
<div style= <div style=
"background-image: url(box-centre-kdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;"> "background-image: url(box-centre-tdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;">
<h2 style="margin-top: 0px;"><img src="%1" width="32" height="32"/>&nbsp;%1<!--Title--></h2> <h2 style="margin-top: 0px;"><img src="%1" width="32" height="32"/>&nbsp;%1<!--Title--></h2>
<table border="1" cellspacing="0" cellpadding="1" width="100%"> <table border="1" cellspacing="0" cellpadding="1" width="100%">

@ -22,7 +22,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;}
<div style= <div style=
"background-image: url(top-middle.png); width: 100%; height: 131px;"> "background-image: url(top-middle.png); width: 100%; height: 131px;">
<div style="position: absolute; right: 0px;"> <div style="position: absolute; right: 0px;">
<img src="top-right-kdeprint.png" style="margin: 0px" alt="" /> <img src="top-right-tdeprint.png" style="margin: 0px" alt="" />
</div> </div>
<div style="position: absolute; left: 0px;"> <div style="position: absolute; left: 0px;">
@ -88,7 +88,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;}
<div style= <div style=
"width: 100%; background-image: url(box-middle-left.png); background-repeat: repeat-y; text-align: center"> "width: 100%; background-image: url(box-middle-left.png); background-repeat: repeat-y; text-align: center">
<div style= <div style=
"background-image: url(box-centre-kdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;"> "background-image: url(box-centre-tdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;">
<h2 style="margin-top: 0px;"><img src="%1" width="32" height="32"/>&nbsp;%1<!--Title--></h2> <h2 style="margin-top: 0px;"><img src="%1" width="32" height="32"/>&nbsp;%1<!--Title--></h2>
<table border="1" cellspacing="0" cellpadding="1" width="100%"> <table border="1" cellspacing="0" cellpadding="1" width="100%">

@ -22,7 +22,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;}
<div style= <div style=
"background-image: url(top-middle.png); width: 100%; height: 131px;"> "background-image: url(top-middle.png); width: 100%; height: 131px;">
<div style="position: absolute; right: 0px;"> <div style="position: absolute; right: 0px;">
<img src="top-right-kdeprint.png" style="margin: 0px" alt="" /> <img src="top-right-tdeprint.png" style="margin: 0px" alt="" />
</div> </div>
<div style="position: absolute; left: 0px;"> <div style="position: absolute; left: 0px;">
@ -88,7 +88,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;}
<div style= <div style=
"width: 100%; background-image: url(box-middle-left.png); background-repeat: repeat-y; text-align: center"> "width: 100%; background-image: url(box-middle-left.png); background-repeat: repeat-y; text-align: center">
<div style= <div style=
"background-image: url(box-centre-kdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;"> "background-image: url(box-centre-tdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;">
<h2 style="margin-top: 0px;"><img src="%1" width="32" height="32"/>&nbsp;%1<!--Title--></h2> <h2 style="margin-top: 0px;"><img src="%1" width="32" height="32"/>&nbsp;%1<!--Title--></h2>
<table border="1" cellspacing="0" cellpadding="1" width="100%"> <table border="1" cellspacing="0" cellpadding="1" width="100%">

@ -22,7 +22,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;}
<div style= <div style=
"background-image: url(top-middle.png); width: 100%; height: 131px;"> "background-image: url(top-middle.png); width: 100%; height: 131px;">
<div style="position: absolute; right: 0px;"> <div style="position: absolute; right: 0px;">
<img src="top-right-kdeprint.png" style="margin: 0px" alt="" /> <img src="top-right-tdeprint.png" style="margin: 0px" alt="" />
</div> </div>
<div style="position: absolute; left: 0px;"> <div style="position: absolute; left: 0px;">
@ -88,7 +88,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;}
<div style= <div style=
"width: 100%; background-image: url(box-middle-left.png); background-repeat: repeat-y; text-align: center"> "width: 100%; background-image: url(box-middle-left.png); background-repeat: repeat-y; text-align: center">
<div style= <div style=
"background-image: url(box-centre-kdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;"> "background-image: url(box-centre-tdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;">
<h2 style="margin-top: 0px;"><img src="%1" width="32" height="32"/>&nbsp;%1<!--Title--></h2> <h2 style="margin-top: 0px;"><img src="%1" width="32" height="32"/>&nbsp;%1<!--Title--></h2>
<table border="1" cellspacing="0" cellpadding="1" width="100%"> <table border="1" cellspacing="0" cellpadding="1" width="100%">

@ -22,7 +22,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;}
<div style= <div style=
"background-image: url(top-middle.png); width: 100%; height: 131px;"> "background-image: url(top-middle.png); width: 100%; height: 131px;">
<div style="position: absolute; right: 0px;"> <div style="position: absolute; right: 0px;">
<img src="top-right-kdeprint.png" style="margin: 0px" alt="" /> <img src="top-right-tdeprint.png" style="margin: 0px" alt="" />
</div> </div>
<div style="position: absolute; left: 0px;"> <div style="position: absolute; left: 0px;">
@ -88,7 +88,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;}
<div style= <div style=
"width: 100%; background-image: url(box-middle-left.png); background-repeat: repeat-y; text-align: center"> "width: 100%; background-image: url(box-middle-left.png); background-repeat: repeat-y; text-align: center">
<div style= <div style=
"background-image: url(box-centre-kdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;"> "background-image: url(box-centre-tdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;">
<h2 style="margin-top: 0px;"><img src="%1" width="32" height="32"/>&nbsp;%1<!--Title--></h2> <h2 style="margin-top: 0px;"><img src="%1" width="32" height="32"/>&nbsp;%1<!--Title--></h2>
<table border="1" cellspacing="0" cellpadding="1" width="100%"> <table border="1" cellspacing="0" cellpadding="1" width="100%">

@ -72,7 +72,7 @@ tde_add_executable( kxdglauncher
) )
##### kdesktop (kdeinit) ######################## ##### kdesktop (tdeinit) ########################
set( target kdesktop ) set( target kdesktop )
@ -86,7 +86,7 @@ set( ${target}_SRCS
kfileividesktop.cpp kdesktopapp.cpp kfileividesktop.cpp kdesktopapp.cpp
) )
tde_add_kdeinit_executable( ${target} AUTOMOC tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK LINK
kdesktopsettings-static bgnd-static dmctl-static kdesktopsettings-static bgnd-static dmctl-static

@ -37,7 +37,7 @@ lock* : screen saver/locker
Libs used by KDesktop Libs used by KDesktop
====================== ======================
kdecore, kdeui, kfile - usual stuff :) tdecore, tdeui, kfile - usual stuff :)
libkio - I/O stuff, mimetypes, services, registry libkio - I/O stuff, mimetypes, services, registry
libkonq - properties dialog, templates ("new") menu, dir lister, settings libkonq - properties dialog, templates ("new") menu, dir lister, settings

@ -10,7 +10,7 @@ SUBDIRS = . lock pics patterns programs init kwebdesktop
bin_PROGRAMS = kcheckrunning kxdglauncher bin_PROGRAMS = kcheckrunning kxdglauncher
lib_LTLIBRARIES = lib_LTLIBRARIES =
kdeinit_LTLIBRARIES = kdesktop.la tdeinit_LTLIBRARIES = kdesktop.la
noinst_LTLIBRARIES = libkdesktopsettings.la noinst_LTLIBRARIES = libkdesktopsettings.la
libkdesktopsettings_la_LDFLAGS = $(all_libraries) -no-undefined libkdesktopsettings_la_LDFLAGS = $(all_libraries) -no-undefined

@ -80,7 +80,7 @@ class KShadowEngine
TQImage makeShadow(const TQPixmap& textPixmap, const TQColor &bgColor); TQImage makeShadow(const TQPixmap& textPixmap, const TQColor &bgColor);
private: private:
// No static objects in libs, and no static deleters in kdefx... // No static objects in libs, and no static deleters in tdefx...
//static KShadowSettings s_defaultShadowSettings; //static KShadowSettings s_defaultShadowSettings;
KShadowSettings *m_shadowSettings; KShadowSettings *m_shadowSettings;

@ -7,7 +7,7 @@ bin_PROGRAMS = kwebdesktop
METASOURCES = AUTO METASOURCES = AUTO
kwebdesktop_SOURCES = kwebdesktop.cpp kwebdesktopsettings.kcfgc kwebdesktop_SOURCES = kwebdesktop.cpp kwebdesktopsettings.kcfgc
kwebdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kwebdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kdesktop_kwebdesktop_data_DATA = kwebdesktop.desktop kdesktop_kwebdesktop_data_DATA = kwebdesktop.desktop
kdesktop_kwebdesktop_datadir = $(kde_datadir)/kdesktop/programs kdesktop_kwebdesktop_datadir = $(kde_datadir)/kdesktop/programs

@ -1,7 +1,7 @@
## Makefile.am of kdebase/kdesktop/lock ## Makefile.am of kdebase/kdesktop/lock
INCLUDES = -I.. -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/kdmlib $(GLINC) $(all_includes) INCLUDES = -I.. -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/kdmlib $(GLINC) $(all_includes)
kdesktop_lock_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kdesktop_lock_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kdesktop_lock_LDADD = ../libkdesktopsettings.la ../../kdmlib/libdmctl.la $(LIB_KIO) $(LIB_XF86MISC) $(GLLIB) kdesktop_lock_LDADD = ../libkdesktopsettings.la ../../kdmlib/libdmctl.la $(LIB_KIO) $(LIB_XF86MISC) $(GLLIB)
####### Files ####### Files

@ -18,7 +18,7 @@
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kconfig.h> #include <kconfig.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kdesu/defaults.h> #include <tdesu/defaults.h>
#include <kpassdlg.h> #include <kpassdlg.h>
#include <kdebug.h> #include <kdebug.h>
#include <kuser.h> #include <kuser.h>

@ -23,7 +23,7 @@
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kconfig.h> #include <kconfig.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kdesu/defaults.h> #include <tdesu/defaults.h>
#include <kpassdlg.h> #include <kpassdlg.h>
#include <kdebug.h> #include <kdebug.h>
#include <kuser.h> #include <kuser.h>

@ -18,7 +18,7 @@
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kconfig.h> #include <kconfig.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kdesu/defaults.h> #include <tdesu/defaults.h>
#include <kpassdlg.h> #include <kpassdlg.h>
#include <kdebug.h> #include <kdebug.h>
#include <kuser.h> #include <kuser.h>

@ -18,7 +18,7 @@
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kconfig.h> #include <kconfig.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kdesu/defaults.h> #include <tdesu/defaults.h>
#include <kpassdlg.h> #include <kpassdlg.h>
#include <kdebug.h> #include <kdebug.h>
#include <kuser.h> #include <kuser.h>

@ -18,7 +18,7 @@
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kconfig.h> #include <kconfig.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kdesu/defaults.h> #include <tdesu/defaults.h>
#include <kpassdlg.h> #include <kpassdlg.h>
#include <kdebug.h> #include <kdebug.h>
#include <kuser.h> #include <kuser.h>

@ -58,7 +58,7 @@
#include <kpassdlg.h> #include <kpassdlg.h>
#include <krun.h> #include <krun.h>
#include <kwin.h> #include <kwin.h>
#include <kdesu/su.h> #include <tdesu/su.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kconfig.h> #include <kconfig.h>
#include <kiconloader.h> #include <kiconloader.h>
@ -544,7 +544,7 @@ int Minicli::runCommand()
// through SuProcess without providing the user password // through SuProcess without providing the user password
if (m_iPriority < 50) if (m_iPriority < 50)
{ {
// from kdesu_stub.c // from tdesu_stub.c
int val = 20 - (int) (((double) m_iPriority) * 40 / 100 + 0.5); int val = 20 - (int) (((double) m_iPriority) * 40 / 100 + 0.5);
cmd = "nice -n " + TQString::number( val ) + " " + cmd; cmd = "nice -n " + TQString::number( val ) + " " + cmd;
} }

@ -49,5 +49,5 @@ else()
set( DEFAULT_SUPER_USER_COMMAND su CACHE INTERNAL "" FORCE ) set( DEFAULT_SUPER_USER_COMMAND su CACHE INTERNAL "" FORCE )
endif() endif()
add_subdirectory( kdesu ) add_subdirectory( tdesu )
add_subdirectory( kdesud ) add_subdirectory( tdesud )

@ -8,7 +8,7 @@ Wed, 26 Jan 00 Geert Jansen <g.t.jansen@stud.tue.nl>
Sat, 18 Dec 99 Geert Jansen <g.t.jansen@stud.tue.nl> Sat, 18 Dec 99 Geert Jansen <g.t.jansen@stud.tue.nl>
* Add DCOP authentication cookies. * Add DCOP authentication cookies.
* Fixed SMP install of kdesud. * Fixed SMP install of tdesud.
Sat, 23 Oct 99 Geert Jansen <g.t.jansen@stud.tue.nl> Sat, 23 Oct 99 Geert Jansen <g.t.jansen@stud.tue.nl>
@ -17,14 +17,14 @@ Sat, 23 Oct 99 Geert Jansen <g.t.jansen@stud.tue.nl>
Tue, 28 Sep 99 Geert Jansen <g.t.jansen@stud.tue.nl> Tue, 28 Sep 99 Geert Jansen <g.t.jansen@stud.tue.nl>
* Integrating kdesu into kdebase * Integrating tdesu into kdebase
Sat, 25 Sep 99 Geert Jansen <g.t.jansen@stud.tue.nl> Sat, 25 Sep 99 Geert Jansen <g.t.jansen@stud.tue.nl>
* BIG change: su to other user than root. This required a different way * BIG change: su to other user than root. This required a different way
to pass X cookies and stuff to the target process. See to pass X cookies and stuff to the target process. See
common/kdesu_stub.c for more info. common/tdesu_stub.c for more info.
* Fixed a bug in kdesud/lexer.cpp * Fixed a bug in tdesud/lexer.cpp
Thu, 23 Sep 99 Geert Jansen <g.t.jansen@stud.tue.nl> Thu, 23 Sep 99 Geert Jansen <g.t.jansen@stud.tue.nl>
@ -32,7 +32,7 @@ Thu, 23 Sep 99 Geert Jansen <g.t.jansen@stud.tue.nl>
* The execution of processes is more efficient now: 2 processess instead * The execution of processes is more efficient now: 2 processess instead
of 3 and 1 tempfile instead of 2. This way possible by setting the of 3 and 1 tempfile instead of 2. This way possible by setting the
XAUTHORITY env. var. to $HOME/.Xauthority instead of making a new one. XAUTHORITY env. var. to $HOME/.Xauthority instead of making a new one.
* Fixed a subtle bug in kdesud. kdesud catches SIGCHLD to handle child * Fixed a subtle bug in tdesud. tdesud catches SIGCHLD to handle child
exits but this is incompatible with "class RootProcess", which does a exits but this is incompatible with "class RootProcess", which does a
waitpid() and depends on getting the exit code. waitpid() and depends on getting the exit code.
* Only connect to daemon when necessary. * Only connect to daemon when necessary.
@ -46,11 +46,11 @@ Wed, 22 Sep 99 Geert Jansen <g.t.jansen@stud.tue.nl>
Wed, 8 Sep 99 Geert Jansen <g.t.jansen@stud.tue.nl> Wed, 8 Sep 99 Geert Jansen <g.t.jansen@stud.tue.nl>
* If started as root, kdesu does not ask for a password anymore. * If started as root, tdesu does not ask for a password anymore.
Wed, 1 Sep 99 Geert Jansen <g.t.jansen@stud.tue.nl> Wed, 1 Sep 99 Geert Jansen <g.t.jansen@stud.tue.nl>
* Deferred instantiation of kapp in kdesu.cpp. * Deferred instantiation of kapp in tdesu.cpp.
* Finished porting to KDE2. * Finished porting to KDE2.
Sun, 29 Aug 99 Geert Jansen <g.t.jansen@stud.tue.nl> Sun, 29 Aug 99 Geert Jansen <g.t.jansen@stud.tue.nl>
@ -114,7 +114,7 @@ Thu, 20 May 99 Geert Jansen <g.t.jansen@stud.tue.nl>
Fri, 09 Apr 99 Geert Jansen <g.t.jansen@stud.tue.nl> Fri, 09 Apr 99 Geert Jansen <g.t.jansen@stud.tue.nl>
* Backport to KDE 1.1. Release as kdesu-0.9.tar.gz * Backport to KDE 1.1. Release as tdesu-0.9.tar.gz
Mon, 22 Mar 99 Geert Jansen <g.t.jansen@stud.tue.nl> Mon, 22 Mar 99 Geert Jansen <g.t.jansen@stud.tue.nl>

@ -9,11 +9,11 @@ A: No program is 100% safe. However, KDE su is not setuid root and it
Q: How safe is password keeping? Q: How safe is password keeping?
A: Enabling password keeping is less secure that disabling it. However, the A: Enabling password keeping is less secure that disabling it. However, the
scheme kdesu uses to keep passwords prevents everyone (including you, the scheme tdesu uses to keep passwords prevents everyone (including you, the
user) from accessing them. Please see the HTML documentation for a full user) from accessing them. Please see the HTML documentation for a full
description of this scheme. description of this scheme.
Q: Can I execute tty applications with kdesu? Q: Can I execute tty applications with tdesu?
A: No. TTY application will probably never be supported. Use the Unix su for A: No. TTY application will probably never be supported. Use the Unix su for
those. those.
NOTE: As of version 0.94, tty _output_ _only_ is supported with the `-t' NOTE: As of version 0.94, tty _output_ _only_ is supported with the `-t'
@ -32,7 +32,7 @@ A: KDE su needs to setup a pty/tty pair for communicating with `su'. This is
that is not a tty. Setting up a pty/tty pair is not completely portable. that is not a tty. Setting up a pty/tty pair is not completely portable.
Q: A good debug tip? Q: A good debug tip?
A: If kdesu doesn't fire up your application, use the '-t' switch. A: If tdesu doesn't fire up your application, use the '-t' switch.
This way, you'll get terminal output. Maybe there is something wrong with This way, you'll get terminal output. Maybe there is something wrong with
the program you're trying to run. the program you're trying to run.

@ -1,4 +1,4 @@
kdesu - a KDE front end to su tdesu - a KDE front end to su
Copyright (c) 1998 by Pietro Iglio <iglio@fub.it> Copyright (c) 1998 by Pietro Iglio <iglio@fub.it>
Copyright (c) 1999,2000 by Geert Jansen <jansen@kde.org> Copyright (c) 1999,2000 by Geert Jansen <jansen@kde.org>

@ -1 +1 @@
SUBDIRS = kdesu kdesud SUBDIRS = tdesu tdesud

@ -10,8 +10,8 @@ What is it?
Usage: Usage:
$ kdesu -h $ tdesu -h
$ kdesu -c konsole $ tdesu -c konsole
Please see the HTML documentation! Please see the HTML documentation!

@ -46,17 +46,17 @@ AC_MSG_RESULT($nogroup)
AC_SUBST(nogroup) AC_SUBST(nogroup)
AC_CHECK_FUNCS(getpeereid) AC_CHECK_FUNCS(getpeereid)
AC_ARG_WITH(sudo-kdesu-backend, AC_ARG_WITH(sudo-tdesu-backend,
AC_HELP_STRING([--with-sudo-kdesu-backend], AC_HELP_STRING([--with-sudo-tdesu-backend],
[use sudo as backend for kdesu (default is su)]), [use sudo as backend for tdesu (default is su)]),
[ [
if test x$withval = xyes; then if test x$withval = xyes; then
use_kdesu_backend="sudo" use_tdesu_backend="sudo"
else else
use_kdesu_backend="su" use_tdesu_backend="su"
fi fi
], ],
use_kdesu_backend="su" use_tdesu_backend="su"
) )
AC_DEFINE_UNQUOTED(DEFAULT_SUPER_USER_COMMAND, "$use_kdesu_backend", [Use su or sudo]) AC_DEFINE_UNQUOTED(DEFAULT_SUPER_USER_COMMAND, "$use_tdesu_backend", [Use su or sudo])

@ -21,10 +21,10 @@ link_directories(
) )
##### kdesu (executable) ######################## ##### tdesu (executable) ########################
tde_add_executable( kdesu AUTOMOC tde_add_executable( tdesu AUTOMOC
SOURCES kdesu.cpp sudlg.cpp SOURCES tdesu.cpp sudlg.cpp
LINK kdesu-shared kio-shared LINK tdesu-shared kio-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -1,15 +1,15 @@
## Makefile.am for kdesu by Geert Jansen ## Makefile.am for tdesu by Geert Jansen
INCLUDES= $(all_includes) INCLUDES= $(all_includes)
## kdesu ## tdesu
bin_PROGRAMS = kdesu bin_PROGRAMS = tdesu
kdesu_SOURCES = kdesu.cpp sudlg.cpp tdesu_SOURCES = tdesu.cpp sudlg.cpp
kdesu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor tdesu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kdesu_LDADD = $(LIB_KIO) -lkdesu tdesu_LDADD = $(LIB_KIO) -ltdesu
kdesu_METASOURCES = AUTO tdesu_METASOURCES = AUTO
noinst_HEADERS = sudlg.h noinst_HEADERS = sudlg.h
## Messages ## Messages
messages: messages:
$(XGETTEXT) $(kdesu_SOURCES) -o $(podir)/kdesu.pot $(XGETTEXT) $(tdesu_SOURCES) -o $(podir)/tdesu.pot

@ -1,6 +1,6 @@
/* vi: ts=8 sts=4 sw=4 /* vi: ts=8 sts=4 sw=4
* *
* This file is part of the KDE project, module kdesu. * This file is part of the KDE project, module tdesu.
* Copyright (C) 1998 Pietro Iglio <iglio@fub.it> * Copyright (C) 1998 Pietro Iglio <iglio@fub.it>
* Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org> * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
*/ */
@ -39,9 +39,9 @@
#include <krun.h> #include <krun.h>
#include <kuser.h> #include <kuser.h>
#include <kdesu/defaults.h> #include <tdesu/defaults.h>
#include <kdesu/su.h> #include <tdesu/su.h>
#include <kdesu/client.h> #include <tdesu/client.h>
#include "sudlg.h" #include "sudlg.h"
@ -96,7 +96,7 @@ int main(int argc, char *argv[])
if (duser && duser[0]) if (duser && duser[0])
options[3].def = duser; options[3].def = duser;
KAboutData aboutData("kdesu", I18N_NOOP("KDE su"), KAboutData aboutData("tdesu", I18N_NOOP("KDE su"),
Version, I18N_NOOP("Runs a program with elevated privileges."), Version, I18N_NOOP("Runs a program with elevated privileges."),
KAboutData::License_Artistic, KAboutData::License_Artistic,
"Copyright (c) 1998-2000 Geert Jansen, Pietro Iglio"); "Copyright (c) 1998-2000 Geert Jansen, Pietro Iglio");
@ -108,7 +108,7 @@ int main(int argc, char *argv[])
KCmdLineArgs::init(argc, argv, &aboutData); KCmdLineArgs::init(argc, argv, &aboutData);
KCmdLineArgs::addCmdLineOptions(options); KCmdLineArgs::addCmdLineOptions(options);
KApplication::disableAutoDcopRegistration(); KApplication::disableAutoDcopRegistration();
// kdesu doesn't process SM events, so don't even connect to ksmserver // tdesu doesn't process SM events, so don't even connect to ksmserver
TQCString session_manager = getenv( "SESSION_MANAGER" ); TQCString session_manager = getenv( "SESSION_MANAGER" );
unsetenv( "SESSION_MANAGER" ); unsetenv( "SESSION_MANAGER" );
KApplication app; KApplication app;
@ -272,7 +272,7 @@ static int startApp()
just_started = true; just_started = true;
} }
// Try to exec the command with kdesud. // Try to exec the command with tdesud.
bool keep = !args->isSet("n") && have_daemon; bool keep = !args->isSet("n") && have_daemon;
bool terminal = true; bool terminal = true;
bool new_dcop = args->isSet("newdcop"); bool new_dcop = args->isSet("newdcop");

@ -1,6 +1,6 @@
/* vi: ts=8 sts=4 sw=4 /* vi: ts=8 sts=4 sw=4
* *
* This file is part of the KDE project, module kdesu. * This file is part of the KDE project, module tdesu.
* Copyright (C) 2000 Geert Jansen <jansen@kde.org> * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
*/ */
@ -11,7 +11,7 @@
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kdesu/su.h> #include <tdesu/su.h>
#include "sudlg.h" #include "sudlg.h"
KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton) KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton)

@ -1,6 +1,6 @@
/* vi: ts=8 sts=4 sw=4 /* vi: ts=8 sts=4 sw=4
* *
* This file is part of the KDE project, module kdesu. * This file is part of the KDE project, module tdesu.
* Copyright (C) 2000 Geert Jansen <jansen@kde.org> * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
*/ */

@ -23,13 +23,13 @@ link_directories(
) )
##### kdesud (executable) ####################### ##### tdesud (executable) #######################
tde_add_executable( kdesud tde_add_executable( tdesud
SOURCES kdesud.cpp repo.cpp lexer.cpp handler.cpp secure.cpp SOURCES tdesud.cpp repo.cpp lexer.cpp handler.cpp secure.cpp
LINK kdesu-shared LINK tdesu-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )
install( CODE "execute_process( COMMAND chown root:${nogroup} \$ENV{DESTDIR}${_destination}/kdesud )" ) install( CODE "execute_process( COMMAND chown root:${nogroup} \$ENV{DESTDIR}${_destination}/tdesud )" )
install( CODE "execute_process( COMMAND chmod 2755 \$ENV{DESTDIR}${_destination}/kdesud )" ) install( CODE "execute_process( COMMAND chmod 2755 \$ENV{DESTDIR}${_destination}/tdesud )" )

@ -1,31 +1,31 @@
## Makefile.am for kdesud ## Makefile.am for tdesud
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
KDE_CXXFLAGS = $(KDE_USE_FPIE) KDE_CXXFLAGS = $(KDE_USE_FPIE)
bin_PROGRAMS = kdesud bin_PROGRAMS = tdesud
kdesud_SOURCES = kdesud.cpp repo.cpp lexer.cpp handler.cpp secure.cpp tdesud_SOURCES = tdesud.cpp repo.cpp lexer.cpp handler.cpp secure.cpp
kdesud_LDFLAGS = $(KDE_USE_PIE) $(all_libraries) $(KDE_RPATH) tdesud_LDFLAGS = $(KDE_USE_PIE) $(all_libraries) $(KDE_RPATH)
kdesud_LDADD = $(LIB_KDECORE) -lkdesu $(LIBSOCKET) tdesud_LDADD = $(LIB_KDECORE) -ltdesu $(LIBSOCKET)
noinst_HEADERS = repo.h handler.h lexer.h secure.h noinst_HEADERS = repo.h handler.h lexer.h secure.h
## kdesud needs to be suid or sgid something ## tdesud needs to be suid or sgid something
install-data-local: install-data-local:
@echo "********************************************************" @echo "********************************************************"
@echo "" @echo ""
@echo "For security reasons, kdesud is installed setgid nogroup." @echo "For security reasons, tdesud is installed setgid nogroup."
@echo "Kdesud is the daemon that implements the password caching." @echo "Kdesud is the daemon that implements the password caching."
@echo "" @echo ""
@echo "You should NOT use the password caching feature if kdesud is" @echo "You should NOT use the password caching feature if tdesud is"
@echo "not installed setgid nogroup." @echo "not installed setgid nogroup."
@echo "" @echo ""
@echo "********************************************************" @echo "********************************************************"
install-exec-hook: install-exec-hook:
@(chown root:@nogroup@ $(DESTDIR)$(bindir)/kdesud && chmod 2755 $(DESTDIR)$(bindir)/kdesud) \ @(chown root:@nogroup@ $(DESTDIR)$(bindir)/tdesud && chmod 2755 $(DESTDIR)$(bindir)/tdesud) \
|| echo "Error: Could not install kdesud as setgid nogroup!!\n" \ || echo "Error: Could not install tdesud as setgid nogroup!!\n" \
"The password caching feature is disabled." "The password caching feature is disabled."
messages: messages:
$(XGETTEXT) $(kdesud_SOURCES) -o $(podir)/kdesud.pot $(XGETTEXT) $(tdesud_SOURCES) -o $(podir)/tdesud.pot

@ -1,8 +1,8 @@
/* /*
* This file is part of the KDE project, module kdesu. * This file is part of the KDE project, module tdesu.
* Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org> * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
* *
* handler.cpp: A connection handler for kdesud. * handler.cpp: A connection handler for tdesud.
*/ */
@ -21,8 +21,8 @@
#include <tqcstring.h> #include <tqcstring.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdesu/su.h> #include <tdesu/su.h>
#include <kdesu/ssh.h> #include <tdesu/ssh.h>
#include "handler.h" #include "handler.h"
#include "repo.h" #include "repo.h"
@ -32,7 +32,7 @@
// Global repository // Global repository
extern Repository *repo; extern Repository *repo;
void kdesud_cleanup(); void tdesud_cleanup();
ConnectionHandler::ConnectionHandler(int fd) ConnectionHandler::ConnectionHandler(int fd)
: SocketSecurity(fd), m_exitCode(0), m_hasExitCode(false), m_needExitCode(false), m_pid(0) : SocketSecurity(fd), m_exitCode(0), m_hasExitCode(false), m_needExitCode(false), m_pid(0)
@ -490,7 +490,7 @@ int ConnectionHandler::doCommand(TQCString buf)
goto parse_error; goto parse_error;
kdDebug(1205) << "Stopping by command" << endl; kdDebug(1205) << "Stopping by command" << endl;
respond(Res_OK); respond(Res_OK);
kdesud_cleanup(); tdesud_cleanup();
exit(0); exit(0);
default: default:

@ -1,6 +1,6 @@
/* vi: ts=8 sts=4 sw=4 /* vi: ts=8 sts=4 sw=4
* *
* This file is part of the KDE project, module kdesu. * This file is part of the KDE project, module tdesu.
* Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org> * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
*/ */

@ -1,12 +1,12 @@
/* vi: ts=8 sts=4 sw=4 /* vi: ts=8 sts=4 sw=4
* *
* This file is part of the KDE project, module kdesu. * This file is part of the KDE project, module tdesu.
* Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org> * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
* *
* *
* kdesud.cpp: KDE su daemon. Offers "keep password" functionality to kde su. * tdesud.cpp: KDE su daemon. Offers "keep password" functionality to kde su.
* *
* The socket $KDEHOME/socket-$(HOSTNAME)/kdesud_$(display) is used for communication with * The socket $KDEHOME/socket-$(HOSTNAME)/tdesud_$(display) is used for communication with
* client programs. * client programs.
* *
* The protocol: Client initiates the connection. All commands and responses * The protocol: Client initiates the connection. All commands and responses
@ -67,8 +67,8 @@
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kdesu/client.h> #include <tdesu/client.h>
#include <kdesu/defaults.h> #include <tdesu/defaults.h>
#include <ksockaddr.h> #include <ksockaddr.h>
#include "repo.h" #include "repo.h"
@ -93,7 +93,7 @@ Display *x11Display;
int pipeOfDeath[2]; int pipeOfDeath[2];
void kdesud_cleanup() void tdesud_cleanup()
{ {
unlink(sock); unlink(sock);
} }
@ -106,7 +106,7 @@ extern "C" int xio_errhandler(Display *);
int xio_errhandler(Display *) int xio_errhandler(Display *)
{ {
kdError(1205) << "Fatal IO error, exiting...\n"; kdError(1205) << "Fatal IO error, exiting...\n";
kdesud_cleanup(); tdesud_cleanup();
exit(1); exit(1);
return 1; //silence compilers return 1; //silence compilers
} }
@ -138,7 +138,7 @@ extern "C" {
void signal_exit(int sig) void signal_exit(int sig)
{ {
kdDebug(1205) << "Exiting on signal " << sig << "\n"; kdDebug(1205) << "Exiting on signal " << sig << "\n";
kdesud_cleanup(); tdesud_cleanup();
exit(1); exit(1);
} }
@ -168,7 +168,7 @@ int create_socket()
// strip the screen number from the display // strip the screen number from the display
display.replace(TQRegExp("\\.[0-9]+$"), ""); display.replace(TQRegExp("\\.[0-9]+$"), "");
sock = TQFile::encodeName(locateLocal("socket", TQString("kdesud_%1").arg(static_cast<const char *>(display)))); sock = TQFile::encodeName(locateLocal("socket", TQString("tdesud_%1").arg(static_cast<const char *>(display))));
int stat_err=lstat(sock, &s); int stat_err=lstat(sock, &s);
if(!stat_err && S_ISLNK(s.st_mode)) { if(!stat_err && S_ISLNK(s.st_mode)) {
kdWarning(1205) << "Someone is running a symlink attack on you\n"; kdWarning(1205) << "Someone is running a symlink attack on you\n";
@ -191,7 +191,7 @@ int create_socket()
} }
} else } else
{ {
kdWarning(1205) << "kdesud is already running\n"; kdWarning(1205) << "tdesud is already running\n";
return -1; return -1;
} }
@ -251,8 +251,8 @@ int main(int argc, char *argv[])
{ {
prctl(PR_SET_DUMPABLE, 0); prctl(PR_SET_DUMPABLE, 0);
KAboutData aboutData("kdesud", I18N_NOOP("KDE su daemon"), KAboutData aboutData("tdesud", I18N_NOOP("KDE su daemon"),
Version, I18N_NOOP("Daemon used by kdesu"), Version, I18N_NOOP("Daemon used by tdesu"),
KAboutData::License_Artistic, KAboutData::License_Artistic,
"Copyright (c) 1999,2000 Geert Jansen"); "Copyright (c) 1999,2000 Geert Jansen");
aboutData.addAuthor("Geert Jansen", I18N_NOOP("Author"), aboutData.addAuthor("Geert Jansen", I18N_NOOP("Author"),
@ -276,7 +276,7 @@ int main(int argc, char *argv[])
if (listen(sockfd, 1) < 0) if (listen(sockfd, 1) < 0)
{ {
kdError(1205) << "listen(): " << ERR << "\n"; kdError(1205) << "listen(): " << ERR << "\n";
kdesud_cleanup(); tdesud_cleanup();
exit(1); exit(1);
} }
int maxfd = sockfd; int maxfd = sockfd;
@ -286,7 +286,7 @@ int main(int argc, char *argv[])
if (pid == -1) if (pid == -1)
{ {
kdError(1205) << "fork():" << ERR << "\n"; kdError(1205) << "fork():" << ERR << "\n";
kdesud_cleanup(); tdesud_cleanup();
exit(1); exit(1);
} }
if (pid) if (pid)

@ -1,9 +1,9 @@
/* vi: ts=8 sts=4 sw=4 /* vi: ts=8 sts=4 sw=4
* *
* This file is part of the KDE project, module kdesu. * This file is part of the KDE project, module tdesu.
* Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org> * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
* *
* lexer.cpp: A lexer for the kdesud protocol. See kdesud.cpp for a * lexer.cpp: A lexer for the tdesud protocol. See tdesud.cpp for a
* description of the protocol. * description of the protocol.
*/ */

@ -1,6 +1,6 @@
/* vi: ts=8 sts=4 sw=4 /* vi: ts=8 sts=4 sw=4
* *
* This file is part of the KDE project, module kdesu. * This file is part of the KDE project, module tdesu.
* Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org> * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
*/ */
@ -10,7 +10,7 @@
class TQCString; class TQCString;
/** /**
* This is a lexer for the kdesud protocol. * This is a lexer for the tdesud protocol.
*/ */
class Lexer { class Lexer {

@ -1,6 +1,6 @@
/* vi: ts=8 sts=4 sw=4 /* vi: ts=8 sts=4 sw=4
* *
* This file is part of the KDE project, module kdesu. * This file is part of the KDE project, module tdesu.
* Copyright (C) 1999,2000 Geert Jansen <g.t.jansen@stud.tue.nl> * Copyright (C) 1999,2000 Geert Jansen <g.t.jansen@stud.tue.nl>
*/ */

@ -1,6 +1,6 @@
/* vi: ts=8 sts=4 sw=4 /* vi: ts=8 sts=4 sw=4
* *
* This file is part of the KDE project, module kdesu. * This file is part of the KDE project, module tdesu.
* Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org> * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
*/ */

@ -1,6 +1,6 @@
/* vi: ts=8 sts=4 sw=4 /* vi: ts=8 sts=4 sw=4
* *
* This file is part of the KDE project, module kdesu. * This file is part of the KDE project, module tdesu.
* Copyright (C) 1999,2000 Geert Jansen <g.t.jansen@stud.tue.nl> * Copyright (C) 1999,2000 Geert Jansen <g.t.jansen@stud.tue.nl>
* *
* secure.cpp: Peer credentials for a UNIX socket. * secure.cpp: Peer credentials for a UNIX socket.
@ -67,7 +67,7 @@ SocketSecurity::SocketSecurity(int sockfd)
if (!warned_him) { if (!warned_him) {
kdWarning() << "Using void socket security. Please add support for your" << endl; kdWarning() << "Using void socket security. Please add support for your" << endl;
kdWarning() << "platform to kdesu/kdesud/secure.cpp" << endl; kdWarning() << "platform to tdesu/tdesud/secure.cpp" << endl;
warned_him = TRUE; warned_him = TRUE;
} }

@ -1,6 +1,6 @@
/* vi: ts=8 sts=4 sw=4 /* vi: ts=8 sts=4 sw=4
* *
* This file is part of the KDE project, module kdesu. * This file is part of the KDE project, module tdesu.
* Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org> * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
*/ */

@ -5,7 +5,7 @@ bin_PROGRAMS = kdialog
kdialog_SOURCES = kdialog.cpp widgets.cpp klistboxdialog.cpp progressdialog.cpp progressdialogiface.skel kdialog_SOURCES = kdialog.cpp widgets.cpp klistboxdialog.cpp progressdialog.cpp progressdialogiface.skel
kdialog_LDADD = $(LIB_KIO) kdialog_LDADD = $(LIB_KIO)
kdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
METASOURCES = AUTO METASOURCES = AUTO

@ -67,7 +67,7 @@ tde_add_executable( kdm_greet AUTOMOC
kfdialog.cpp kgdialog.cpp kchooser.cpp kgverify.cpp kfdialog.cpp kgdialog.cpp kchooser.cpp kgverify.cpp
kdmshutdown.cpp kdmadmindialog.cpp kgreeter.cpp kdmshutdown.cpp kdmadmindialog.cpp kgreeter.cpp
kgapp.cpp sakdlg.cc kgapp.cpp sakdlg.cc
LINK kdmthemer-static kdeui-shared Xtst ${KDMGREET_OPTIONAL_LINK} LINK kdmthemer-static tdeui-shared Xtst ${KDMGREET_OPTIONAL_LINK}
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -24,11 +24,11 @@ kdm_greet_SOURCES = \
kdmadmindialog.cpp \ kdmadmindialog.cpp \
kgreeter.cpp \ kgreeter.cpp \
kgapp.cpp kgapp.cpp
kdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kdm_greet_LDADD = themer/libkdmthemer.a $(LIB_KDEUI) $(XTESTLIB) $(LIBPOSIX4) kdm_greet_LDADD = themer/libkdmthemer.a $(LIB_KDEUI) $(XTESTLIB) $(LIBPOSIX4)
krootimage_SOURCES = krootimage.cpp krootimage_SOURCES = krootimage.cpp
krootimage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor krootimage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
krootimage_LDADD = $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_KIO) krootimage_LDADD = $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_KIO)
METASOURCES = AUTO METASOURCES = AUTO

@ -18,7 +18,7 @@
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kconfig.h> #include <kconfig.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kdesu/defaults.h> #include <tdesu/defaults.h>
#include <kpassdlg.h> #include <kpassdlg.h>
#include <kdebug.h> #include <kdebug.h>
#include <kuser.h> #include <kuser.h>

@ -33,7 +33,7 @@ install( FILES kgreeterplugin.h DESTINATION ${INCLUDE_INSTALL_DIR} )
tde_add_kpart( kgreet_classic AUTOMOC tde_add_kpart( kgreet_classic AUTOMOC
SOURCES kgreet_classic.cpp SOURCES kgreet_classic.cpp
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )
@ -42,7 +42,7 @@ tde_add_kpart( kgreet_classic AUTOMOC
tde_add_kpart( kgreet_pam AUTOMOC tde_add_kpart( kgreet_pam AUTOMOC
SOURCES kgreet_pam.cpp SOURCES kgreet_pam.cpp
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )
@ -51,7 +51,7 @@ tde_add_kpart( kgreet_pam AUTOMOC
tde_add_kpart( kgreet_winbind AUTOMOC tde_add_kpart( kgreet_winbind AUTOMOC
SOURCES kgreet_winbind.cpp SOURCES kgreet_winbind.cpp
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -80,48 +80,48 @@ inline int tde_sak_verify_calling_process()
if ((procparent == "kdesktop") || (procparent == "kdesktop_lock") || (procparent == "kdm")) { if ((procparent == "kdesktop") || (procparent == "kdesktop_lock") || (procparent == "kdm")) {
authorized = true; authorized = true;
} }
else if (procparent == "kdeinit") { else if (procparent == "tdeinit") {
printf("kdeinit detected\n\r"); printf("tdeinit detected\n\r");
// A bit more digging is needed to see if this is an authorized process or not // A bit more digging is needed to see if this is an authorized process or not
// Get the kdeinit command // Get the tdeinit command
char kdeinitcmdline[8192]; char tdeinitcmdline[8192];
FILE *fp = fopen(TQString("/proc/%1/cmdline").arg(parentproc).ascii(),"r"); FILE *fp = fopen(TQString("/proc/%1/cmdline").arg(parentproc).ascii(),"r");
if (fp != NULL) { if (fp != NULL) {
if (fgets (kdeinitcmdline, 8192, fp) != NULL) if (fgets (tdeinitcmdline, 8192, fp) != NULL)
fclose (fp); fclose (fp);
} }
kdeinitcmdline[8191] = 0; tdeinitcmdline[8191] = 0;
TQString kdeinitCommand = kdeinitcmdline; TQString tdeinitCommand = tdeinitcmdline;
// Also get the environment, specifically the path // Also get the environment, specifically the path
TQString kdeinitEnvironment; TQString tdeinitEnvironment;
char kdeinitenviron[8192]; char tdeinitenviron[8192];
fp = fopen(TQString("/proc/%1/environ").arg(parentproc).ascii(),"r"); fp = fopen(TQString("/proc/%1/environ").arg(parentproc).ascii(),"r");
if (fp != NULL) { if (fp != NULL) {
int c; int c;
int pos = 0; int pos = 0;
do { do {
c = fgetc(fp); c = fgetc(fp);
kdeinitenviron[pos] = c; tdeinitenviron[pos] = c;
pos++; pos++;
if (c == 0) { if (c == 0) {
TQString curEnvLine = kdeinitenviron; TQString curEnvLine = tdeinitenviron;
if (curEnvLine.startsWith("PATH=")) { if (curEnvLine.startsWith("PATH=")) {
kdeinitEnvironment = curEnvLine.mid(5); tdeinitEnvironment = curEnvLine.mid(5);
} }
pos = 0; pos = 0;
} }
} while ((c != EOF) && (pos < 8192)); } while ((c != EOF) && (pos < 8192));
fclose (fp); fclose (fp);
} }
kdeinitenviron[8191] = 0; tdeinitenviron[8191] = 0;
#ifdef DEBUG #ifdef DEBUG
printf("Called executable name is: %s\n\r", kdeinitCommand.ascii()); printf("Called executable name is: %s\n\r", tdeinitCommand.ascii());
printf("Environment is: %s\n\r", kdeinitEnvironment.ascii()); printf("Environment is: %s\n\r", tdeinitEnvironment.ascii());
#endif #endif
if ((kdeinitCommand == "kdesktop [kdeinit]") && (kdeinitEnvironment.startsWith(KDE_BINDIR))) { if ((tdeinitCommand == "kdesktop [tdeinit]") && (tdeinitEnvironment.startsWith(KDE_BINDIR))) {
authorized = true; authorized = true;
} }
else { else {

@ -33,4 +33,4 @@ kfind_SOURCES = kfwin.cpp kfinddlg.cpp main.cpp
kfind_LDADD = libkfind_common.la $(LIB_KPARTS) kfind_LDADD = libkfind_common.la $(LIB_KPARTS)
# the library search path. # the library search path.
kfind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kfind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor

@ -37,9 +37,9 @@ install( FILES
DESTINATION ${DATA_INSTALL_DIR}/khelpcenter ) DESTINATION ${DATA_INSTALL_DIR}/khelpcenter )
##### khelpcenter (kdeinit) ##################### ##### khelpcenter (tdeinit) #####################
tde_add_kdeinit_executable( khelpcenter AUTOMOC tde_add_tdeinit_executable( khelpcenter AUTOMOC
SOURCES SOURCES
navigator.cpp navigatoritem.cpp navigatorappitem.cpp navigator.cpp navigatoritem.cpp navigatorappitem.cpp
view.cpp searchwidget.cpp searchengine.cpp docmetainfo.cpp view.cpp searchwidget.cpp searchengine.cpp docmetainfo.cpp
@ -58,6 +58,6 @@ tde_add_kdeinit_executable( khelpcenter AUTOMOC
tde_add_executable( khc_indexbuilder AUTOMOC tde_add_executable( khc_indexbuilder AUTOMOC
SOURCES khc_indexbuilder.cpp SOURCES khc_indexbuilder.cpp
LINK kdecore-shared LINK tdecore-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -6,11 +6,11 @@ METASOURCES = AUTO
bin_PROGRAMS = khc_indexbuilder bin_PROGRAMS = khc_indexbuilder
lib_LTLIBRARIES = lib_LTLIBRARIES =
khc_indexbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor khc_indexbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
khc_indexbuilder_LDADD = $(LIB_KDECORE) khc_indexbuilder_LDADD = $(LIB_KDECORE)
khc_indexbuilder_SOURCES = khc_indexbuilder.cpp khc_indexbuilder_SOURCES = khc_indexbuilder.cpp
kdeinit_LTLIBRARIES = khelpcenter.la tdeinit_LTLIBRARIES = khelpcenter.la
khelpcenter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) khelpcenter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
khelpcenter_la_LIBADD = $(LIB_KHTML) khelpcenter_la_LIBADD = $(LIB_KHTML)
@ -34,7 +34,7 @@ khelpcenter_la_SOURCES = navigator.cpp \
EXTRA_PROGRAMS = testmetainfo EXTRA_PROGRAMS = testmetainfo
testmetainfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor testmetainfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testmetainfo_LDADD = $(LIB_KDECORE) docentry.lo docmetainfo.lo \ testmetainfo_LDADD = $(LIB_KDECORE) docentry.lo docmetainfo.lo \
docentrytraverser.lo htmlsearch.lo docentrytraverser.lo htmlsearch.lo
testmetainfo_SOURCES = testmetainfo.cpp testmetainfo_SOURCES = testmetainfo.cpp

@ -27,7 +27,7 @@ wrapperdir = $(kde_datadir)/khelpcenter/
wrapper_SCRIPTS = meinproc_wrapper wrapper_SCRIPTS = meinproc_wrapper
khtmlindex_SOURCES = index.cpp khtmlindex_SOURCES = index.cpp
khtmlindex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor khtmlindex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
khtmlindex_LDADD = libhtmlsearch.la $(LIB_KDEUI) khtmlindex_LDADD = libhtmlsearch.la $(LIB_KDEUI)
xpm_DATA = unchecked.xpm checked.xpm xpm_DATA = unchecked.xpm checked.xpm

@ -468,7 +468,7 @@ void KCMHelpCenter::startIndexProcess()
mProcess = new KProcess; mProcess = new KProcess;
if ( mRunAsRoot ) { if ( mRunAsRoot ) {
*mProcess << "kdesu" << "--nonewdcop"; *mProcess << "tdesu" << "--nonewdcop";
kdDebug() << "Run as root" << endl; kdDebug() << "Run as root" << endl;
} }

@ -31,14 +31,14 @@ install( FILES khotkeys.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
tde_add_kpart( kded_khotkeys AUTOMOC tde_add_kpart( kded_khotkeys AUTOMOC
SOURCES kded.cpp kded.skel SOURCES kded.cpp kded.skel
LINK khotkeys_shared-shared kdeinit_kded-shared LINK khotkeys_shared-shared tdeinit_kded-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )
##### khotkeys (kdeinit) ######################## ##### khotkeys (tdeinit) ########################
tde_add_kdeinit_executable( khotkeys AUTOMOC tde_add_tdeinit_executable( khotkeys AUTOMOC
SOURCES app.cpp app.skel SOURCES app.cpp app.skel
LINK khotkeys_shared-shared LINK khotkeys_shared-shared
) )

@ -1,6 +1,6 @@
bin_PROGRAMS = bin_PROGRAMS =
lib_LTLIBRARIES = lib_LTLIBRARIES =
kdeinit_LTLIBRARIES = khotkeys.la tdeinit_LTLIBRARIES = khotkeys.la
kde_module_LTLIBRARIES = kded_khotkeys.la kde_module_LTLIBRARIES = kded_khotkeys.la
khotkeys_la_SOURCES = app.cpp app.skel khotkeys_la_SOURCES = app.cpp app.skel

@ -53,6 +53,6 @@ tde_add_kpart( kcm_khotkeys AUTOMOC
tde_add_kpart( kcm_khotkeys_init AUTOMOC tde_add_kpart( kcm_khotkeys_init AUTOMOC
SOURCES init.cpp SOURCES init.cpp
LINK kdecore-shared LINK tdecore-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -33,14 +33,14 @@ extern "C"
// kded modules in such case. // kded modules in such case.
TQCString multiHead = getenv("KDE_MULTIHEAD"); TQCString multiHead = getenv("KDE_MULTIHEAD");
if (multiHead.lower() == "true") if (multiHead.lower() == "true")
kapp->kdeinitExec( "khotkeys" ); kapp->tdeinitExec( "khotkeys" );
else else
{ {
DCOPRef ref( "kded", "kded" ); DCOPRef ref( "kded", "kded" );
if( !ref.call( "loadModule", TQCString( "khotkeys" ))) if( !ref.call( "loadModule", TQCString( "khotkeys" )))
{ {
kdWarning( 1217 ) << "Loading of khotkeys module failed." << endl; kdWarning( 1217 ) << "Loading of khotkeys module failed." << endl;
kapp->kdeinitExec( "khotkeys" ); kapp->tdeinitExec( "khotkeys" );
} }
} }
} }

@ -133,7 +133,7 @@ void Module::save()
if( !kapp->dcopClient()->isApplicationRegistered( "khotkeys" )) if( !kapp->dcopClient()->isApplicationRegistered( "khotkeys" ))
{ {
kdDebug( 1217 ) << "launching new khotkeys daemon" << endl; kdDebug( 1217 ) << "launching new khotkeys daemon" << endl;
KApplication::kdeinitExec( "khotkeys" ); KApplication::tdeinitExec( "khotkeys" );
} }
else else
{ {

@ -194,7 +194,7 @@ void khotkeys_send_reread_config()
if( !kapp->dcopClient()->isApplicationRegistered( "khotkeys" )) if( !kapp->dcopClient()->isApplicationRegistered( "khotkeys" ))
{ {
kdDebug( 1217 ) << "launching new khotkeys daemon" << endl; kdDebug( 1217 ) << "launching new khotkeys daemon" << endl;
KApplication::kdeinitExec( "khotkeys" ); KApplication::tdeinitExec( "khotkeys" );
} }
else else
{ {

@ -62,12 +62,12 @@ these files should be moved to kdebase/kicker/kcm
(... add docu here about the structure of the kcm stuff and how it uses (... add docu here about the structure of the kcm stuff and how it uses
DCOP to communicate with the panels ...) DCOP to communicate with the panels ...)
In kdelibs/kdeui there are two classes that are quite important to kicker. In kdelibs/tdeui there are two classes that are quite important to kicker.
The first is KPanelApplet, which is the base class of all kicker applets. The first is KPanelApplet, which is the base class of all kicker applets.
The other class is KPanelExtension, which is the base class of all kicker The other class is KPanelExtension, which is the base class of all kicker
extensions. extensions.
These classes are in kdeui so that other applications besides kicker may These classes are in tdeui so that other applications besides kicker may
use these facilities, either to provide their own applet/extension use these facilities, either to provide their own applet/extension
facilities or so as to provide kicker applets/extensions. This strategy facilities or so as to provide kicker applets/extensions. This strategy
should be re-examined in KDE4 and the APIs of both classes cleaned up should be re-examined in KDE4 and the APIs of both classes cleaned up
@ -77,7 +77,7 @@ extensively.
--------------------- ---------------------
applets/ applets/
The basic set of applets. Everything here subclasses from KPanelApplet found The basic set of applets. Everything here subclasses from KPanelApplet found
in kdelibs/kdeui. These can be assumed to exist at startup and are allowed, in kdelibs/tdeui. These can be assumed to exist at startup and are allowed,
if not encouraged to, access kicker internals. if not encouraged to, access kicker internals.
buttons/ buttons/

@ -19,7 +19,7 @@ clock_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
clock_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_KDEUI) clock_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_KDEUI)
srcdoc: srcdoc:
kdoc -a -p -H -d $$HOME/web/src/clockapplet clockapplet *.h -lqt -lkdecore -lkdeui -lkfile kdoc -a -p -H -d $$HOME/web/src/clockapplet clockapplet *.h -lqt -ltdecore -ltdeui -lkfile
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp *.h -o $(podir)/clockapplet.pot $(XGETTEXT) *.cpp *.h -o $(podir)/clockapplet.pot

@ -1515,7 +1515,7 @@ void ClockApplet::contextMenuActivated(int result)
preferences(); preferences();
break; break;
case 103: case 103:
proc << locate("exe", "kdesu"); proc << locate("exe", "tdesu");
proc << "--nonewdcop"; proc << "--nonewdcop";
proc << TQString("%1 kde-clock.desktop --lang %2") proc << TQString("%1 kde-clock.desktop --lang %2")
.arg(locate("exe", "kcmshell")) .arg(locate("exe", "kcmshell"))

@ -24,4 +24,4 @@ messages: rc.cpp
$(XGETTEXT) *.cpp *.h -o $(podir)/quicklauncher.pot $(XGETTEXT) *.cpp *.h -o $(podir)/quicklauncher.pot
srcdoc: srcdoc:
kdoc -a -p -H -d $$HOME/web/src/quicklauncher quicklauncher *.h -lqt -lkdecore -lkdeui kdoc -a -p -H -d $$HOME/web/src/quicklauncher quicklauncher *.h -lqt -ltdecore -ltdeui

@ -28,6 +28,6 @@ install( FILES menuapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets
tde_add_kpart( menu_panelapplet AUTOMOC tde_add_kpart( menu_panelapplet AUTOMOC
SOURCES menuapplet.cpp menuapplet.skel SOURCES menuapplet.cpp menuapplet.skel
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -22,4 +22,4 @@ messages: rc.cpp
$(XGETTEXT) *.cpp *.h -o $(podir)/kminipagerapplet.pot $(XGETTEXT) *.cpp *.h -o $(podir)/kminipagerapplet.pot
srcdoc: srcdoc:
kdoc -a -p -H -d $$HOME/web/src/kminipagerapplet kminipagerapplet *.h -lqt -lkdecore -lkdeui -lkfile kdoc -a -p -H -d $$HOME/web/src/kminipagerapplet kminipagerapplet *.h -lqt -ltdecore -ltdeui -lkfile

@ -254,7 +254,7 @@ NaughtyProcessMonitor::processName(ulong pid) const
s += char(c); s += char(c);
} }
// Now strip 'kdeinit:' prefix. // Now strip 'tdeinit:' prefix.
TQString tqunicode(TQString::fromLocal8Bit(s)); TQString tqunicode(TQString::fromLocal8Bit(s));
#elif defined(__OpenBSD__) #elif defined(__OpenBSD__)
@ -279,7 +279,7 @@ NaughtyProcessMonitor::processName(ulong pid) const
return i18n("Unknown") ; return i18n("Unknown") ;
} }
// Now strip 'kdeinit:' prefix. // Now strip 'tdeinit:' prefix.
TQString tqunicode(TQString::fromLocal8Bit(argv[0])); TQString tqunicode(TQString::fromLocal8Bit(argv[0]));
free (argv) ; free (argv) ;
@ -287,7 +287,7 @@ NaughtyProcessMonitor::processName(ulong pid) const
TQStringList parts(TQStringList::split(' ', tqunicode)); TQStringList parts(TQStringList::split(' ', tqunicode));
TQString processName = parts[0] == "kdeinit:" ? parts[1] : parts[0]; TQString processName = parts[0] == "tdeinit:" ? parts[1] : parts[0];
int lastSlash = processName.findRev('/'); int lastSlash = processName.findRev('/');

@ -21,4 +21,4 @@ messages:
$(XGETTEXT) *.cpp *.h -o $(podir)/ksystemtrayapplet.pot $(XGETTEXT) *.cpp *.h -o $(podir)/ksystemtrayapplet.pot
srcdoc: srcdoc:
kdoc -a -p -H -d $$HOME/web/src/ksystemtrayapplet ksystemtrayapplet *.h -lqt -lkdecore -lkdeui -lkfile kdoc -a -p -H -d $$HOME/web/src/ksystemtrayapplet ksystemtrayapplet *.h -lqt -ltdecore -ltdeui -lkfile

@ -19,4 +19,4 @@ messages:
$(XGETTEXT) *.cpp *.h -o $(podir)/ktaskbarapplet.pot $(XGETTEXT) *.cpp *.h -o $(podir)/ktaskbarapplet.pot
srcdoc: srcdoc:
kdoc -a -p -H -d $$HOME/web/src/ktaskbarapplet ktaskbarapplet *.h -lqt -lkdecore -lkdeui -lkfile kdoc -a -p -H -d $$HOME/web/src/ktaskbarapplet ktaskbarapplet *.h -lqt -ltdecore -ltdeui -lkfile

@ -35,6 +35,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -37,7 +37,7 @@ EXTRA_DIST = $(lnk_DATA)
bin_PROGRAMS = kasbar bin_PROGRAMS = kasbar
kasbar_SOURCES = kasbarapp.cpp kasbar_SOURCES = kasbarapp.cpp
kasbar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kasbar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kasbar_LDADD = libkasbar.la \ kasbar_LDADD = libkasbar.la \
$(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
@ -46,7 +46,7 @@ messages:
$(XGETTEXT) *.cpp *.h -o $(podir)/kasbarextension.pot $(XGETTEXT) *.cpp *.h -o $(podir)/kasbarextension.pot
srcdoc: srcdoc:
$(kde_bindir)/kdoc -a -p -d classdocs -n 'Kasbar2' ../../taskmanager/*.h *.h -lqt -lkdecore -lkdeui $(kde_bindir)/kdoc -a -p -d classdocs -n 'Kasbar2' ../../taskmanager/*.h *.h -lqt -ltdecore -ltdeui
.PHONY: changes .PHONY: changes
changes: changes:

@ -42,16 +42,16 @@ install( PROGRAMS
tde_add_executable( kicker-3.4-reverseLayout tde_add_executable( kicker-3.4-reverseLayout
SOURCES kicker-3.4-reverseLayout.cpp SOURCES kicker-3.4-reverseLayout.cpp
LINK kdecore-shared LINK tdecore-shared
DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
) )
##### kicker (kdeinit) ########################## ##### kicker (tdeinit) ##########################
configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy.cpp COPYONLY ) configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy.cpp COPYONLY )
tde_add_kdeinit_executable( kicker tde_add_tdeinit_executable( kicker
SOURCES dummy.cpp SOURCES dummy.cpp
EMBED kicker_core-static EMBED kicker_core-static
LINK kicker_buttons-static kicker_ui-static kickermain-shared kabc-shared kutils-shared LINK kicker_buttons-static kicker_ui-static kickermain-shared kabc-shared kutils-shared

@ -5,7 +5,7 @@ SUBDIRS = core interfaces ui buttons .
bin_PROGRAMS = bin_PROGRAMS =
lib_LTLIBRARIES = lib_LTLIBRARIES =
kdeinit_LTLIBRARIES = kicker.la tdeinit_LTLIBRARIES = kicker.la
CLEANFILES = dummy.cpp CLEANFILES = dummy.cpp

@ -270,7 +270,7 @@ void Kicker::slotRestart()
char ** o_argv = new char*[2]; char ** o_argv = new char*[2];
o_argv[0] = strdup("kicker"); o_argv[0] = strdup("kicker");
o_argv[1] = 0L; o_argv[1] = 0L;
execv(TQFile::encodeName(locate("exe", "kdeinit_wrapper")), o_argv); execv(TQFile::encodeName(locate("exe", "tdeinit_wrapper")), o_argv);
exit(1); exit(1);
} }

@ -82,7 +82,7 @@ public:
TQImage makeShadow(const TQPixmap& textPixmap, const TQColor &bgColor); TQImage makeShadow(const TQPixmap& textPixmap, const TQColor &bgColor);
private: private:
// No static objects in libs, and no static deleters in kdefx... // No static objects in libs, and no static deleters in tdefx...
//static KShadowSettings s_defaultShadowSettings; //static KShadowSettings s_defaultShadowSettings;
KShadowSettings *m_shadowSettings; KShadowSettings *m_shadowSettings;

@ -10,7 +10,7 @@
################################################# #################################################
add_subdirectory( find ) add_subdirectory( find )
add_subdirectory( kdeprint ) add_subdirectory( tdeprint )
add_subdirectory( prefmenu ) add_subdirectory( prefmenu )
add_subdirectory( recentdocs ) add_subdirectory( recentdocs )
add_subdirectory( konsole ) add_subdirectory( konsole )

@ -1,2 +1,2 @@
SUBDIRS = find kdeprint prefmenu recentdocs konsole konq-profiles remote system kate SUBDIRS = find tdeprint prefmenu recentdocs konsole konq-profiles remote system kate

@ -29,6 +29,6 @@ install( FILES kfind.desktop websearch.desktop DESTINATION ${DATA_INSTALL_DIR}/k
tde_add_kpart( kickermenu_find AUTOMOC tde_add_kpart( kickermenu_find AUTOMOC
SOURCES findmenu.cpp SOURCES findmenu.cpp
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -28,6 +28,6 @@ install( FILES katesessionmenu.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/me
tde_add_kpart( kickermenu_kate AUTOMOC tde_add_kpart( kickermenu_kate AUTOMOC
SOURCES katesessionmenu.cpp SOURCES katesessionmenu.cpp
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -143,7 +143,7 @@ void KateSessionMenu::slotExec( int id )
else if ( id > 2 ) else if ( id > 2 )
args << m_sessions[ id-3 ]; args << m_sessions[ id-3 ];
kapp->kdeinitExec("kate", args); kapp->tdeinitExec("kate", args);
} }

@ -24,10 +24,10 @@ link_directories(
install( FILES printmenu.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext ) install( FILES printmenu.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext )
##### kickermenu_kdeprint (module) ############## ##### kickermenu_tdeprint (module) ##############
tde_add_kpart( kickermenu_kdeprint AUTOMOC tde_add_kpart( kickermenu_tdeprint AUTOMOC
SOURCES print_mnu.cpp SOURCES print_mnu.cpp
LINK kdeprint-shared LINK tdeprint-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -1,15 +1,15 @@
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = kickermenu_kdeprint.la kde_module_LTLIBRARIES = kickermenu_tdeprint.la
kickermenu_kdeprint_la_SOURCES = print_mnu.cpp kickermenu_tdeprint_la_SOURCES = print_mnu.cpp
kickermenu_kdeprint_la_LDFLAGS = $(all_libraries) -module -avoid-version kickermenu_tdeprint_la_LDFLAGS = $(all_libraries) -module -avoid-version
kickermenu_kdeprint_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) -lkdeprint kickermenu_tdeprint_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) -ltdeprint
kickermenu_kdeprint_la_METASOURCES = AUTO kickermenu_tdeprint_la_METASOURCES = AUTO
desktopmenu_DATA = printmenu.desktop desktopmenu_DATA = printmenu.desktop
desktopmenudir = $(kde_datadir)/kicker/menuext desktopmenudir = $(kde_datadir)/kicker/menuext
messages: messages:
$(XGETTEXT) *.cpp -o $(podir)/libkickermenu_kdeprint.pot $(XGETTEXT) *.cpp -o $(podir)/libkickermenu_tdeprint.pot

@ -27,10 +27,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kglobal.h> #include <kglobal.h>
#include <kapplication.h> #include <kapplication.h>
#include <krun.h> #include <krun.h>
#include <kdeprint/kmmanager.h> #include <tdeprint/kmmanager.h>
#include <tqregexp.h> #include <tqregexp.h>
K_EXPORT_KICKER_MENUEXT(kdeprint, PrintMenu) K_EXPORT_KICKER_MENUEXT(tdeprint, PrintMenu)
#define ADD_PRINTER_ID 0 #define ADD_PRINTER_ID 0
#define KDEPRINT_SETTINGS_ID 1 #define KDEPRINT_SETTINGS_ID 1
@ -43,10 +43,10 @@ K_EXPORT_KICKER_MENUEXT(kdeprint, PrintMenu)
PrintMenu::PrintMenu(TQWidget *parent, const char *name, const TQStringList & /*args*/) PrintMenu::PrintMenu(TQWidget *parent, const char *name, const TQStringList & /*args*/)
: KPanelMenu("", parent, name) : KPanelMenu("", parent, name)
{ {
static bool kdeprintIconsInitialized = false; static bool tdeprintIconsInitialized = false;
if ( !kdeprintIconsInitialized ) { if ( !tdeprintIconsInitialized ) {
KGlobal::iconLoader()->addAppDir("kdeprint"); KGlobal::iconLoader()->addAppDir("tdeprint");
kdeprintIconsInitialized = true; tdeprintIconsInitialized = true;
} }
} }
@ -65,9 +65,9 @@ void PrintMenu::initialize()
if ((KMManager::self()->printerOperationMask() & KMManager::PrinterCreation) && KMManager::self()->hasManagement()) if ((KMManager::self()->printerOperationMask() & KMManager::PrinterCreation) && KMManager::self()->hasManagement())
insertItem(SmallIconSet("wizard"), i18n("Add Printer..."), ADD_PRINTER_ID); insertItem(SmallIconSet("wizard"), i18n("Add Printer..."), ADD_PRINTER_ID);
insertItem(SmallIconSet("kdeprint_configmgr"), i18n("KDE Print Settings"), KDEPRINT_SETTINGS_ID); insertItem(SmallIconSet("tdeprint_configmgr"), i18n("KDE Print Settings"), KDEPRINT_SETTINGS_ID);
if (KMManager::self()->serverOperationMask() & KMManager::ServerConfigure) if (KMManager::self()->serverOperationMask() & KMManager::ServerConfigure)
insertItem(SmallIconSet("kdeprint_configsrv"), i18n("Configure Server"), CONFIG_SERVER_ID); insertItem(SmallIconSet("tdeprint_configsrv"), i18n("Configure Server"), CONFIG_SERVER_ID);
insertSeparator(); insertSeparator();
insertItem(SmallIconSet("kcontrol"), i18n("Print Manager"), PRINT_MANAGER_ID); insertItem(SmallIconSet("kcontrol"), i18n("Print Manager"), PRINT_MANAGER_ID);
insertItem(SmallIconSet("konqueror"), i18n("Print Browser (Konqueror)"), PRINT_BROWSER_ID); insertItem(SmallIconSet("konqueror"), i18n("Print Browser (Konqueror)"), PRINT_BROWSER_ID);
@ -103,13 +103,13 @@ void PrintMenu::slotExec(int ID)
switch (ID) switch (ID)
{ {
case ADD_PRINTER_ID: case ADD_PRINTER_ID:
kapp->kdeinitExec("kaddprinterwizard"); kapp->tdeinitExec("kaddprinterwizard");
break; break;
case KDEPRINT_SETTINGS_ID: case KDEPRINT_SETTINGS_ID:
kapp->kdeinitExec("kaddprinterwizard", TQStringList("--kdeconfig")); kapp->tdeinitExec("kaddprinterwizard", TQStringList("--kdeconfig"));
break; break;
case CONFIG_SERVER_ID: case CONFIG_SERVER_ID:
kapp->kdeinitExec("kaddprinterwizard", TQStringList("--serverconfig")); kapp->tdeinitExec("kaddprinterwizard", TQStringList("--serverconfig"));
break; break;
case PRINT_MANAGER_ID: case PRINT_MANAGER_ID:
KRun::runCommand("kcmshell kde-printers.desktop"); KRun::runCommand("kcmshell kde-printers.desktop");
@ -118,14 +118,14 @@ void PrintMenu::slotExec(int ID)
KRun::runCommand("kfmclient openProfile filemanagement print:/", "kfmclient", "konqueror"); KRun::runCommand("kfmclient openProfile filemanagement print:/", "kfmclient", "konqueror");
break; break;
case KPRINTER_ID: case KPRINTER_ID:
kapp->kdeinitExec("kprinter"); kapp->tdeinitExec("kprinter");
break; break;
default: default:
{ {
// start kjobviewer // start kjobviewer
TQStringList args; TQStringList args;
args << "--show" << "-d" << text(ID).remove('&'); args << "--show" << "-d" << text(ID).remove('&');
kapp->kdeinitExec("kjobviewer", args); kapp->tdeinitExec("kjobviewer", args);
} }
break; break;
} }

@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define _print_mnu_h_ #define _print_mnu_h_
#include <kpanelmenu.h> #include <kpanelmenu.h>
#include <kdeprint/kpreloadobject.h> #include <tdeprint/kpreloadobject.h>
class PrintMenu : public KPanelMenu, public KPReloadObject class PrintMenu : public KPanelMenu, public KPReloadObject
{ {

@ -141,4 +141,4 @@ Comment[zh_CN]=打印系统菜单
Comment[zh_TW]=用於列印系統的選單 Comment[zh_TW]=用於列印系統的選單
Icon=fileprint Icon=fileprint
X-KDE-Library=kickermenu_kdeprint X-KDE-Library=kickermenu_tdeprint

@ -39,10 +39,10 @@ K_EXPORT_KICKER_MENUEXT(konqueror, KonquerorProfilesMenu)
KonquerorProfilesMenu::KonquerorProfilesMenu(TQWidget *parent, const char *name, const TQStringList & /*args*/) KonquerorProfilesMenu::KonquerorProfilesMenu(TQWidget *parent, const char *name, const TQStringList & /*args*/)
: KPanelMenu("", parent, name) : KPanelMenu("", parent, name)
{ {
static bool kdeprintIconsInitialized = false; static bool tdeprintIconsInitialized = false;
if ( !kdeprintIconsInitialized ) { if ( !tdeprintIconsInitialized ) {
KGlobal::iconLoader()->addAppDir("kdeprint"); KGlobal::iconLoader()->addAppDir("tdeprint");
kdeprintIconsInitialized = true; tdeprintIconsInitialized = true;
} }
} }
@ -83,7 +83,7 @@ void KonquerorProfilesMenu::slotExec(int id)
{ {
TQStringList args; TQStringList args;
args<<"--profile"<<m_profiles[id-1]; args<<"--profile"<<m_profiles[id-1];
kapp->kdeinitExec("konqueror", args); kapp->tdeinitExec("konqueror", args);
} }
void KonquerorProfilesMenu::reload() void KonquerorProfilesMenu::reload()

@ -258,7 +258,7 @@ void KonsoleMenu::slotExec(int id)
args << "-r"; args << "-r";
args << screenList[id - sessionList.count()]; args << screenList[id - sessionList.count()];
} }
KApplication::kdeinitExec("konsole", args); KApplication::tdeinitExec("konsole", args);
return; return;
} }
@ -273,7 +273,7 @@ void KonsoleMenu::launchProfile(int id)
// this is a session, not a bookmark, so execute that instead // this is a session, not a bookmark, so execute that instead
TQStringList args; TQStringList args;
args << "--profile" << m_profiles[id]; args << "--profile" << m_profiles[id];
kapp->kdeinitExec("konsole", args); kapp->tdeinitExec("konsole", args);
} }
KURL KonsoleMenu::baseURL() const KURL KonsoleMenu::baseURL() const
@ -292,7 +292,7 @@ void KonsoleMenu::newSession(const TQString& sURL, const TQString& title)
{ {
args << "-T" << title; args << "-T" << title;
args << "--workdir" << url.path(); args << "--workdir" << url.path();
KApplication::kdeinitExec("konsole", args); KApplication::tdeinitExec("konsole", args);
return; return;
} }
else if ((!url.protocol().isEmpty()) && (url.hasHost())) else if ((!url.protocol().isEmpty()) && (url.hasHost()))
@ -305,7 +305,7 @@ void KonsoleMenu::newSession(const TQString& sURL, const TQString& title)
args << "-l" << url.user().latin1(); args << "-l" << url.user().latin1();
} }
args << host.latin1(); args << host.latin1();
KApplication::kdeinitExec("konsole", args); KApplication::tdeinitExec("konsole", args);
return; return;
} }
/* /*

@ -30,6 +30,6 @@ install( FILES prefmenu.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext )
tde_add_kpart( kickermenu_prefmenu AUTOMOC tde_add_kpart( kickermenu_prefmenu AUTOMOC
SOURCES prefmenu.cpp SOURCES prefmenu.cpp
LINK kickermain-shared kdeui-shared LINK kickermain-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -29,6 +29,6 @@ install( FILES remotemenu.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext
tde_add_kpart( kickermenu_remotemenu AUTOMOC tde_add_kpart( kickermenu_remotemenu AUTOMOC
SOURCES remotemenu.cpp remotemenu.skel SOURCES remotemenu.cpp remotemenu.skel
LINK kickermain-shared kdeui-shared LINK kickermain-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -25,17 +25,17 @@ link_directories(
install( FILES DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext ) install( FILES DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext )
##### appletproxy (kdeinit) ##################### ##### appletproxy (tdeinit) #####################
tde_add_kdeinit_executable( appletproxy AUTOMOC tde_add_tdeinit_executable( appletproxy AUTOMOC
SOURCES appletproxy.cpp SOURCES appletproxy.cpp
LINK kickermain-shared LINK kickermain-shared
) )
##### extensionproxy (kdeinit) ################## ##### extensionproxy (tdeinit) ##################
tde_add_kdeinit_executable( extensionproxy AUTOMOC tde_add_tdeinit_executable( extensionproxy AUTOMOC
SOURCES extensionproxy.cpp SOURCES extensionproxy.cpp
LINK kickermain-shared LINK kickermain-shared
) )

@ -3,7 +3,7 @@ INCLUDES = -I$(srcdir)/../libkicker $(all_includes)
bin_PROGRAMS = bin_PROGRAMS =
noinst_PROGRAMS = extensiondebugger noinst_PROGRAMS = extensiondebugger
lib_LTLIBRARIES = lib_LTLIBRARIES =
kdeinit_LTLIBRARIES = appletproxy.la extensionproxy.la tdeinit_LTLIBRARIES = appletproxy.la extensionproxy.la
METASOURCES = AUTO METASOURCES = AUTO
@ -17,7 +17,7 @@ extensionproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
extensiondebugger_SOURCES = extensiondebugger.cpp extensiondebugger_SOURCES = extensiondebugger.cpp
extensiondebugger_LDADD = ../libkicker/libkickermain.la extensiondebugger_LDADD = ../libkicker/libkickermain.la
extensiondebugger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor extensiondebugger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
messages: messages:
$(XGETTEXT) appletproxy.cpp -o $(podir)/appletproxy.pot $(XGETTEXT) appletproxy.cpp -o $(podir)/appletproxy.pot

@ -53,6 +53,6 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
VERSION 1.0.0 VERSION 1.0.0
LINK kdecore-shared kickermain-shared ${XFIXES_LIBRARIES} ${XRENDER_LIBRARIES} ${XCOMPOSITE_LIBRARIES} LINK tdecore-shared kickermain-shared ${XFIXES_LIBRARIES} ${XRENDER_LIBRARIES} ${XCOMPOSITE_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )

@ -4,8 +4,8 @@ How does an io-slave get started?
================================= =================================
Your application request 'klauncher' via DCOP for a slave. If 'klauncher' does Your application request 'klauncher' via DCOP for a slave. If 'klauncher' does
not have an idle slave ready, it will ask kdeinit to start a new one. not have an idle slave ready, it will ask tdeinit to start a new one.
kdeinit forks and dlopens the library that contains the io-slave. tdeinit forks and dlopens the library that contains the io-slave.
Then it calls kdemain() or, if that is not present, main() in the library. Then it calls kdemain() or, if that is not present, main() in the library.
@ -18,22 +18,22 @@ that slaves for a certain protocol are started in debug mode.
E.g. to start all 'http' slaves in debug mode, you type: E.g. to start all 'http' slaves in debug mode, you type:
KDE_SLAVE_DEBUG_WAIT=http kdeinit KDE_SLAVE_DEBUG_WAIT=http tdeinit
This will restart 'kdeinit' and 'klauncher'. This will restart 'tdeinit' and 'klauncher'.
When your application now requests a http slave, the slave will be started When your application now requests a http slave, the slave will be started
by kdeinit, but before it calls kdemain() (cq. main()) it will suspend the by tdeinit, but before it calls kdemain() (cq. main()) it will suspend the
slave by sending it a SIGSTOP signal. slave by sending it a SIGSTOP signal.
In the terminal from which you started kdeinit you will get the following In the terminal from which you started tdeinit you will get the following
message: message:
kdeinit: Suspending process tdeinit: Suspending process
kdeinit: 'gdb kdeinit 16779' to debug tdeinit: 'gdb tdeinit 16779' to debug
kdeinit: 'kill -SIGCONT 16779' to continue tdeinit: 'kill -SIGCONT 16779' to continue
You can now debug your slave by typing (or pasting) 'gdb kdeinit 16779' in You can now debug your slave by typing (or pasting) 'gdb tdeinit 16779' in
a terminal. If you don't want to debug a slave you can let it continue by a terminal. If you don't want to debug a slave you can let it continue by
sending it a SIGCONT by typing 'kill -SIGCONT 16779'. sending it a SIGCONT by typing 'kill -SIGCONT 16779'.
@ -51,9 +51,9 @@ Debugging io-slaves with valgrind
KLauncher can be told to run certain io-slaves through valgrind. The following KLauncher can be told to run certain io-slaves through valgrind. The following
command can be used to let klauncher run all https io-slaves via valgrind: command can be used to let klauncher run all https io-slaves via valgrind:
KDE_SLAVE_VALGRIND=https kdeinit KDE_SLAVE_VALGRIND=https tdeinit
The valgrind output will appear as the stderr output of the kdeinit process. The valgrind output will appear as the stderr output of the tdeinit process.
The $VALGRIND_OPTS environment variable can be used to pass options to valgrind. The $VALGRIND_OPTS environment variable can be used to pass options to valgrind.
If you want to use a different skin: If you want to use a different skin:
@ -83,7 +83,7 @@ kioslaverc:
[SMB] [SMB]
DebugLevel=100 DebugLevel=100
This will print additional debug info to the stderr of your kdeinit process, This will print additional debug info to the stderr of your tdeinit process,
which typically ends up in ~/.X.err or ~/.xsession-errors which typically ends up in ~/.X.err or ~/.xsession-errors
Happy debugging. Happy debugging.

@ -1,7 +1,7 @@
## Makefile.am of kdebase/kioslave/about ## Makefile.am of kdebase/kioslave/about
INCLUDES= $(all_includes) INCLUDES= $(all_includes)
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
####### Files ####### Files

@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_cgi.la
kcm_cgi_la_SOURCES = kcmcgi.cpp kcm_cgi_la_SOURCES = kcmcgi.cpp
kcm_cgi_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined kcm_cgi_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_cgi_la_LIBADD = -lkdeui $(LIB_KIO) kcm_cgi_la_LIBADD = -ltdeui $(LIB_KIO)
INCLUDES= $(all_includes) INCLUDES= $(all_includes)

@ -2,7 +2,7 @@
## Edit from Makefile.am of kdebase/kioslave/man ## Edit from Makefile.am of kdebase/kioslave/man
INCLUDES= $(all_includes) INCLUDES= $(all_includes)
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
####### Files ####### Files

@ -1,7 +1,7 @@
kde_module_LTLIBRARIES = kio_fish.la kde_module_LTLIBRARIES = kio_fish.la
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kio_fish_la_SOURCES = fish.cpp kio_fish_la_SOURCES = fish.cpp
kio_fish_la_LIBADD = $(LIB_KSYCOCA) $(LIBUTIL) kio_fish_la_LIBADD = $(LIB_KSYCOCA) $(LIBUTIL)

@ -36,6 +36,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kdeinit_kded-shared LINK tdeinit_kded-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -1,7 +1,7 @@
## Makfile.am for kio_mac ## Makfile.am for kio_mac
INCLUDES= $(all_includes) INCLUDES= $(all_includes)
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
####### Files ####### Files

@ -1,14 +1,14 @@
## Makefile.am of kdebase/kioslave/man ## Makefile.am of kdebase/kioslave/man
INCLUDES= $(all_includes) INCLUDES= $(all_includes)
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
EXTRA_PROGRAMS = kio_man_test man2html EXTRA_PROGRAMS = kio_man_test man2html
####### just for testing (j.habenicht@europemail.com, 15.02.2001) ####### just for testing (j.habenicht@europemail.com, 15.02.2001)
kio_man_test_SOURCES = kio_man_test.cpp kio_man_test_SOURCES = kio_man_test.cpp
kio_man_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kio_man_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kio_man_test_LDADD = man2html.lo kio_man.lo $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) kio_man_test_LDADD = man2html.lo kio_man.lo $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
####### Files ####### Files
@ -39,7 +39,7 @@ messages:
man2html_SOURCES = dummy.cpp man2html_SOURCES = dummy.cpp
man2html_LDADD = man2html_simple.o $(LIB_QT) man2html_LDADD = man2html_simple.o $(LIB_QT)
man2html_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor man2html_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
dummy.cpp: dummy.cpp:
echo > $@ echo > $@

@ -47,7 +47,7 @@ if( WITH_HAL )
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK mediacommon-static kdeinit_kded-shared ${HAL_LIBRARIES} -lhal-storage ${DBUS_TQT_LIBRARIES} LINK mediacommon-static tdeinit_kded-shared ${HAL_LIBRARIES} -lhal-storage ${DBUS_TQT_LIBRARIES}
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )
else( ) else( )
@ -59,7 +59,7 @@ else( )
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK mediacommon-static kdeinit_kded-shared LINK mediacommon-static tdeinit_kded-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )
endif( ) endif( )

@ -1079,37 +1079,37 @@ bool HALBackend::setMountoptions(const TQString &name, const TQStringList &optio
return true; return true;
} }
TQString startKdeSudoProcess(const TQString& kdesudoPath, const TQString& command, TQString startKdeSudoProcess(const TQString& tdesudoPath, const TQString& command,
const TQString& dialogCaption, const TQString& dialogComment) const TQString& dialogCaption, const TQString& dialogComment)
{ {
KProcess kdesudoProcess; KProcess tdesudoProcess;
kdesudoProcess << kdesudoPath tdesudoProcess << tdesudoPath
<< "-d" << "-d"
<< "--noignorebutton" << "--noignorebutton"
<< "--caption" << dialogCaption << "--caption" << dialogCaption
<< "--comment" << dialogComment << "--comment" << dialogComment
<< "-c" << command; << "-c" << command;
// @todo handle kdesudo output // @todo handle tdesudo output
kdesudoProcess.start(KProcess::Block); tdesudoProcess.start(KProcess::Block);
return TQString(); return TQString();
} }
TQString startKdeSuProcess(const TQString& kdesuPath, const TQString& command, TQString startKdeSuProcess(const TQString& tdesuPath, const TQString& command,
const TQString& dialogCaption) const TQString& dialogCaption)
{ {
KProcess kdesuProcess; KProcess tdesuProcess;
kdesuProcess << kdesuPath tdesuProcess << tdesuPath
<< "-d" << "-d"
<< "--noignorebutton" << "--noignorebutton"
<< "--caption" << dialogCaption << "--caption" << dialogCaption
<< "-c" << command; << "-c" << command;
// @todo handle kdesu output // @todo handle tdesu output
kdesuProcess.start(KProcess::Block); tdesuProcess.start(KProcess::Block);
return TQString(); return TQString();
} }
@ -1118,15 +1118,15 @@ TQString startPrivilegedProcess(const TQString& command, const TQString& dialogC
{ {
TQString error; TQString error;
TQString kdesudoPath = KStandardDirs::findExe("kdesudo"); TQString tdesudoPath = KStandardDirs::findExe("tdesudo");
if (!kdesudoPath.isEmpty()) if (!tdesudoPath.isEmpty())
error = startKdeSudoProcess(kdesudoPath, command, dialogCaption, dialogComment); error = startKdeSudoProcess(tdesudoPath, command, dialogCaption, dialogComment);
else { else {
TQString kdesuPath = KStandardDirs::findExe("kdesu"); TQString tdesuPath = KStandardDirs::findExe("tdesu");
if (!kdesuPath.isEmpty()) if (!tdesuPath.isEmpty())
error = startKdeSuProcess(kdesuPath, command, dialogCaption); error = startKdeSuProcess(tdesuPath, command, dialogCaption);
} }
return error; return error;

@ -38,6 +38,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK mediacommon-static kdeinit_kded-shared LINK mediacommon-static tdeinit_kded-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -5,7 +5,7 @@ AM_LDFLAGS = $(all_libraries)
kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp decryptdialog.ui dialog.cpp kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp decryptdialog.ui dialog.cpp
kio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) $(LIB_KDEUI) kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) $(LIB_KDEUI)
METASOURCES = AUTO METASOURCES = AUTO

@ -1,7 +1,7 @@
## Makefile.am of kdebase/kioslave/man ## Makefile.am of kdebase/kioslave/man
INCLUDES= $(all_includes) INCLUDES= $(all_includes)
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
####### Files ####### Files

@ -71,7 +71,7 @@
using namespace KIO; using namespace KIO;
using namespace std; using namespace std;
//this is taken from kdelibs/kdecore/fakes.cpp //this is taken from kdelibs/tdecore/fakes.cpp
//#if !defined(HAVE_GETDOMAINNAME) //#if !defined(HAVE_GETDOMAINNAME)
int x_getdomainname(char *name, size_t len) int x_getdomainname(char *name, size_t len)

@ -36,6 +36,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kdeinit_kded-shared LINK tdeinit_kded-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -10,7 +10,7 @@
- Write our own askpass program using kde - Write our own askpass program using kde
- set env SSH_ASKPASS_PROGRAM before launching - set env SSH_ASKPASS_PROGRAM before launching
-how to do this? KProcess doesn't give us access to env variables. -how to do this? KProcess doesn't give us access to env variables.
- Our askpass program can probably talk to the kdesu daemon to implement caching. - Our askpass program can probably talk to the tdesu daemon to implement caching.
- chmod() succeeds, but konqueror always puts permissions to 0 afterwards. The properties - chmod() succeeds, but konqueror always puts permissions to 0 afterwards. The properties
dialog is right though. dialog is right though.
Nevermind - ftp ioslave does this too! Maybe a bug with konqueror. Nevermind - ftp ioslave does this too! Maybe a bug with konqueror.

@ -1,7 +1,7 @@
## Makefile.am of kdebase/kioslave/sftp ## Makefile.am of kdebase/kioslave/sftp
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
METASOURCES = AUTO METASOURCES = AUTO
####### Files ####### Files

@ -18,7 +18,7 @@
/* /*
DEBUGGING DEBUGGING
We are pretty much left with kdDebug messages for debugging. We can't use a gdb We are pretty much left with kdDebug messages for debugging. We can't use a gdb
as described in the ioslave DEBUG.howto because kdeinit has to run in a terminal. as described in the ioslave DEBUG.howto because tdeinit has to run in a terminal.
Ssh will detect this terminal and ask for a password there, but will just get garbage. Ssh will detect this terminal and ask for a password there, but will just get garbage.
So we can't connect. So we can't connect.
*/ */

@ -1,7 +1,7 @@
/* vi: ts=8 sts=4 sw=4 /* vi: ts=8 sts=4 sw=4
* *
* *
* This file is part of the KDE project, module kdesu. * This file is part of the KDE project, module tdesu.
* Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org> * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
* *
* This file contains code from TEShell.C of the KDE konsole. * This file contains code from TEShell.C of the KDE konsole.
@ -51,8 +51,8 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include "process.h" #include "process.h"
#include <kdesu/kdesu_pty.h> #include <tdesu/tdesu_pty.h>
#include <kdesu/kcookie.h> #include <tdesu/kcookie.h>
MyPtyProcess::MyPtyProcess() MyPtyProcess::MyPtyProcess()

@ -1,7 +1,7 @@
/* vi: ts=8 sts=4 sw=4 /* vi: ts=8 sts=4 sw=4
* *
* *
* This file is part of the KDE project, module kdesu. * This file is part of the KDE project, module tdesu.
* Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org> * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
* *
* This is free software; you can use this library under the GNU Library * This is free software; you can use this library under the GNU Library

@ -36,6 +36,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kdeinit_kded-shared LINK tdeinit_kded-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -1,7 +1,7 @@
## Makefile.am of kdebase/kioslave/tar ## Makefile.am of kdebase/kioslave/tar
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
METASOURCES = AUTO METASOURCES = AUTO
kde_module_LTLIBRARIES = kio_tar.la kde_module_LTLIBRARIES = kio_tar.la

@ -96,7 +96,7 @@ set( target djvuthumbnail )
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES djvucreator.cpp SOURCES djvucreator.cpp
LINK kdecore-shared LINK tdecore-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )
@ -109,7 +109,7 @@ if( WITH_XCURSOR )
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES cursorcreator.cpp SOURCES cursorcreator.cpp
LINK kdecore-shared ${XCURSOR_LIBRARIES} LINK tdecore-shared ${XCURSOR_LIBRARIES}
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )
@ -126,7 +126,7 @@ if( WITH_OPENEXR )
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES exrcreator.cpp SOURCES exrcreator.cpp
LINK kdecore-shared ${OPENEXR_LIBRARIES} LINK tdecore-shared ${OPENEXR_LIBRARIES}
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -1,7 +1,7 @@
## Makefile.am of kdebase/kioslave/thumbnail ## Makefile.am of kdebase/kioslave/thumbnail
INCLUDES = $(all_includes) $(EXR_FLAGS) INCLUDES = $(all_includes) $(EXR_FLAGS)
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
METASOURCES = AUTO METASOURCES = AUTO
if have_xcursor if have_xcursor

@ -12,7 +12,7 @@ kio_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
bin_PROGRAMS = ktrash bin_PROGRAMS = ktrash
ktrash_SOURCES = ktrash.cpp ktrash_SOURCES = ktrash.cpp
ktrash_LDADD = $(LIB_KIO) ktrash_LDADD = $(LIB_KIO)
ktrash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor ktrash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kde_services_DATA = trash.protocol kde_services_DATA = trash.protocol

@ -36,7 +36,7 @@ install( PROGRAMS klipper-1-2.pl klipper-trinity1.sh DESTINATION ${KCONF_UPDATE_
configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy.cpp COPYONLY ) configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy.cpp COPYONLY )
tde_add_kdeinit_executable( klipper AUTOMOC tde_add_tdeinit_executable( klipper AUTOMOC
SOURCES dummy.cpp SOURCES dummy.cpp
LINK ${TQT_LIBRARIES} LINK ${TQT_LIBRARIES}
EMBED klipper_common-static EMBED klipper_common-static

@ -3,7 +3,7 @@ INCLUDES= $(all_includes)
bin_PROGRAMS = bin_PROGRAMS =
lib_LTLIBRARIES = lib_LTLIBRARIES =
noinst_LTLIBRARIES = libklipper_common.la noinst_LTLIBRARIES = libklipper_common.la
kdeinit_LTLIBRARIES = klipper.la tdeinit_LTLIBRARIES = klipper.la
kde_module_LTLIBRARIES = klipper_panelapplet.la kde_module_LTLIBRARIES = klipper_panelapplet.la
CLEANFILES = dummy.cpp CLEANFILES = dummy.cpp

@ -32,17 +32,17 @@ install( FILES kmenueditui.rc DESTINATION ${DATA_INSTALL_DIR}/kmenuedit )
install( FILES kcontroleditui.rc DESTINATION ${DATA_INSTALL_DIR}/kcontroledit ) install( FILES kcontroleditui.rc DESTINATION ${DATA_INSTALL_DIR}/kcontroledit )
##### kmenuedit (kdeinit) ####################### ##### kmenuedit (tdeinit) #######################
tde_add_kdeinit_executable( kmenuedit AUTOMOC tde_add_tdeinit_executable( kmenuedit AUTOMOC
SOURCES main.cpp SOURCES main.cpp
LINK ${TQT_LIBRARIES} kmenueditcommon-static LINK ${TQT_LIBRARIES} kmenueditcommon-static
) )
##### kcontroledit (kdeinit) #################### ##### kcontroledit (tdeinit) ####################
tde_add_kdeinit_executable( kcontroledit AUTOMOC tde_add_tdeinit_executable( kcontroledit AUTOMOC
SOURCES kcontrol_main.cpp SOURCES kcontrol_main.cpp
LINK ${TQT_LIBRARIES} kmenueditcommon-static LINK ${TQT_LIBRARIES} kmenueditcommon-static
) )

@ -2,7 +2,7 @@ INCLUDES = $(all_includes)
bin_PROGRAMS = bin_PROGRAMS =
lib_LTLIBRARIES = lib_LTLIBRARIES =
kdeinit_LTLIBRARIES = kmenuedit.la kcontroledit.la tdeinit_LTLIBRARIES = kmenuedit.la kcontroledit.la
noinst_LTLIBRARIES = libkmenueditcommon.la noinst_LTLIBRARIES = libkmenueditcommon.la

@ -2,7 +2,7 @@ INCLUDES= $(all_includes)
bin_PROGRAMS = knetattach bin_PROGRAMS = knetattach
knetattach_SOURCES = knetattach.ui main.cpp knetattach_SOURCES = knetattach.ui main.cpp
knetattach_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor knetattach_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
knetattach_LDADD = $(LIB_KIO) knetattach_LDADD = $(LIB_KIO)
METASOURCES = AUTO METASOURCES = AUTO
xdg_apps_DATA = knetattach.desktop xdg_apps_DATA = knetattach.desktop

@ -92,7 +92,7 @@ tde_add_library( ${target} STATIC_PIC
) )
##### konqueror (kdeinit) ####################### ##### konqueror (tdeinit) #######################
set( target konqueror ) set( target konqueror )
@ -106,7 +106,7 @@ set( ${target}_SRCS
delayedinitializer.cc konq_mainwindow.cc konq_extensionmanager.cc delayedinitializer.cc konq_mainwindow.cc konq_extensionmanager.cc
) )
tde_add_kdeinit_executable( ${target} AUTOMOC tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK konqueror_intern-static konq-shared kutils-shared LINK konqueror_intern-static konq-shared kutils-shared
) )

@ -39,7 +39,7 @@ dirtree/* : KonqDirTree, the directory tree
Libs used by konqueror Libs used by konqueror
====================== ======================
kdecore, kdeui, kfile, khtml, kparts - usual stuff :) tdecore, tdeui, kfile, khtml, kparts - usual stuff :)
libkio - I/O stuff, mimetypes, services libkio - I/O stuff, mimetypes, services
libkonq - bookmarks, properties dialog, templates ("new") menu, icon view widget libkonq - bookmarks, properties dialog, templates ("new") menu, icon view widget

@ -6,7 +6,7 @@ SUBDIRS = . client iconview listview keditbookmarks shellcmdplugin about pics si
bin_PROGRAMS = bin_PROGRAMS =
lib_LTLIBRARIES = lib_LTLIBRARIES =
kdeinit_LTLIBRARIES = konqueror.la tdeinit_LTLIBRARIES = konqueror.la
noinst_LTLIBRARIES = libkonqueror_intern.la noinst_LTLIBRARIES = libkonqueror_intern.la
konqdatadir = $(kde_datadir)/konqueror konqdatadir = $(kde_datadir)/konqueror

@ -110,9 +110,9 @@ TQString KonqAboutPageFactory::launch()
TQString home_folder = TQDir::homeDirPath(); TQString home_folder = TQDir::homeDirPath();
TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small ); TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
res = res.tqarg( locate( "data", "kdeui/about/kde_infopage.css" ) ); res = res.tqarg( locate( "data", "tdeui/about/kde_infopage.css" ) );
if ( kapp->reverseLayout() ) if ( kapp->reverseLayout() )
res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
else else
res = res.tqarg( "" ); res = res.tqarg( "" );
@ -195,9 +195,9 @@ TQString KonqAboutPageFactory::intro()
TQString gohome_icon_path = iconloader->iconPath("gohome", KIcon::Small ); TQString gohome_icon_path = iconloader->iconPath("gohome", KIcon::Small );
TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small ); TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
res = res.tqarg( locate( "data", "kdeui/about/kde_infopage.css" ) ); res = res.tqarg( locate( "data", "tdeui/about/kde_infopage.css" ) );
if ( kapp->reverseLayout() ) if ( kapp->reverseLayout() )
res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
else else
res = res.tqarg( "" ); res = res.tqarg( "" );
@ -250,9 +250,9 @@ TQString KonqAboutPageFactory::specs()
if ( res.isEmpty() ) if ( res.isEmpty() )
return res; return res;
res = res.tqarg( locate( "data", "kdeui/about/kde_infopage.css" ) ); res = res.tqarg( locate( "data", "tdeui/about/kde_infopage.css" ) );
if ( kapp->reverseLayout() ) if ( kapp->reverseLayout() )
res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
else else
res = res.tqarg( "" ); res = res.tqarg( "" );
@ -347,9 +347,9 @@ TQString KonqAboutPageFactory::tips()
iconloader->iconPath("view_left_right", KIcon::Small ); iconloader->iconPath("view_left_right", KIcon::Small );
TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small ); TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
res = res.tqarg( locate( "data", "kdeui/about/kde_infopage.css" ) ); res = res.tqarg( locate( "data", "tdeui/about/kde_infopage.css" ) );
if ( kapp->reverseLayout() ) if ( kapp->reverseLayout() )
res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
else else
res = res.tqarg( "" ); res = res.tqarg( "" );
@ -503,7 +503,7 @@ void KonqAboutPage::urlSelected( const TQString &url, int button, int state, con
TQStringList args = TQStringList::split( TQChar( ' ' ), url.mid( 6 ) ); TQStringList args = TQStringList::split( TQChar( ' ' ), url.mid( 6 ) );
TQString executable = args[ 0 ]; TQString executable = args[ 0 ];
args.remove( args.begin() ); args.remove( args.begin() );
KApplication::kdeinitExec( executable, args ); KApplication::tdeinitExec( executable, args );
return; return;
} }

@ -27,7 +27,7 @@ install( FILES kfmclient_3_2.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
install( PROGRAMS kfmclient_3_2_update.sh DESTINATION ${DATA_INSTALL_DIR}/kconf_update ) install( PROGRAMS kfmclient_3_2_update.sh DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
##### kfmclient (kdeinit) ####################### ##### kfmclient (tdeinit) #######################
set( target kfmclient ) set( target kfmclient )
@ -37,7 +37,7 @@ set( ${target}_SRCS
${CMAKE_SOURCE_DIR}/kdesktop/KDesktopIface.stub ${CMAKE_SOURCE_DIR}/kdesktop/KDesktopIface.stub
) )
tde_add_kdeinit_executable( ${target} AUTOMOC tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kio-shared LINK kio-shared
) )

@ -2,7 +2,7 @@ AM_CPPFLAGS = -DQT_NO_CAST_ASCII
bin_PROGRAMS= bin_PROGRAMS=
lib_LTLIBRARIES = lib_LTLIBRARIES =
kdeinit_LTLIBRARIES = kfmclient.la tdeinit_LTLIBRARIES = kfmclient.la
INCLUDES= -I.. $(all_includes) INCLUDES= -I.. $(all_includes)
kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version

@ -42,7 +42,7 @@ tde_add_executable( ${target}
) )
##### keditbookmarks (kdeinit) ################## ##### keditbookmarks (tdeinit) ##################
set( target keditbookmarks ) set( target keditbookmarks )
@ -56,7 +56,7 @@ set( ${target}_SRCS AUTOMOC
set( KDE3_DCOPIDL_EXECUTABLE ${KDE3_DCOPIDLNG_EXECUTABLE} ) set( KDE3_DCOPIDL_EXECUTABLE ${KDE3_DCOPIDLNG_EXECUTABLE} )
tde_add_kdeinit_executable( ${target} AUTOMOC tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK konq-shared LINK konq-shared
) )

@ -4,10 +4,10 @@ METASOURCES = AUTO
bin_PROGRAMS = kbookmarkmerger bin_PROGRAMS = kbookmarkmerger
lib_LTLIBRARIES = lib_LTLIBRARIES =
kdeinit_LTLIBRARIES = keditbookmarks.la tdeinit_LTLIBRARIES = keditbookmarks.la
kbookmarkmerger_SOURCES = kbookmarkmerger.cpp kbookmarkmerger_SOURCES = kbookmarkmerger.cpp
kbookmarkmerger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kbookmarkmerger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kbookmarkmerger_LDADD = $(LIB_KIO) kbookmarkmerger_LDADD = $(LIB_KIO)
dcop_DCOPIDLNG = true dcop_DCOPIDLNG = true

@ -448,7 +448,7 @@ void KonqCombo::selectWord(TQKeyEvent *e)
int pos_old = pos; int pos_old = pos;
int count = 0; int count = 0;
// TODO: make these a parameter when in kdelibs/kdeui... // TODO: make these a parameter when in kdelibs/tdeui...
TQValueList<TQChar> chars; TQValueList<TQChar> chars;
chars << TQChar('/') << TQChar('.') << TQChar('?') << TQChar('#') << TQChar(':'); chars << TQChar('/') << TQChar('.') << TQChar('?') << TQChar('#') << TQChar(':');
bool allow_space_break = true; bool allow_space_break = true;

@ -5945,7 +5945,7 @@ static int current_memory_usage( int* limit )
// Check malloc() usage - very imprecise, but better than nothing. // Check malloc() usage - very imprecise, but better than nothing.
int usage_sum = 0; int usage_sum = 0;
#if defined(KDE_MALLINFO_STDLIB) || defined(KDE_MALLINFO_MALLOC) #if defined(KDE_MALLINFO_STDLIB) || defined(KDE_MALLINFO_MALLOC)
// ugly hack for kdecore/malloc // ugly hack for tdecore/malloc
extern int kde_malloc_is_used; extern int kde_malloc_is_used;
free( calloc( 4, 4 )); // trigger setting kde_malloc_is_used free( calloc( 4, 4 )); // trigger setting kde_malloc_is_used
if( kde_malloc_is_used ) if( kde_malloc_is_used )

@ -40,6 +40,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK konqueror_intern-static kio-shared kdeinit_kded-shared LINK konqueror_intern-static kio-shared tdeinit_kded-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -109,7 +109,7 @@ void KonqyPreloader::updateCount()
{ {
if( !check_always_preloaded_timer.isActive()) if( !check_always_preloaded_timer.isActive())
{ {
if( kapp->kdeinitExec( TQString::tqfromLatin1( "konqueror" ), if( kapp->tdeinitExec( TQString::tqfromLatin1( "konqueror" ),
TQStringList() << TQString::tqfromLatin1( "--preload" ), NULL, NULL, "0" ) == 0 ) TQStringList() << TQString::tqfromLatin1( "--preload" ), NULL, NULL, "0" ) == 0 )
{ {
kdDebug( 1202 ) << "Preloading Konqueror instance" << endl; kdDebug( 1202 ) << "Preloading Konqueror instance" << endl;

@ -28,7 +28,7 @@
#include <kinputdialog.h> #include <kinputdialog.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kdesu/process.h> #include <tdesu/process.h>
#include <klocale.h> #include <klocale.h>
KShellCommandExecutor::KShellCommandExecutor(const TQString& command, TQWidget* parent) KShellCommandExecutor::KShellCommandExecutor(const TQString& command, TQWidget* parent)

@ -11,6 +11,6 @@ konq_sidebartree_history_la_LIBADD = ../../libkonqsidebarplugin.la ../libkonq_s
kcm_history_la_SOURCES = kcmhistory.cpp history_dlg.ui history_settings.cpp history_settings.skel kcm_history_la_SOURCES = kcmhistory.cpp history_dlg.ui history_settings.cpp history_settings.skel
kcm_history_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined kcm_history_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_history_la_LIBADD = -lkdeui $(top_builddir)/libkonq/libkonq.la kcm_history_la_LIBADD = -ltdeui $(top_builddir)/libkonq/libkonq.la
xdg_apps_DATA = kcmhistory.desktop xdg_apps_DATA = kcmhistory.desktop

@ -54,12 +54,12 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kdeinit_kded-shared LINK tdeinit_kded-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )
##### konsole (kdeinit) ######################### ##### konsole (tdeinit) #########################
set( target konsole ) set( target konsole )
@ -72,7 +72,7 @@ set( ${target}_SRCS
zmodem_dialog.cpp printsettings.cpp zmodem_dialog.cpp printsettings.cpp
) )
tde_add_kdeinit_executable( ${target} AUTOMOC tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kdeprint-shared kio-shared ${XRENDER_LIBRARIES} dl LINK tdeprint-shared kio-shared ${XRENDER_LIBRARIES} dl
) )

@ -8,7 +8,7 @@ INCLUDES = -I. $(all_includes)
bin_PROGRAMS = bin_PROGRAMS =
noinst_PROGRAMS = fontembedder noinst_PROGRAMS = fontembedder
lib_LTLIBRARIES = lib_LTLIBRARIES =
kdeinit_LTLIBRARIES = konsole.la tdeinit_LTLIBRARIES = konsole.la
kde_module_LTLIBRARIES = libkonsolepart.la kded_kwrited.la kde_module_LTLIBRARIES = libkonsolepart.la kded_kwrited.la
libkonsolepart_la_SOURCES = TEPty.cpp BlockArray.cpp konsole_part.cpp \ libkonsolepart_la_SOURCES = TEPty.cpp BlockArray.cpp konsole_part.cpp \
@ -36,7 +36,7 @@ kded_kwrited_la_SOURCES = kwrited.cpp TEPty.cpp kwrited.skel
kded_kwrited_la_LIBADD = $(LIB_KDECORE) kded_kwrited_la_LIBADD = $(LIB_KDECORE)
kded_kwrited_la_LDFLAGS = $(all_libraries) -module -avoid-version kded_kwrited_la_LDFLAGS = $(all_libraries) -module -avoid-version
# konsole kdeinit module # konsole tdeinit module
konsole_la_SOURCES = TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \ konsole_la_SOURCES = TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \
TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsoleiface.skel sessioniface.skel \ TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsoleiface.skel sessioniface.skel \
konsole_wcwidth.cpp konsolebookmarkhandler.cpp konsolebookmarkmenu.cpp \ konsole_wcwidth.cpp konsolebookmarkhandler.cpp konsolebookmarkmenu.cpp \
@ -46,7 +46,7 @@ konsole_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDEPRINT) $(LIBUTIL) $(XTESTLI
# kcmkonsole_SOURCES = kcmkonsole.cpp schema.cpp # kcmkonsole_SOURCES = kcmkonsole.cpp schema.cpp
# kcmkonsole_LDADD = $(LIB_KDEUI) # kcmkonsole_LDADD = $(LIB_KDEUI)
# kcmkonsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor # kcmkonsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
noinst_HEADERS = TEWidget.h TEPty.h TEmulation.h TEmuVt102.h \ noinst_HEADERS = TEWidget.h TEPty.h TEmulation.h TEmuVt102.h \
TECommon.h TEScreen.h konsole.h schema.h session.h konsole_wcwidth.h \ TECommon.h TEScreen.h konsole.h schema.h session.h konsole_wcwidth.h \

@ -2073,7 +2073,7 @@ void Konsole::slotConfigure()
{ {
TQStringList args; TQStringList args;
args << "kcmkonsole"; args << "kcmkonsole";
KApplication::kdeinitExec( "kcmshell", args ); KApplication::tdeinitExec( "kcmshell", args );
} }
void Konsole::reparseConfiguration() void Konsole::reparseConfiguration()

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2002 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2002 Michael Goffioul <tdeprint@swing.be>
* (c) 2003 Waldo Bastian <bastian@kde.org> * (c) 2003 Waldo Bastian <bastian@kde.org>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or

@ -1,6 +1,6 @@
/* /*
* This file is part of the KDE libraries * This file is part of the KDE libraries
* Copyright (c) 2002 Michael Goffioul <kdeprint@swing.be> * Copyright (c) 2002 Michael Goffioul <tdeprint@swing.be>
* Copyright (c) 2003 Waldo Bastian <bastian@kde.org> * Copyright (c) 2003 Waldo Bastian <bastian@kde.org>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -21,7 +21,7 @@
#ifndef PRINTSETTINGS_H #ifndef PRINTSETTINGS_H
#define PRINTSETTINGS_H #define PRINTSETTINGS_H
#include <kdeprint/kprintdialogpage.h> #include <tdeprint/kprintdialogpage.h>
class TQCheckBox; class TQCheckBox;

@ -35,6 +35,6 @@ tde_add_executable( kpager AUTOMOC
SOURCES SOURCES
desktop.cpp kpager.cpp config.cpp windowdrag.cpp desktop.cpp kpager.cpp config.cpp windowdrag.cpp
kpagerIface.skel main.cpp kpagerIface.skel main.cpp
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -6,7 +6,7 @@ kpager_SOURCES = desktop.cpp kpager.cpp config.cpp windowdrag.cpp \
kpagerIface.skel main.cpp kpagerIface.skel main.cpp
kpager_METASOURCES = AUTO kpager_METASOURCES = AUTO
kpager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kpager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kpager_LDADD = $(LIB_KDEUI) kpager_LDADD = $(LIB_KDEUI)

@ -38,7 +38,7 @@ METASOURCES = AUTO
KDE_ICON= AUTO KDE_ICON= AUTO
# the library search path. # the library search path.
kpersonalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kpersonalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
# Uncomment the following two lines if you add a ui.rc file for your application to make use of # Uncomment the following two lines if you add a ui.rc file for your application to make use of
# KDE´s XML GUI builing # KDE´s XML GUI builing

@ -23,7 +23,7 @@ link_directories(
tde_add_executable( kreadconfig tde_add_executable( kreadconfig
SOURCES kreadconfig.cpp SOURCES kreadconfig.cpp
LINK kdecore-shared LINK tdecore-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )
@ -32,6 +32,6 @@ tde_add_executable( kreadconfig
tde_add_executable( kwriteconfig tde_add_executable( kwriteconfig
SOURCES kwriteconfig.cpp SOURCES kwriteconfig.cpp
LINK kdecore-shared LINK tdecore-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -1,7 +1,7 @@
AM_CPPFLAGS = -DQT_NO_CAST_ASCII AM_CPPFLAGS = -DQT_NO_CAST_ASCII
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
LDADD = $(LIB_KDECORE) LDADD = $(LIB_KDECORE)
bin_PROGRAMS = kreadconfig kwriteconfig bin_PROGRAMS = kreadconfig kwriteconfig

@ -25,6 +25,6 @@ link_directories(
tde_add_executable( krootbacking AUTOMOC tde_add_executable( krootbacking AUTOMOC
SOURCES SOURCES
main.cpp krootbacking.cpp main.cpp krootbacking.cpp
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -30,7 +30,7 @@ install( FILES KRandom.desktop KBlankscreen.desktop DESTINATION ${APPS_INSTALL_D
tde_add_executable( krandom.kss AUTOMOC tde_add_executable( krandom.kss AUTOMOC
SOURCES random.cpp SOURCES random.cpp
LINK kdeui-shared ${GL_LIBRARY} LINK tdeui-shared ${GL_LIBRARY}
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )
@ -39,6 +39,6 @@ tde_add_executable( krandom.kss AUTOMOC
tde_add_executable( kblankscrn.kss AUTOMOC tde_add_executable( kblankscrn.kss AUTOMOC
SOURCES blankscrn.cpp SOURCES blankscrn.cpp
LINK kscreensaver-shared kdeui-shared LINK kscreensaver-shared tdeui-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -4,7 +4,7 @@
AM_CPPFLAGS = -UQT_NO_ASCII_CAST AM_CPPFLAGS = -UQT_NO_ASCII_CAST
INCLUDES = $(GLINC) $(all_includes) INCLUDES = $(GLINC) $(all_includes)
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
bin_PROGRAMS = krandom.kss kblankscrn.kss bin_PROGRAMS = krandom.kss kblankscrn.kss

@ -36,12 +36,12 @@ install( FILES ksmserver.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
install( FILES move_session_config.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) install( FILES move_session_config.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
##### ksmserver (kdeinit) ####################### ##### ksmserver (tdeinit) #######################
tde_add_kdeinit_executable( ksmserver AUTOMOC tde_add_tdeinit_executable( ksmserver AUTOMOC
SOURCES SOURCES
main.cpp server.cpp shutdowndlg.cpp startupdlg.cpp main.cpp server.cpp shutdowndlg.cpp startupdlg.cpp
legacy.cpp startup.cpp shutdown.cpp client.cpp legacy.cpp startup.cpp shutdown.cpp client.cpp
KSMServerInterface.skel server.skel timed.ui KSMServerInterface.skel server.skel timed.ui
LINK dmctl-static kdeui-shared krsync-shared ${HAL_LIBRARIES} ${DBUS_TQT_LIBRARIES} LINK dmctl-static tdeui-shared krsync-shared ${HAL_LIBRARIES} ${DBUS_TQT_LIBRARIES}
) )

@ -21,7 +21,7 @@ INCLUDES= -I$(top_srcdir)/kdmlib $(all_includes) $(HAL_INCS) $(DBUS_INCS)
bin_PROGRAMS = bin_PROGRAMS =
lib_LTLIBRARIES = lib_LTLIBRARIES =
kdeinit_LTLIBRARIES = ksmserver.la tdeinit_LTLIBRARIES = ksmserver.la
noinst_HEADERS = global.h server.h noinst_HEADERS = global.h server.h
ksmserver_la_METASOURCES = AUTO ksmserver_la_METASOURCES = AUTO
@ -43,7 +43,7 @@ updatedir = $(kde_datadir)/kconf_update
EXTRA_PROGRAMS = testsh EXTRA_PROGRAMS = testsh
testsh_SOURCES = test.cpp timed.ui testsh_SOURCES = test.cpp timed.ui
testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testsh_LDADD = $(LIB_KDEUI) shutdowndlg.lo ../kdmlib/libdmctl.la $(HAL_LIBS) $(DBUS_LIBS) testsh_LDADD = $(LIB_KDEUI) shutdowndlg.lo ../kdmlib/libdmctl.la $(HAL_LIBS) $(DBUS_LIBS)
messages: messages:

@ -53,7 +53,7 @@ should be in startup.cpp and going down in that source file should
follow the startup order (but note that this is just a documentation follow the startup order (but note that this is just a documentation
which may get outdated, so in case of doubts the source wins ;) ). which may get outdated, so in case of doubts the source wins ;) ).
The startkde scripts already launches kdeinit, which in turns launches The startkde scripts already launches tdeinit, which in turns launches
KDE daemons like dcopserver, klauncher and kded. Kded loads autoloaded KDE daemons like dcopserver, klauncher and kded. Kded loads autoloaded
kded modules, i.e. those that have X-KDE-Kded-autoload=true in .desktop kded modules, i.e. those that have X-KDE-Kded-autoload=true in .desktop
files. The exact way autoloading works is controlled by X-KDE-Kded-phase=, files. The exact way autoloading works is controlled by X-KDE-Kded-phase=,
@ -69,7 +69,7 @@ modules. There are three kcminit phases, 0, 1 and 2, controlled
by X-KDE-Init-Phase= in the .desktop file, which defaults to 1. Phase 0 kcminit by X-KDE-Init-Phase= in the .desktop file, which defaults to 1. Phase 0 kcminit
modules should be only those that really need to be run early in the startup modules should be only those that really need to be run early in the startup
process (and those should probably actually use kstartupconfig in startkde process (and those should probably actually use kstartupconfig in startkde
to be done even before kdeinit and daemons). After executing phase 0 to be done even before tdeinit and daemons). After executing phase 0
modules kcminit returns and waits. modules kcminit returns and waits.
When ksmserver is launched, the first thing it does is launching When ksmserver is launched, the first thing it does is launching

@ -109,7 +109,7 @@ void KSMServer::startApplication( TQStringList command, const TQString& clientMa
command.prepend( "--" ); command.prepend( "--" );
command.prepend( userId ); command.prepend( userId );
command.prepend( "-u" ); command.prepend( "-u" );
command.prepend( "kdesu" ); command.prepend( "tdesu" );
} }
} }
if ( !clientMachine.isEmpty() && clientMachine != "localhost" ) { if ( !clientMachine.isEmpty() && clientMachine != "localhost" ) {
@ -650,7 +650,7 @@ KSMServer::KSMServer( const TQString& windowManager, bool _only_local )
fprintf(f, "%s\n%i\n", session_manager, getpid()); fprintf(f, "%s\n%i\n", session_manager, getpid());
fclose(f); fclose(f);
setenv( "SESSION_MANAGER", session_manager, true ); setenv( "SESSION_MANAGER", session_manager, true );
// Pass env. var to kdeinit. // Pass env. var to tdeinit.
DCOPRef( launcher ).send( "setLaunchEnv", "SESSION_MANAGER", (const char*) session_manager ); DCOPRef( launcher ).send( "setLaunchEnv", "SESSION_MANAGER", (const char*) session_manager );
} }

@ -6,7 +6,7 @@ METASOURCES=AUTO
bin_PROGRAMS = ksplash bin_PROGRAMS = ksplash
ksplash_SOURCES = wndmain.cpp ksplashiface.skel main.cpp ksplash_SOURCES = wndmain.cpp ksplashiface.skel main.cpp
ksplash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor ksplash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
ksplash_LDADD = $(LIB_KDEUI) themeengine/default/libthemedefault.la themeengine/libksplashthemes.la $(LIB_KIO) ksplash_LDADD = $(LIB_KDEUI) themeengine/default/libthemedefault.la themeengine/libksplashthemes.la $(LIB_KIO)
noinst_HEADERS = ksplashiface.h wndmain.h noinst_HEADERS = ksplashiface.h wndmain.h

@ -38,6 +38,6 @@ install( FILES ksplashplugins.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
tde_add_library( ksplashthemes SHARED AUTOMOC tde_add_library( ksplashthemes SHARED AUTOMOC
SOURCES themeengine.cpp objkstheme.cpp SOURCES themeengine.cpp objkstheme.cpp
VERSION 0.0.0 VERSION 0.0.0
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )

@ -3,7 +3,7 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes)
noinst_LTLIBRARIES = libthemedefault.la noinst_LTLIBRARIES = libthemedefault.la
libthemedefault_la_SOURCES = themelegacy.cpp libthemedefault_la_SOURCES = themelegacy.cpp
libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
libthemedefault_la_LIBADD = $(LIB_KDEUI) ../libksplashthemes.la libthemedefault_la_LIBADD = $(LIB_KDEUI) ../libksplashthemes.la
kde_module_LTLIBRARIES = ksplashdefault.la kde_module_LTLIBRARIES = ksplashdefault.la

@ -3,5 +3,5 @@ INCLUDES = $(all_includes)
bin_PROGRAMS = ksplashsimple bin_PROGRAMS = ksplashsimple
ksplashsimple_SOURCES = main.cpp ksplashsimple_SOURCES = main.cpp
ksplashsimple_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor ksplashsimple_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
ksplashsimple_LDADD = $(LIB_XINERAMA) $(LIB_X11) $(LIB_QT) ksplashsimple_LDADD = $(LIB_XINERAMA) $(LIB_X11) $(LIB_QT)

@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/ksplashml/themeengine $(all_includes)
noinst_LTLIBRARIES = libthemestandard.la noinst_LTLIBRARIES = libthemestandard.la
libthemestandard_la_SOURCES = themestandard.cpp wndicon.cpp wndstatus.cpp libthemestandard_la_SOURCES = themestandard.cpp wndicon.cpp wndstatus.cpp
libthemestandard_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor libthemestandard_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
libthemestandard_la_LIBADD = $(LIB_KDEUI) ../libksplashthemes.la libthemestandard_la_LIBADD = $(LIB_KDEUI) ../libksplashthemes.la
kde_module_LTLIBRARIES = ksplashstandard.la kde_module_LTLIBRARIES = ksplashstandard.la

@ -3,7 +3,7 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes)
noinst_LTLIBRARIES = libthemedefault.la noinst_LTLIBRARIES = libthemedefault.la
libthemedefault_la_SOURCES = themelegacy.cpp libthemedefault_la_SOURCES = themelegacy.cpp
libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
libthemedefault_la_LIBADD = $(LIB_KDEUI) ../libksplashthemes.la libthemedefault_la_LIBADD = $(LIB_KDEUI) ../libksplashthemes.la
kde_module_LTLIBRARIES = ksplashdefault.la kde_module_LTLIBRARIES = ksplashdefault.la

@ -24,6 +24,6 @@ link_directories(
tde_add_executable( kstart AUTOMOC tde_add_executable( kstart AUTOMOC
SOURCES kstart.cpp SOURCES kstart.cpp
LINK kdecore-shared LINK tdecore-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -8,7 +8,7 @@ INCLUDES = $(all_includes)
bin_PROGRAMS = kstart bin_PROGRAMS = kstart
kstart_SOURCES = kstart.cpp kstart_SOURCES = kstart.cpp
kstart_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kstart_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kstart_LDADD = $(LIB_KDECORE) kstart_LDADD = $(LIB_KDECORE)
METASOURCES = kstart.moc METASOURCES = kstart.moc

@ -39,7 +39,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
APPSDIR = $(kde_appsdir)/Utilities APPSDIR = $(kde_appsdir)/Utilities
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
TARGET = khexdit TARGET = khexdit
LIBS = -lkfm -lkdeui -lkdecore -lqt -lX11 -lXext $(LIBSOCKET) LIBS = -lkfm -ltdeui -ltdecore -lqt -lX11 -lXext $(LIBSOCKET)
LDFLAGS += $(all_libraries) LDFLAGS += $(all_libraries)
# rules to make .o files # rules to make .o files

@ -32,7 +32,7 @@ ksysguard_LDADD = \
ksgrd/libksgrd.la \ ksgrd/libksgrd.la \
SensorDisplayLib/libsensordisplays.la \ SensorDisplayLib/libsensordisplays.la \
$(LIB_KDEUI) $(LIB_KIO) $(LIB_KDNSSD) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDNSSD)
ksysguard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor ksysguard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kpm_SOURCES = kpm.c kpm_SOURCES = kpm.c

@ -180,9 +180,9 @@ ProcessList::ProcessList(TQWidget *parent, const char* name)
aliases.insert("kcookiejar", new TQString("kdeapp")); aliases.insert("kcookiejar", new TQString("kdeapp"));
aliases.insert("kde", new TQString("kdeapp")); aliases.insert("kde", new TQString("kdeapp"));
aliases.insert("kded", new TQString("kdeapp")); aliases.insert("kded", new TQString("kdeapp"));
aliases.insert("kdeinit", new TQString("kdeapp")); aliases.insert("tdeinit", new TQString("kdeapp"));
aliases.insert("kdesktop", new TQString("kdeapp")); aliases.insert("kdesktop", new TQString("kdeapp"));
aliases.insert("kdesud", new TQString("kdeapp")); aliases.insert("tdesud", new TQString("kdeapp"));
aliases.insert("kdm", new TQString("kdeapp")); aliases.insert("kdm", new TQString("kdeapp"));
aliases.insert("khotkeys", new TQString("kdeapp")); aliases.insert("khotkeys", new TQString("kdeapp"));
aliases.insert("kio_file", new TQString("kdeapp")); aliases.insert("kio_file", new TQString("kdeapp"));

@ -38,6 +38,6 @@ tde_add_library( ksgrd SHARED AUTOMOC
SensorShellAgent.cc SensorSocketAgent.cc StyleEngine.cc SensorShellAgent.cc SensorSocketAgent.cc StyleEngine.cc
StyleSettings.cc TimerSettings.cc StyleSettings.cc TimerSettings.cc
VERSION 1.2.0 VERSION 1.2.0
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )

@ -44,7 +44,7 @@
#include "ProcessList.h" #include "ProcessList.h"
#define BUFSIZE 1024 #define BUFSIZE 1024
#define KDEINITLEN strlen("kdeinit: ") #define KDEINITLEN strlen("tdeinit: ")
typedef struct { typedef struct {
int alive; /* for "garbage collection" */ int alive; /* for "garbage collection" */

@ -40,7 +40,7 @@
#define BUFSIZE 1024 #define BUFSIZE 1024
#define TAGSIZE 32 #define TAGSIZE 32
#define KDEINITLEN strlen( "kdeinit: " ) #define KDEINITLEN strlen( "tdeinit: " )
static CONTAINER ProcessList = 0; static CONTAINER ProcessList = 0;
@ -287,9 +287,9 @@ static int updateProcess( int pid )
if ( fclose( fd ) ) if ( fclose( fd ) )
return -1; return -1;
/* Ugly hack to "fix" program name for kdeinit launched programs. */ /* Ugly hack to "fix" program name for tdeinit launched programs. */
if ( strcmp( ps->name, "kdeinit" ) == 0 && if ( strcmp( ps->name, "tdeinit" ) == 0 &&
strncmp( ps->cmdline, "kdeinit: ", KDEINITLEN ) == 0 && strncmp( ps->cmdline, "tdeinit: ", KDEINITLEN ) == 0 &&
strcmp( ps->cmdline + KDEINITLEN, "Running..." ) != 0 ) { strcmp( ps->cmdline + KDEINITLEN, "Running..." ) != 0 ) {
size_t len; size_t len;
char* end = strchr( ps->cmdline + KDEINITLEN, ' ' ); char* end = strchr( ps->cmdline + KDEINITLEN, ' ' );

@ -32,4 +32,4 @@ bin_PROGRAMS = ksysguardd
ksysguardd_SOURCES = Command.c conf.c ksysguardd.c PWUIDCache.c ksysguardd_SOURCES = Command.c conf.c ksysguardd.c PWUIDCache.c
ksysguardd_LDFLAGS = $(all_libraries) ksysguardd_LDFLAGS = $(all_libraries)
ksysguardd_LDADD = $(top_builddir)/ksysguard/ksysguardd/$(UNAME)/libksysguardd.a ../CContLib/libccont.a -lkdefakes_nonpic $(LIBHOSTS) $(LIB_DNSSD) $(LIB_KINFO) ksysguardd_LDADD = $(top_builddir)/ksysguard/ksysguardd/$(UNAME)/libksysguardd.a ../CContLib/libccont.a -ltdefakes_nonpic $(LIBHOSTS) $(LIB_DNSSD) $(LIB_KINFO)

@ -24,6 +24,6 @@ link_directories(
tde_add_executable( ksystraycmd AUTOMOC tde_add_executable( ksystraycmd AUTOMOC
SOURCES ksystraycmd.cpp main.cpp SOURCES ksystraycmd.cpp main.cpp
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -10,7 +10,7 @@ METASOURCES = ksystraycmd.moc
noinst_HEADERS = ksystraycmd.h noinst_HEADERS = ksystraycmd.h
ksystraycmd_SOURCES = ksystraycmd.cpp main.cpp ksystraycmd_SOURCES = ksystraycmd.cpp main.cpp
ksystraycmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor ksystraycmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
messages: messages:
$(XGETTEXT) $(ksystraycmd_SOURCES) -o $(podir)/ksystraycmd.pot $(XGETTEXT) $(ksystraycmd_SOURCES) -o $(podir)/ksystraycmd.pot

@ -35,6 +35,6 @@ install( FILES tips DESTINATION ${DATA_INSTALL_DIR}/kdewizard )
tde_add_executable( ktip AUTOMOC tde_add_executable( ktip AUTOMOC
SOURCES ktipwindow.cpp SOURCES ktipwindow.cpp
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -5,7 +5,7 @@ SUBDIRS = pics
bin_PROGRAMS = ktip bin_PROGRAMS = ktip
ktip_SOURCES = ktipwindow.cpp ktip_SOURCES = ktipwindow.cpp
ktip_LDADD = $(LIB_KDEUI) ktip_LDADD = $(LIB_KDEUI)
ktip_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor ktip_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
METASOURCES = AUTO METASOURCES = AUTO
KDE_ICON = AUTO KDE_ICON = AUTO

@ -348,14 +348,14 @@ the remaining buttons.</P>
<html> <html>
<p> <p>
Need comprehensive info about KDEPrinting?<br> </p> Need comprehensive info about KDEPrinting?<br> </p>
<p> Type <strong>help:/kdeprint/</strong> into a Konqueror address field <p> Type <strong>help:/tdeprint/</strong> into a Konqueror address field
and get the and get the
<a href="http://printing.kde.org/documentation/handbook/">KDEPrint Handbook</a> <a href="http://printing.kde.org/documentation/handbook/">KDEPrint Handbook</a>
displayed.</p> <p>This, plus more material (like a displayed.</p> <p>This, plus more material (like a
<a href="http://printing.kde.org/faq/">FAQ</a>, various <a href="http://printing.kde.org/faq/">FAQ</a>, various
<a href="http://printing.kde.org/documentation/tutorials/">Tutorials</a>, <a href="http://printing.kde.org/documentation/tutorials/">Tutorials</a>,
a "TipsNTricks" section and the a "TipsNTricks" section and the
<a href="http://mail.kde.org/mailman/listinfo/kde-print/">kdeprint mailing list</a>) <a href="http://mail.kde.org/mailman/listinfo/kde-print/">tdeprint mailing list</a>)
are available at are available at
<a href="http://printing.kde.org/">printing.kde.org</a>... <a href="http://printing.kde.org/">printing.kde.org</a>...
</p> </p>
@ -534,7 +534,7 @@ and "dragging" it with the mouse.</p><br>
<p> Then use <strong>'kprinter'</strong> as "print command". <p> Then use <strong>'kprinter'</strong> as "print command".
Works with Netscape, Mozilla, Galeon, gv, Acrobat Reader, Works with Netscape, Mozilla, Galeon, gv, Acrobat Reader,
StarOffice, OpenOffice.org, any GNOME application and many more...</p> StarOffice, OpenOffice.org, any GNOME application and many more...</p>
<p>See <a href="http://printing.kde.org/faq/kdeprint.phtml#out">printing.kde.org</a> <p>See <a href="http://printing.kde.org/faq/tdeprint.phtml#out">printing.kde.org</a>
for more detailed hints... for more detailed hints...
</p> </p>
<center> <center>
@ -630,7 +630,7 @@ You may specify print files and/or name a printer from the command line:
<pre> <pre>
kprinter -d infotec \ kprinter -d infotec \
/home/kurt/paragliding.jpg \ /home/kurt/paragliding.jpg \
../kdeprint-handbook.pdf \ ../tdeprint-handbook.pdf \
/opt/trinity/flyer.ps /opt/trinity/flyer.ps
</pre> </pre>
This prints 3 different files (from different folders) to printer "infotec". This prints 3 different files (from different folders) to printer "infotec".

@ -45,7 +45,7 @@ install( FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/kwin )
install( FILES kwin.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) install( FILES kwin.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
##### kwin (kdeinit) ############################ ##### kwin (tdeinit) ############################
set( target kwin ) set( target kwin )
@ -58,9 +58,9 @@ set( ${target}_SRCS
geometry.cpp rules.cpp geometry.cpp rules.cpp
) )
tde_add_kdeinit_executable( ${target} AUTOMOC tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kdecorations-shared kdeui-shared Xext LINK tdecorations-shared tdeui-shared Xext
) )
##### install import cmake modules ############### ##### install import cmake modules ###############

@ -12,7 +12,7 @@ compliance with the spec. Some parts also involve the pager and clients which
this document will cater for as well where applicable. this document will cater for as well where applicable.
If you modify the level of NetWM compliance (via modification of kwin/*, If you modify the level of NetWM compliance (via modification of kwin/*,
kdecore/netwm.* or kdecore/kwin.* etc.), or notice any new hints that tdecore/netwm.* or tdecore/kwin.* etc.), or notice any new hints that
were added after version 1.2, please modify this document appropriately. were added after version 1.2, please modify this document appropriately.
Properties are ordered in the table in the order they are found in the Properties are ordered in the table in the order they are found in the
specification. To list any important notes regarding a property, just specification. To list any important notes regarding a property, just
@ -161,7 +161,7 @@ version 2.0
/ 1.2.6. / 1.2.6.
Should be checked. Should be checked.
+ 1. (rest of the section) + 1. (rest of the section)
+ 2.8. kmanagerselection.* in kdecore + 2.8. kmanagerselection.* in tdecore
+ 2. (rest of the section) + 2. (rest of the section)
Not a KWin thing. Not a KWin thing.
* - patch sent to TT to make TQClipboard sufficiently compliant * - patch sent to TT to make TQClipboard sufficiently compliant

@ -110,7 +110,7 @@ The rest of the files contain additional helper classes:
- utils.* - various small utility functions/classes - utils.* - various small utility functions/classes
KWin also uses code from kdelibs, specifically files netwm.cpp, netwm.h, netwm_def.h and netwm_p.h KWin also uses code from kdelibs, specifically files netwm.cpp, netwm.h, netwm_def.h and netwm_p.h
from kdelibs/kdecore. These files implement support for the EWMH window manager specification, from kdelibs/tdecore. These files implement support for the EWMH window manager specification,
originally called NETWM (hence the filenames). originally called NETWM (hence the filenames).

@ -8,7 +8,7 @@ SUBDIRS = lib . killer kcmkwin pics clients oldheaders data $(KOMPMGR)
bin_PROGRAMS = bin_PROGRAMS =
lib_LTLIBRARIES = lib_LTLIBRARIES =
kdeinit_LTLIBRARIES = kwin.la tdeinit_LTLIBRARIES = kwin.la
kwin_la_SOURCES = workspace.cpp client.cpp placement.cpp atoms.cpp \ kwin_la_SOURCES = workspace.cpp client.cpp placement.cpp atoms.cpp \
utils.cpp layers.cpp main.cpp popupinfo.cpp tabbox.cpp \ utils.cpp layers.cpp main.cpp popupinfo.cpp tabbox.cpp \

@ -116,7 +116,7 @@ was meant for the previously active window.
The basic principle of focus stealing prevention is that the window with most The basic principle of focus stealing prevention is that the window with most
recent user activity wins. Any window of an application will become active recent user activity wins. Any window of an application will become active
when being shown only if this application was the most recently used one. when being shown only if this application was the most recently used one.
KWin itself, and some of the related kdecore classes should take care KWin itself, and some of the related tdecore classes should take care
of the common cases, so usually there's no need for any special handling of the common cases, so usually there's no need for any special handling
in applications. Qt/KDE applications, that is. Applications using other in applications. Qt/KDE applications, that is. Applications using other
toolkits should in most cases work fine too. If they don't support toolkits should in most cases work fine too. If they don't support

@ -4,7 +4,7 @@ Also, the API is documented in the .h header files.
Makefile.am: Makefile.am:
- Change kwin_ to kwin3_ (in LDFLAGS, LIBADD, kde_module_LTLIBRARIES, SOURCES). - Change kwin_ to kwin3_ (in LDFLAGS, LIBADD, kde_module_LTLIBRARIES, SOURCES).
- Make sure LDFLAGS contains $(KDE_PLUGIN) and -module . - Make sure LDFLAGS contains $(KDE_PLUGIN) and -module .
- Add -lkdecorations to LIBADD. - Add -ltdecorations to LIBADD.
- Do NOT rename the directory where the .desktop file is installed ( $(kde_datadir)/kwin/ ). - Do NOT rename the directory where the .desktop file is installed ( $(kde_datadir)/kwin/ ).
.desktop file: .desktop file:

@ -32,6 +32,6 @@ install( FILES b2.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
tde_add_kpart( kwin3_b2 AUTOMOC tde_add_kpart( kwin3_b2 AUTOMOC
SOURCES b2client.cpp SOURCES b2client.cpp
LINK kdecorations-shared LINK tdecorations-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -24,6 +24,6 @@ link_directories(
tde_add_kpart( kwin_b2_config AUTOMOC tde_add_kpart( kwin_b2_config AUTOMOC
SOURCES config.cpp SOURCES config.cpp
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -27,6 +27,6 @@ link_directories(
tde_add_kpart( kwin3_default AUTOMOC tde_add_kpart( kwin3_default AUTOMOC
SOURCES kdedefault.cpp SOURCES kdedefault.cpp
LINK kdecorations-shared kdecore-shared LINK tdecorations-shared tdecore-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -24,6 +24,6 @@ link_directories(
tde_add_kpart( kwin_default_config AUTOMOC tde_add_kpart( kwin_default_config AUTOMOC
SOURCES config.cpp SOURCES config.cpp
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -35,7 +35,7 @@ set_source_files_properties( keramik.cpp
tde_add_kpart( kwin3_keramik AUTOMOC tde_add_kpart( kwin3_keramik AUTOMOC
SOURCES keramik.cpp SOURCES keramik.cpp
LINK kdecorations-shared kdeui-shared LINK tdecorations-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -8,7 +8,7 @@ noinst_HEADERS = tiles.h
embedtool_SOURCES = embedtool.cpp embedtool_SOURCES = embedtool.cpp
embedtool_LDADD = $(LIB_QT) embedtool_LDADD = $(LIB_QT)
embedtool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor embedtool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kde_module_LTLIBRARIES = kwin3_keramik.la kde_module_LTLIBRARIES = kwin3_keramik.la

@ -24,6 +24,6 @@ link_directories(
tde_add_kpart( kwin_keramik_config AUTOMOC tde_add_kpart( kwin_keramik_config AUTOMOC
SOURCES config.cpp keramikconfig.ui SOURCES config.cpp keramikconfig.ui
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kwin3_kwmtheme.la
kwin3_kwmtheme_la_SOURCES = kwmthemeclient.cpp kwin3_kwmtheme_la_SOURCES = kwmthemeclient.cpp
kwin3_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module kwin3_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kwin3_kwmtheme_la_LIBADD = -lkdecorations kwin3_kwmtheme_la_LIBADD = -ltdecorations
METASOURCES = AUTO METASOURCES = AUTO
noinst_HEADERS = kwmthemeclient.h noinst_HEADERS = kwmthemeclient.h

@ -10,7 +10,7 @@ bin_PROGRAMS = kwmtheme
kwmtheme_SOURCES = main.cpp kwmtheme_SOURCES = main.cpp
# the library search path. # the library search path.
kwmtheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kwmtheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
# the libraries to link against. Be aware of the order. First the libraries, # the libraries to link against. Be aware of the order. First the libraries,
# that depend on the following ones. # that depend on the following ones.

@ -30,6 +30,6 @@ install( FILES laptop.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
tde_add_kpart( kwin3_laptop AUTOMOC tde_add_kpart( kwin3_laptop AUTOMOC
SOURCES laptopclient.cpp SOURCES laptopclient.cpp
LINK kdecorations-shared LINK tdecorations-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -31,6 +31,6 @@ install( FILES modernsystem.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
tde_add_kpart( kwin3_modernsys tde_add_kpart( kwin3_modernsys
SOURCES modernsys.cpp SOURCES modernsys.cpp
LINK kdecorations-shared LINK tdecorations-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -24,7 +24,7 @@ link_directories(
tde_add_kpart( kwin_modernsys_config AUTOMOC tde_add_kpart( kwin_modernsys_config AUTOMOC
SOURCES config.cpp SOURCES config.cpp
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -34,6 +34,6 @@ install( FILES plastik.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
tde_add_kpart( kwin3_plastik AUTOMOC tde_add_kpart( kwin3_plastik AUTOMOC
SOURCES plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp SOURCES plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp
LINK kdecorations-shared kdeui-shared LINK tdecorations-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -28,6 +28,6 @@ install( FILES DESTINATION ${XDG_APPS_INSTALL_DIR} )
tde_add_kpart( kwin_plastik_config AUTOMOC tde_add_kpart( kwin_plastik_config AUTOMOC
SOURCES config.cpp configdialog.ui SOURCES config.cpp configdialog.ui
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -32,6 +32,6 @@ install( FILES quartz.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
tde_add_kpart( kwin3_quartz AUTOMOC tde_add_kpart( kwin3_quartz AUTOMOC
SOURCES quartz.cpp SOURCES quartz.cpp
LINK kdecorations-shared kdeui-shared LINK tdecorations-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -24,6 +24,6 @@ link_directories(
tde_add_kpart( kwin_quartz_config AUTOMOC tde_add_kpart( kwin_quartz_config AUTOMOC
SOURCES config.cpp SOURCES config.cpp
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -30,6 +30,6 @@ install( FILES redmond.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
tde_add_kpart( kwin3_redmond AUTOMOC tde_add_kpart( kwin3_redmond AUTOMOC
SOURCES redmond.cpp SOURCES redmond.cpp
LINK kdecorations-shared kdecore-shared LINK tdecorations-shared tdecore-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -29,6 +29,6 @@ install( FILES web.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
tde_add_kpart( kwin3_web AUTOMOC tde_add_kpart( kwin3_web AUTOMOC
SOURCES Web.cpp WebButton.cpp SOURCES Web.cpp WebButton.cpp
LINK kdecorations-shared kdeui-shared LINK tdecorations-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -44,7 +44,7 @@ install( FILES
tde_add_executable( kwin_update_window_settings tde_add_executable( kwin_update_window_settings
SOURCES update_window_settings.cpp SOURCES update_window_settings.cpp
LINK kdecore-shared LINK tdecore-shared
DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
) )
@ -53,6 +53,6 @@ tde_add_executable( kwin_update_window_settings
tde_add_executable( kwin_update_default_rules tde_add_executable( kwin_update_default_rules
SOURCES update_default_rules.cpp SOURCES update_default_rules.cpp
LINK kdecore-shared LINK tdecore-shared
DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
) )

@ -32,6 +32,6 @@ tde_add_kpart( kcm_kwindecoration AUTOMOC
SOURCES SOURCES
kwindecoration.cpp buttons.cpp kwindecoration.cpp buttons.cpp
kwindecorationIface.skel preview.cpp kwindecorationIface.skel preview.cpp
LINK kdecorations-shared kdeui-shared Xext LINK tdecorations-shared tdeui-shared Xext
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -35,6 +35,6 @@ install( FILES
tde_add_kpart( kcm_kwinoptions AUTOMOC tde_add_kpart( kcm_kwinoptions AUTOMOC
SOURCES windows.cpp mouse.cpp main.cpp SOURCES windows.cpp mouse.cpp main.cpp
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -35,9 +35,9 @@ tde_add_kpart( kcm_kwinrules AUTOMOC
DESTINATION ${PLUGIN_INSTALL_DIR} ) DESTINATION ${PLUGIN_INSTALL_DIR} )
##### kwin_rules_dialog (kdeinit) ############### ##### kwin_rules_dialog (tdeinit) ###############
tde_add_kdeinit_executable( kwin_rules_dialog tde_add_tdeinit_executable( kwin_rules_dialog
SOURCES main.cpp SOURCES main.cpp
LINK ${TQT_LIBRARIES} kwinrules-static ) LINK ${TQT_LIBRARIES} kwinrules-static )
@ -53,4 +53,4 @@ set( ${target}_SRCS
tde_add_library( ${target} STATIC_PIC AUTOMOC tde_add_library( ${target} STATIC_PIC AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kdeui-shared ) LINK tdeui-shared )

@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/kwin/lib
bin_PROGRAMS = bin_PROGRAMS =
lib_LTLIBRARIES = lib_LTLIBRARIES =
kdeinit_LTLIBRARIES = kwin_rules_dialog.la tdeinit_LTLIBRARIES = kwin_rules_dialog.la
kde_module_LTLIBRARIES = kcm_kwinrules.la kde_module_LTLIBRARIES = kcm_kwinrules.la
noinst_LTLIBRARIES = libkwinrules.la noinst_LTLIBRARIES = libkwinrules.la

@ -23,6 +23,6 @@ link_directories(
tde_add_executable( kwin_killer_helper tde_add_executable( kwin_killer_helper
SOURCES killer.cpp SOURCES killer.cpp
LINK kdeui-shared LINK tdeui-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -4,6 +4,6 @@ bin_PROGRAMS = kwin_killer_helper
kwin_killer_helper_SOURCES = killer.cpp kwin_killer_helper_SOURCES = killer.cpp
kwin_killer_helper_LDADD = $(LIB_KDEUI) kwin_killer_helper_LDADD = $(LIB_KDEUI)
kwin_killer_helper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kwin_killer_helper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
METASOURCES = AUTO METASOURCES = AUTO

@ -21,9 +21,9 @@ link_directories(
) )
##### kdecorations (shared) ##################### ##### tdecorations (shared) #####################
set( target kdecorations ) set( target tdecorations )
set( ${target}_SRCS set( ${target}_SRCS
kdecoration.cpp kdecoration_p.cpp kdecoration_plugins_p.cpp kdecoration.cpp kdecoration_p.cpp kdecoration_plugins_p.cpp
@ -33,7 +33,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
VERSION 1.0.0 VERSION 1.0.0
LINK kdecore-shared LINK tdecore-shared
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )

@ -950,7 +950,7 @@ void Workspace::editWindowRules( Client* c, bool whole_app )
args << "--wid" << TQString::number( c->window()); args << "--wid" << TQString::number( c->window());
if( whole_app ) if( whole_app )
args << "--whole-app"; args << "--whole-app";
KApplication::kdeinitExec( "kwin_rules_dialog", args ); KApplication::tdeinitExec( "kwin_rules_dialog", args );
} }
void Workspace::loadWindowRules() void Workspace::loadWindowRules()

@ -5,7 +5,7 @@ SUBDIRS = decobenchmark
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
test_gravity_SOURCES = test_gravity.cpp test_gravity_SOURCES = test_gravity.cpp
test_gravity_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor test_gravity_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
test_gravity_LDADD = $(LIB_X11) test_gravity_LDADD = $(LIB_X11)
METASOURCES = AUTO METASOURCES = AUTO

@ -1219,7 +1219,7 @@ TQStringList Workspace::configModules(bool controlCenter)
void Workspace::configureWM() void Workspace::configureWM()
{ {
KApplication::kdeinitExec( "kcmshell", configModules(false) ); KApplication::tdeinitExec( "kcmshell", configModules(false) );
} }
/*! /*!

@ -44,12 +44,12 @@ tde_add_kpart( kcm_keyboard AUTOMOC
) )
##### kxkb (kdeinit) ############################ ##### kxkb (tdeinit) ############################
tde_add_kdeinit_executable( kxkb AUTOMOC tde_add_tdeinit_executable( kxkb AUTOMOC
SOURCES SOURCES
extension.cpp x11helper.cpp rules.cpp kxkbconfig.cpp extension.cpp x11helper.cpp rules.cpp kxkbconfig.cpp
pixmap.cpp layoutmap.cpp kxkb.cpp kxkbtraywindow.cpp pixmap.cpp layoutmap.cpp kxkb.cpp kxkbtraywindow.cpp
kxkb.skel kxkb.skel
LINK kdeui-shared xkbfile LINK tdeui-shared xkbfile
) )

@ -7,7 +7,7 @@ KDE_OPTIONS = nofinal
bin_PROGRAMS = bin_PROGRAMS =
lib_LTLIBRARIES = lib_LTLIBRARIES =
kdeinit_LTLIBRARIES = kxkb.la tdeinit_LTLIBRARIES = kxkb.la
kde_module_LTLIBRARIES = kcm_keyboard.la kde_module_LTLIBRARIES = kcm_keyboard.la
kcm_keyboard_la_SOURCES = extension.cpp x11helper.cpp rules.cpp kxkbconfig.cpp pixmap.cpp \ kcm_keyboard_la_SOURCES = extension.cpp x11helper.cpp rules.cpp kxkbconfig.cpp pixmap.cpp \

@ -324,7 +324,7 @@ void LayoutConfig::save()
m_kxkbConfig.save(); m_kxkbConfig.save();
kapp->kdeinitExec("kxkb"); kapp->tdeinitExec("kxkb");
emit KCModule::changed( false ); emit KCModule::changed( false );
} }

@ -67,6 +67,6 @@ noinst_HEADERS = konq_sound.h
messages: messages:
$(XGETTEXT) *.cc *.h -o $(podir)/libkonq.pot $(XGETTEXT) *.cc *.h -o $(podir)/libkonq.pot
DOXYGEN_REFERENCES = dcop kdecore kio/bookmarks DOXYGEN_REFERENCES = dcop tdecore kio/bookmarks
include ../admin/Doxyfile.am include ../admin/Doxyfile.am

@ -32,6 +32,6 @@ install( PROGRAMS move_favicons.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
tde_add_kpart( kded_favicons AUTOMOC tde_add_kpart( kded_favicons AUTOMOC
SOURCES favicons.cpp favicons.skel SOURCES favicons.cpp favicons.skel
LINK kdeinit_kded-shared LINK tdeinit_kded-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -45,7 +45,7 @@ tde_add_kpart( libnsplugin AUTOMOC
tde_add_kpart( kcm_nsplugins AUTOMOC tde_add_kpart( kcm_nsplugins AUTOMOC
SOURCES kcm_nsplugins.cpp SOURCES kcm_nsplugins.cpp
LINK pluginpaths-static kdecore-shared LINK pluginpaths-static tdecore-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -116,7 +116,7 @@ extern "C"
if ( scan || firstTime ) if ( scan || firstTime )
{ {
KApplication::kdeinitExec("nspluginscan"); KApplication::tdeinitExec("nspluginscan");
} }
if (firstTime) { if (firstTime) {

@ -4,7 +4,7 @@ noinst_HEADERS = testnsplugin.h
check_PROGRAMS = testnsplugin check_PROGRAMS = testnsplugin
testnsplugin_SOURCES = testnsplugin.cpp testnsplugin_SOURCES = testnsplugin.cpp
testnsplugin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor testnsplugin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testnsplugin_LDADD = $(LIB_KDEUI) ../libnsplugin.la testnsplugin_LDADD = $(LIB_KDEUI) ../libnsplugin.la
$(srcdir)/testnsplugin.cpp: ../NSPluginClassIface_stub.h $(srcdir)/testnsplugin.cpp: ../NSPluginClassIface_stub.h

@ -50,14 +50,14 @@ fi
# Boot sequence: # Boot sequence:
# #
# kdeinit is used to fork off processes which improves memory usage # tdeinit is used to fork off processes which improves memory usage
# and startup time. # and startup time.
# #
# * kdeinit starts the dcopserver and klauncher first. # * tdeinit starts the dcopserver and klauncher first.
# * Then kded is started. kded is responsible for keeping the sycoca # * Then kded is started. kded is responsible for keeping the sycoca
# database up to date. When an up to date database is present it goes # database up to date. When an up to date database is present it goes
# into the background and the startup continues. # into the background and the startup continues.
# * Then kdeinit starts kcminit. kcminit performs initialisation of # * Then tdeinit starts kcminit. kcminit performs initialisation of
# certain devices according to the user's settings # certain devices according to the user's settings
# #
# * Then ksmserver is started which takes control of the rest of the startup sequence # * Then ksmserver is started which takes control of the rest of the startup sequence
@ -483,7 +483,7 @@ if test "$kpersonalizerrc_general_firstlogin" = "true"; then
if [ ! -x $KDEDIR/bin/kpersonalizer ]; then if [ ! -x $KDEDIR/bin/kpersonalizer ]; then
echo "[startkde] kpersonalizer not found! Please install it in order to properly configure your user profile." 1>&2 echo "[startkde] kpersonalizer not found! Please install it in order to properly configure your user profile." 1>&2
else else
# start only dcopserver, don't start whole kdeinit (takes too long) # start only dcopserver, don't start whole tdeinit (takes too long)
echo "[startkde] Running kpersonalizer..." 1>&2 echo "[startkde] Running kpersonalizer..." 1>&2
dcopserver dcopserver
kwin --lock & kwin --lock &
@ -523,7 +523,7 @@ fi
# Mark that full KDE session is running (e.g. Konqueror preloading works only # Mark that full KDE session is running (e.g. Konqueror preloading works only
# with full KDE running). The TDE_FULL_SESSION property can be detected by # with full KDE running). The TDE_FULL_SESSION property can be detected by
# any X client connected to the same X session, even if not launched # any X client connected to the same X session, even if not launched
# directly from the KDE session but e.g. using "ssh -X", kdesu. $TDE_FULL_SESSION # directly from the KDE session but e.g. using "ssh -X", tdesu. $TDE_FULL_SESSION
# however guarantees that the application is launched in the same environment # however guarantees that the application is launched in the same environment
# like the KDE session and that e.g. KDE utilities/libraries are available. # like the KDE session and that e.g. KDE utilities/libraries are available.
# TDE_FULL_SESSION property is also only available since KDE 3.5.5. # TDE_FULL_SESSION property is also only available since KDE 3.5.5.
@ -546,15 +546,15 @@ KDE_SESSION_UID=$UID
export KDE_SESSION_UID export KDE_SESSION_UID
echo "[startkde] KDE_SESSION_UID: $KDE_SESSION_UID" 1>&2 echo "[startkde] KDE_SESSION_UID: $KDE_SESSION_UID" 1>&2
# We set LD_BIND_NOW to increase the efficiency of kdeinit. # We set LD_BIND_NOW to increase the efficiency of tdeinit.
# kdeinit unsets this variable before loading applications. # tdeinit unsets this variable before loading applications.
LD_BIND_NOW=true start_kdeinit_wrapper --new-startup +kcminit_startup LD_BIND_NOW=true start_tdeinit_wrapper --new-startup +kcminit_startup
if test $? -ne 0; then if test $? -ne 0; then
# Startup error # Startup error
echo '[startkde] Could not start kdeinit. Check your installation.' 1>&2 echo '[startkde] Could not start tdeinit. Check your installation.' 1>&2
xmessage -geometry 500x100 "Could not start kdeinit. Check your installation." xmessage -geometry 500x100 "Could not start tdeinit. Check your installation."
fi fi
echo "[startkde] kdeinit started successfully." 1>&2 echo "[startkde] tdeinit started successfully." 1>&2
# If the session should be locked from the start (locked autologin), # If the session should be locked from the start (locked autologin),
# lock now and do the rest of the KDE startup underneath the locker. # lock now and do the rest of the KDE startup underneath the locker.
@ -591,12 +591,12 @@ done
echo '[startkde] Shutting down Trinity...' 1>&2 echo '[startkde] Shutting down Trinity...' 1>&2
# Clean up # Clean up
kdeinit_shutdown tdeinit_shutdown
dcopserver_shutdown --wait dcopserver_shutdown --wait
artsshell -q terminate artsshell -q terminate
# KDE4 support # KDE4 support
if [ -f /usr/bin/kdeinit4_shutdown ]; then if [ -f /usr/bin/tdeinit4_shutdown ]; then
kde4 kdeinit4_shutdown 2>/dev/null kde4 tdeinit4_shutdown 2>/dev/null
fi fi
echo '[startkde] Running Trinity shutdown scripts...' 1>&2 echo '[startkde] Running Trinity shutdown scripts...' 1>&2

@ -27,7 +27,7 @@ link_directories(
tde_add_library( qtkde SHARED AUTOMOC tde_add_library( qtkde SHARED AUTOMOC
SOURCES qtkde.cpp SOURCES qtkde.cpp
VERSION 0.0.0 VERSION 0.0.0
LINK kdeui-shared LINK tdeui-shared
DEPENDENCIES generate_tqt3_bindings DEPENDENCIES generate_tqt3_bindings
DESTINATION "${PLUGIN_INSTALL_DIR}/plugins/integration/" DESTINATION "${PLUGIN_INSTALL_DIR}/plugins/integration/"
) )

@ -36,7 +36,7 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kdeinit_kded-shared LINK tdeinit_kded-shared
DEPENDENCIES generate_tqt3_bindings DEPENDENCIES generate_tqt3_bindings
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -28,7 +28,7 @@ link_directories(
tde_add_executable( gen AUTOMOC tde_add_executable( gen AUTOMOC
SOURCES SOURCES
gen.cpp gen.cpp
LINK kdecore-shared LINK tdecore-shared
) )
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(

Loading…
Cancel
Save