summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--acinclude.m42
-rw-r--r--admin/acinclude.m4.in2
-rwxr-xr-xconfigure.in4
-rw-r--r--po/kvirc/kvirc_bg.po14
-rw-r--r--po/kvirc/kvirc_ca.po14
-rw-r--r--po/kvirc/kvirc_cs.po14
-rw-r--r--po/kvirc/kvirc_de.po14
-rw-r--r--po/kvirc/kvirc_es.po14
-rw-r--r--po/kvirc/kvirc_fi.po12
-rw-r--r--po/kvirc/kvirc_fr.po14
-rw-r--r--po/kvirc/kvirc_hr.po14
-rw-r--r--po/kvirc/kvirc_hu.po14
-rw-r--r--po/kvirc/kvirc_it.po14
-rw-r--r--po/kvirc/kvirc_nl.po14
-rw-r--r--po/kvirc/kvirc_pl.po14
-rw-r--r--po/kvirc/kvirc_pt.po14
-rw-r--r--po/kvirc/kvirc_pt_BR.po14
-rw-r--r--po/kvirc/kvirc_ru.po14
-rw-r--r--po/kvirc/kvirc_sr.po14
-rw-r--r--po/kvirc/kvirc_uk.po14
-rw-r--r--src/kvirc/ui/kvi_window.cpp2
-rw-r--r--src/modules/dockwidget/libkvidockwidget_qt3.cpp2
-rw-r--r--src/modules/objects/Makefile.am6
-rw-r--r--src/modules/objects/class_dockwindow.cpp54
-rw-r--r--src/modules/objects/class_dockwindow.h6
-rw-r--r--src/modules/objects/libkviobjects.cpp6
26 files changed, 160 insertions, 160 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 6b73b7dd..19715af0 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2300,7 +2300,7 @@ AC_DEFUN([AC_SS_ENSURE_CAN_COMPILE_X_QT3_AND_KDE],
LDFLAGS="-s $LDFLAGS"
AC_TRY_LINK([
#include "kapp.h"
- #include "kwin.h"
+ #include "twin.h"
],[
int a = KWin::currentDesktop();
KApplication app(a,0,"kvirc");
diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in
index 720dec7e..caa60d4f 100644
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
@@ -2300,7 +2300,7 @@ AC_DEFUN([AC_SS_ENSURE_CAN_COMPILE_X_QT3_AND_KDE],
LDFLAGS="-s $LDFLAGS"
AC_TRY_LINK([
#include "kapp.h"
- #include "kwin.h"
+ #include "twin.h"
],[
int a = KWin::currentDesktop();
KApplication app(a,0,"kvirc");
diff --git a/configure.in b/configure.in
index 822dfa14..654898e6 100755
--- a/configure.in
+++ b/configure.in
@@ -100,8 +100,8 @@ AC_SS_FIND_QT
AC_SS_HEADER([Checking KDE])
-SS_KDE_GENERAL_FILE_TO_SEARCH="include/kwin.h"
-SS_KDE_INCLUDE_FILE_TO_SEARCH="kwin.h"
+SS_KDE_GENERAL_FILE_TO_SEARCH="include/twin.h"
+SS_KDE_INCLUDE_FILE_TO_SEARCH="twin.h"
AC_SS_FIND_KDE
diff --git a/po/kvirc/kvirc_bg.po b/po/kvirc/kvirc_bg.po
index bb8f8230..ee1db614 100644
--- a/po/kvirc/kvirc_bg.po
+++ b/po/kvirc/kvirc_bg.po
@@ -9466,31 +9466,31 @@ msgstr "Неправилен параметър"
msgid "I can't find the specified file '%Q'."
msgstr "Не може да определи исканият адрес"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:121
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:121
#, fuzzy
msgid "Can't add a null object"
msgstr "Не може да изпрати файл с нулева големина"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:128
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:128
msgid ""
"Invalid object handle passed as parameter (the object is no longer "
"existing ?)"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:134
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:134
msgid "Object in invalid state"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:140
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:140
msgid "Can't set a non-widget object to be the main widget of a dock window"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:146
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:146
msgid "The added widget is not a child of this dock window"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:262
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:271
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:262
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:271
#, fuzzy
msgid "Invalid dock area specified"
msgstr "Неправилен порт"
diff --git a/po/kvirc/kvirc_ca.po b/po/kvirc/kvirc_ca.po
index 688ac2d4..0e2f4bea 100644
--- a/po/kvirc/kvirc_ca.po
+++ b/po/kvirc/kvirc_ca.po
@@ -10203,31 +10203,31 @@ msgstr "Adre� no v�ida per a aquest motor"
msgid "I can't find the specified file '%Q'."
msgstr "No es pot trobar l'arxiu multim�ia %s"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:121
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:121
#, fuzzy
msgid "Can't add a null object"
msgstr "No puc afegir un objecte no-widget"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:128
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:128
msgid ""
"Invalid object handle passed as parameter (the object is no longer "
"existing ?)"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:134
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:134
msgid "Object in invalid state"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:140
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:140
msgid "Can't set a non-widget object to be the main widget of a dock window"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:146
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:146
msgid "The added widget is not a child of this dock window"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:262
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:271
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:262
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:271
#, fuzzy
msgid "Invalid dock area specified"
msgstr "S'ha especificat una adre� IP no v�ida (%s)"
diff --git a/po/kvirc/kvirc_cs.po b/po/kvirc/kvirc_cs.po
index e73bdc49..c252c048 100644
--- a/po/kvirc/kvirc_cs.po
+++ b/po/kvirc/kvirc_cs.po
@@ -9765,30 +9765,30 @@ msgstr "Neplatný mód výběru '%Q'"
msgid "I can't find the specified file '%Q'."
msgstr "Nelze nalézt zadaný soubor '%Q'."
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:121
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:121
msgid "Can't add a null object"
msgstr "Nelze přidat nulový objekt"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:128
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:128
msgid ""
"Invalid object handle passed as parameter (the object is no longer "
"existing ?)"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:134
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:134
msgid "Object in invalid state"
msgstr "Objekt v neplatném stavu"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:140
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:140
msgid "Can't set a non-widget object to be the main widget of a dock window"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:146
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:146
msgid "The added widget is not a child of this dock window"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:262
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:271
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:262
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:271
msgid "Invalid dock area specified"
msgstr "Určena neplatná dokovací oblast"
diff --git a/po/kvirc/kvirc_de.po b/po/kvirc/kvirc_de.po
index 82635f17..3018e930 100644
--- a/po/kvirc/kvirc_de.po
+++ b/po/kvirc/kvirc_de.po
@@ -10225,11 +10225,11 @@ msgstr "Ungültiger Auswahlrichtungsmodus '%Q'"
msgid "I can't find the specified file '%Q'."
msgstr "Ich kann die angegebene Datei '%Q' nicht finden."
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:121
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:121
msgid "Can't add a null object"
msgstr "Es Kann kein Nullobjekt hinzugefügt werden."
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:128
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:128
msgid ""
"Invalid object handle passed as parameter (the object is no longer "
"existing ?)"
@@ -10237,22 +10237,22 @@ msgstr ""
"Es wurde ein ungültiger Objekthandle als erster Parameter übergeben "
"(existiert dieses Objekt nicht mehr?)"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:134
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:134
msgid "Object in invalid state"
msgstr "Das Objekt befindet sich in einem ungültigen Zustand."
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:140
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:140
msgid "Can't set a non-widget object to be the main widget of a dock window"
msgstr ""
"Sie können kein nicht-Widget-Objekt als Hauptwidget eines Dockfensters "
"verwenden."
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:146
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:146
msgid "The added widget is not a child of this dock window"
msgstr "Das hinzugefügte Widget ist kein Kind dieses Dockfensters."
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:262
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:271
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:262
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:271
msgid "Invalid dock area specified"
msgstr "Es wurde ein ungültiges Dock-Areal angegeben."
diff --git a/po/kvirc/kvirc_es.po b/po/kvirc/kvirc_es.po
index caf77b3b..34ea50e5 100644
--- a/po/kvirc/kvirc_es.po
+++ b/po/kvirc/kvirc_es.po
@@ -10143,11 +10143,11 @@ msgstr "Modo de selección no válido \"%Q\": asumiendo \"single\""
msgid "I can't find the specified file '%Q'."
msgstr " No puedo encontrar el archivo especificado '%Q'."
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:121
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:121
msgid "Can't add a null object"
msgstr "No puedo añadir un objeto nulo"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:128
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:128
msgid ""
"Invalid object handle passed as parameter (the object is no longer "
"existing ?)"
@@ -10155,22 +10155,22 @@ msgstr ""
"Se pasó como parámetro un manejador a un objeto no válido (el objeto ya no "
"existe?)"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:134
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:134
msgid "Object in invalid state"
msgstr "El objeto se encuentra en un estado no válido"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:140
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:140
msgid "Can't set a non-widget object to be the main widget of a dock window"
msgstr ""
"No puedo asignar un objeto no-widget para ser el widget principal de una "
"ventana de anclaje"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:146
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:146
msgid "The added widget is not a child of this dock window"
msgstr "El widget añadido no es un hijo de esta ventana de anclaje"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:262
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:271
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:262
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:271
#, fuzzy
msgid "Invalid dock area specified"
msgstr "Se especificó una dirección IP no válida (%s)"
diff --git a/po/kvirc/kvirc_fi.po b/po/kvirc/kvirc_fi.po
index bf107a41..b300a033 100644
--- a/po/kvirc/kvirc_fi.po
+++ b/po/kvirc/kvirc_fi.po
@@ -9474,29 +9474,29 @@ msgstr ""
msgid "I can't find the specified file '%Q'."
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:116
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:116
msgid "Can't add a null object"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:123
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:123
msgid ""
"Invalid object handle passed as parameter (the object is no longer "
"existing ?)"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:129
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:129
msgid "Object in invalid state"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:135
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:135
msgid "Can't set a non-widget object to be the main widget of a dock window"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:141
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:141
msgid "The added widget is not a child of this dock window"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:227
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:227
msgid "Invalid dock area specified"
msgstr ""
diff --git a/po/kvirc/kvirc_fr.po b/po/kvirc/kvirc_fr.po
index 4a514488..8f52aff7 100644
--- a/po/kvirc/kvirc_fr.po
+++ b/po/kvirc/kvirc_fr.po
@@ -10085,11 +10085,11 @@ msgstr "Mode de sélection '%Q' invalide"
msgid "I can't find the specified file '%Q'."
msgstr "Impossible de trouver le fichier spécifié '%Q'."
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:121
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:121
msgid "Can't add a null object"
msgstr "Impossible d'ajouter un objet nul"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:128
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:128
msgid ""
"Invalid object handle passed as parameter (the object is no longer "
"existing ?)"
@@ -10097,22 +10097,22 @@ msgstr ""
"Identifiant d'objet invalide passé comme paramètre (l'object existe-t-il "
"encore ?)"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:134
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:134
msgid "Object in invalid state"
msgstr "Objet dans un état invalide"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:140
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:140
msgid "Can't set a non-widget object to be the main widget of a dock window"
msgstr ""
"Impossible de définir un objet non graphique comme étant l'objet graphique "
"principal d'une fenêtre incrustée"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:146
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:146
msgid "The added widget is not a child of this dock window"
msgstr "L'objet graphique ajouté n'est pas un fils de la fenêtre incrustée"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:262
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:271
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:262
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:271
msgid "Invalid dock area specified"
msgstr "Aire d'incrustation invalide"
diff --git a/po/kvirc/kvirc_hr.po b/po/kvirc/kvirc_hr.po
index fb7cfafd..dcfd2f0d 100644
--- a/po/kvirc/kvirc_hr.po
+++ b/po/kvirc/kvirc_hr.po
@@ -9422,30 +9422,30 @@ msgstr ""
msgid "I can't find the specified file '%Q'."
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:121
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:121
msgid "Can't add a null object"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:128
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:128
msgid ""
"Invalid object handle passed as parameter (the object is no longer "
"existing ?)"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:134
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:134
msgid "Object in invalid state"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:140
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:140
msgid "Can't set a non-widget object to be the main widget of a dock window"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:146
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:146
msgid "The added widget is not a child of this dock window"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:262
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:271
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:262
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:271
msgid "Invalid dock area specified"
msgstr ""
diff --git a/po/kvirc/kvirc_hu.po b/po/kvirc/kvirc_hu.po
index d9f6f92b..4a08484b 100644
--- a/po/kvirc/kvirc_hu.po
+++ b/po/kvirc/kvirc_hu.po
@@ -9709,11 +9709,11 @@ msgstr "Helytelen kijelölési mód '%Q'"
msgid "I can't find the specified file '%Q'."
msgstr "Megadott fájl nem található: %Q"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:121
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:121
msgid "Can't add a null object"
msgstr "Null objektum hozzáadása nem lehetséges"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:128
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:128
msgid ""
"Invalid object handle passed as parameter (the object is no longer "
"existing ?)"
@@ -9721,20 +9721,20 @@ msgstr ""
"Helytelen objektum kezelő átadása paraméterként (az objektum talán már nem "
"létezik?)"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:134
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:134
msgid "Object in invalid state"
msgstr "Helytelen állapotú objektum"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:140
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:140
msgid "Can't set a non-widget object to be the main widget of a dock window"
msgstr "Nem-widget objektum nem lehet a fő widgete a dokkolóablaknak"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:146
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:146
msgid "The added widget is not a child of this dock window"
msgstr "A hozzáadott widget nem gyermeke ennek a dokkoló ablaknak"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:262
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:271
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:262
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:271
msgid "Invalid dock area specified"
msgstr "Helytelenül megadott csatolási felület"
diff --git a/po/kvirc/kvirc_it.po b/po/kvirc/kvirc_it.po
index 813b2c31..fb0ce9f1 100644
--- a/po/kvirc/kvirc_it.po
+++ b/po/kvirc/kvirc_it.po
@@ -9887,11 +9887,11 @@ msgstr "Modalità di selezione '%Q' non valida"
msgid "I can't find the specified file '%Q'."
msgstr "Impossibile trovare il file specificato '%Q'."
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:121
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:121
msgid "Can't add a null object"
msgstr "Impossibile aggiungere un Oggetto null"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:128
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:128
msgid ""
"Invalid object handle passed as parameter (the object is no longer "
"existing ?)"
@@ -9899,22 +9899,22 @@ msgstr ""
"Gestore invalido dell'Oggetto passato come parametro (l'oggetto non esiste "
"più?)"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:134
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:134
msgid "Object in invalid state"
msgstr "Stato non valido per l'Oggetto"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:140
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:140
msgid "Can't set a non-widget object to be the main widget of a dock window"
msgstr ""
"Impossibile settare un Oggetto non-Widget come principale di una finestra "
"dock"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:146
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:146
msgid "The added widget is not a child of this dock window"
msgstr "Il parametro Widget aggiunto non è figlio di questa finestra dock"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:262
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:271
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:262
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:271
msgid "Invalid dock area specified"
msgstr "L'area di dock specificata non è valida"
diff --git a/po/kvirc/kvirc_nl.po b/po/kvirc/kvirc_nl.po
index 88b600ed..15406bde 100644
--- a/po/kvirc/kvirc_nl.po
+++ b/po/kvirc/kvirc_nl.po
@@ -10607,31 +10607,31 @@ msgstr "voor"
msgid "I can't find the specified file '%Q'."
msgstr "de commando venster door id s"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:121
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:121
#, fuzzy
msgid "Can't add a null object"
msgstr "de IP"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:128
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:128
msgid ""
"Invalid object handle passed as parameter (the object is no longer "
"existing ?)"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:134
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:134
msgid "Object in invalid state"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:140
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:140
msgid "Can't set a non-widget object to be the main widget of a dock window"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:146
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:146
msgid "The added widget is not a child of this dock window"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:262
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:271
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:262
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:271
#, fuzzy
msgid "Invalid dock area specified"
msgstr "Ongeldig IP adres"
diff --git a/po/kvirc/kvirc_pl.po b/po/kvirc/kvirc_pl.po
index 8b0979dd..f5054660 100644
--- a/po/kvirc/kvirc_pl.po
+++ b/po/kvirc/kvirc_pl.po
@@ -9956,31 +9956,31 @@ msgstr "Nieprawidłowy indeks (%s)"
msgid "I can't find the specified file '%Q'."
msgstr "Wybierz pliki do wysłania"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:121
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:121
#, fuzzy
msgid "Can't add a null object"
msgstr "Nieprawidłowy indeks (%Q)"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:128
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:128
msgid ""
"Invalid object handle passed as parameter (the object is no longer "
"existing ?)"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:134
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:134
msgid "Object in invalid state"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:140
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:140
msgid "Can't set a non-widget object to be the main widget of a dock window"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:146
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:146
msgid "The added widget is not a child of this dock window"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:262
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:271
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:262
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:271
#, fuzzy
msgid "Invalid dock area specified"
msgstr "Nie podano indeksu"
diff --git a/po/kvirc/kvirc_pt.po b/po/kvirc/kvirc_pt.po
index 2381b2ec..9cc300ad 100644
--- a/po/kvirc/kvirc_pt.po
+++ b/po/kvirc/kvirc_pt.po
@@ -9851,32 +9851,32 @@ msgstr "Modo de selecção inválido '%Q'"
msgid "I can't find the specified file '%Q'."
msgstr "Não é possível encontrar o ficheiro indicado '%Q'."
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:121
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:121
msgid "Can't add a null object"
msgstr "Não é possível adicionar um objecto nulo"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:128
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:128
msgid ""
"Invalid object handle passed as parameter (the object is no longer "
"existing ?)"
msgstr "Gestão inválida de objecto passada como parâmetro (o objecto já não existe?)"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:134
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:134
msgid "Object in invalid state"
msgstr "Objecto em estado inválido"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:140
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:140
msgid "Can't set a non-widget object to be the main widget of a dock window"
msgstr ""
"Não é possível definir um objecto não widget para ser o widget principal de "
"uma janela de acoplamento"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:146
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:146
msgid "The added widget is not a child of this dock window"
msgstr "O elemento adicionado não provém desta janela de acoplamento"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:262
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:271
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:262
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:271
msgid "Invalid dock area specified"
msgstr "Área de acoplagem indicada inválida"
diff --git a/po/kvirc/kvirc_pt_BR.po b/po/kvirc/kvirc_pt_BR.po
index 4f821987..4dafe35d 100644
--- a/po/kvirc/kvirc_pt_BR.po
+++ b/po/kvirc/kvirc_pt_BR.po
@@ -10239,31 +10239,31 @@ msgstr "Direção inválida para este motor"
msgid "I can't find the specified file '%Q'."
msgstr "Eu não posso encontrar o arquivo especificado."
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:121
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:121
#, fuzzy
msgid "Can't add a null object"
msgstr "Não foi possível adicionar um objeto não widget"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:128
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:128
msgid ""
"Invalid object handle passed as parameter (the object is no longer "
"existing ?)"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:134
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:134
msgid "Object in invalid state"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:140
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:140
msgid "Can't set a non-widget object to be the main widget of a dock window"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:146
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:146
msgid "The added widget is not a child of this dock window"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:262
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:271
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:262
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:271
#, fuzzy
msgid "Invalid dock area specified"
msgstr "endereço ip (%s) especificado inválido"
diff --git a/po/kvirc/kvirc_ru.po b/po/kvirc/kvirc_ru.po
index d3acfeeb..ae99850e 100644
--- a/po/kvirc/kvirc_ru.po
+++ b/po/kvirc/kvirc_ru.po
@@ -9907,11 +9907,11 @@ msgstr "Неправильный способ выбора '%Q'"
msgid "I can't find the specified file '%Q'."
msgstr "Не могу найти файл %Q"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:121
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:121
msgid "Can't add a null object"
msgstr "Невозможно добавить не видет объект"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:128
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:128
msgid ""
"Invalid object handle passed as parameter (the object is no longer "
"existing ?)"
@@ -9919,20 +9919,20 @@ msgstr ""
"В качестве параметра передана битая ссылка на объект (возможно объект удален "
"до передачи в качестве параметра?)"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:134
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:134
msgid "Object in invalid state"
msgstr "Объект в неизвестном состоянии"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:140
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:140
msgid "Can't set a non-widget object to be the main widget of a dock window"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:146
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:146
msgid "The added widget is not a child of this dock window"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:262
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:271
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:262
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:271
msgid "Invalid dock area specified"
msgstr "Неправильная область"
diff --git a/po/kvirc/kvirc_sr.po b/po/kvirc/kvirc_sr.po
index 498e07e4..2455a35b 100644
--- a/po/kvirc/kvirc_sr.po
+++ b/po/kvirc/kvirc_sr.po
@@ -10569,31 +10569,31 @@ msgstr "Pogrean pravac za ovu mainu"
msgid "I can't find the specified file '%Q'."
msgstr "Ne mogu da na�m multimedijalni fajl %s"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:121
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:121
#, fuzzy
msgid "Can't add a null object"
msgstr "Ne mogu da prona�m prozor sa ID-om '%s'"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:128
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:128
msgid ""
"Invalid object handle passed as parameter (the object is no longer "
"existing ?)"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:134
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:134
msgid "Object in invalid state"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:140
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:140
msgid "Can't set a non-widget object to be the main widget of a dock window"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:146
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:146
msgid "The added widget is not a child of this dock window"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:262
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:271
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:262
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:271
#, fuzzy
msgid "Invalid dock area specified"
msgstr "Pogreno navedena IP adesa (%s)"
diff --git a/po/kvirc/kvirc_uk.po b/po/kvirc/kvirc_uk.po
index 2ed8ba8e..5550ce1d 100644
--- a/po/kvirc/kvirc_uk.po
+++ b/po/kvirc/kvirc_uk.po
@@ -9868,11 +9868,11 @@ msgstr "Неправильний спосіб вибору '%Q'"
msgid "I can't find the specified file '%Q'."
msgstr "Не можу знайти файл %Q"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:121
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:121
msgid "Can't add a null object"
msgstr "Неможливо додати не баче об'єкт"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:128
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:128
msgid ""
"Invalid object handle passed as parameter (the object is no longer "
"existing ?)"
@@ -9880,20 +9880,20 @@ msgstr ""
"Як параметр переданий бите посилання на об'єкт (можливо об'єкт вилучений до "
"передачі як параметр?)"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:134
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:134
msgid "Object in invalid state"
msgstr "Об'єкт у невідомому стані"
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:140
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:140
msgid "Can't set a non-widget object to be the main widget of a dock window"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:146
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:146
msgid "The added widget is not a child of this dock window"
msgstr ""
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:262
-#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_dockwindow.cpp:271
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:262
+#: /home/hellvis69/kvircsvn/trunk/kvirc/src/modules/objects/class_doctwindow.cpp:271
msgid "Invalid dock area specified"
msgstr "Неправильна область"
diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index 352c0cfe..fe75e7e7 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -83,7 +83,7 @@
#endif
#ifdef COMPILE_KDE_SUPPORT
- #include <kwin.h>
+ #include <twin.h>
#include <kdeversion.h>
#endif
diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
index 8dd177cc..771db15c 100644
--- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp
+++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
@@ -43,7 +43,7 @@
#include "kvi_doublebuffer.h"
#ifdef COMPILE_KDE_SUPPORT
- #include <kwin.h>
+ #include <twin.h>
#include <kpopupmenu.h>
#else
#include <tqlabel.h>
diff --git a/src/modules/objects/Makefile.am b/src/modules/objects/Makefile.am
index c4574582..ec1ae47c 100644
--- a/src/modules/objects/Makefile.am
+++ b/src/modules/objects/Makefile.am
@@ -15,7 +15,7 @@ libkviobjects_la_SOURCES = libkviobjects.cpp \
class_checkbox.cpp \
class_combobox.cpp \
class_dialog.cpp \
- class_dockwindow.cpp \
+ class_doctwindow.cpp \
class_file.cpp \
class_groupbox.cpp \
class_label.cpp \
@@ -60,7 +60,7 @@ noinst_HEADERS= class_button.h \
class_checkbox.h \
class_combobox.h \
class_dialog.h \
- class_dockwindow.h \
+ class_doctwindow.h \
class_file.h \
class_groupbox.h \
class_label.h \
@@ -105,7 +105,7 @@ class_checkbox.cpp: m_class_checkbox.moc
class_combobox.cpp: m_class_combobox.moc
class_button.cpp: m_class_button.moc
class_dialog.cpp: m_class_dialog.moc
-class_dockwindow.cpp: m_class_dockwindow.moc
+class_doctwindow.cpp: m_class_doctwindow.moc
class_file.cpp: m_class_file.moc
class_groupbox.cpp: m_class_groupbox.moc
class_label.cpp: m_class_label.moc
diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp
index 40fc473b..296a192b 100644
--- a/src/modules/objects/class_dockwindow.cpp
+++ b/src/modules/objects/class_dockwindow.cpp
@@ -1,6 +1,6 @@
//=============================================================================
//
-// File : class_dockwindow.cpp
+// File : class_doctwindow.cpp
// Created on Thu 29 Dec 2005 23:45:11 by Szymon Stefanek
//
// This file is part of the KVIrc IRC Client distribution
@@ -22,7 +22,7 @@
//
//=============================================================================
-#include "class_dockwindow.h"
+#include "class_doctwindow.h"
#include "kvi_frame.h"
#include "kvi_locale.h"
@@ -31,15 +31,15 @@
#include <TQDockWidget>
#define TQT_DOCK_WINDOW TQDockWidget
#else
- #include <tqdockwindow.h>
+ #include <tqdoctwindow.h>
#define TQT_DOCK_WINDOW TQDockWindow
#endif
#include <tqlayout.h>
/*
- @doc: dockwindow
+ @doc: doctwindow
@title:
- dockwindow class
+ doctwindow class
@type:
class
@short:
@@ -74,27 +74,27 @@
*/
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_dockwindow,"dockwindow","widget")
- KVSO_REGISTER_HANDLER(KviKvsObject_dockwindow,"addWidget",function_addWidget)
- KVSO_REGISTER_HANDLER(KviKvsObject_dockwindow,"orientation",function_orientation)
- KVSO_REGISTER_HANDLER(KviKvsObject_dockwindow,"setOrientation",function_setOrientation)
- KVSO_REGISTER_HANDLER(KviKvsObject_dockwindow,"resizeEnabled",function_resizeEnabled)
- KVSO_REGISTER_HANDLER(KviKvsObject_dockwindow,"setResizeEnabled",function_setResizeEnabled)
- KVSO_REGISTER_HANDLER(KviKvsObject_dockwindow,"setAllowedDockAreas",function_setAllowedDockAreas)
- KVSO_REGISTER_HANDLER(KviKvsObject_dockwindow,"dock",function_dock)
-KVSO_END_REGISTERCLASS(KviKvsObject_dockwindow)
+KVSO_BEGIN_REGISTERCLASS(KviKvsObject_doctwindow,"doctwindow","widget")
+ KVSO_REGISTER_HANDLER(KviKvsObject_doctwindow,"addWidget",function_addWidget)
+ KVSO_REGISTER_HANDLER(KviKvsObject_doctwindow,"orientation",function_orientation)
+ KVSO_REGISTER_HANDLER(KviKvsObject_doctwindow,"setOrientation",function_setOrientation)
+ KVSO_REGISTER_HANDLER(KviKvsObject_doctwindow,"resizeEnabled",function_resizeEnabled)
+ KVSO_REGISTER_HANDLER(KviKvsObject_doctwindow,"setResizeEnabled",function_setResizeEnabled)
+ KVSO_REGISTER_HANDLER(KviKvsObject_doctwindow,"setAllowedDockAreas",function_setAllowedDockAreas)
+ KVSO_REGISTER_HANDLER(KviKvsObject_doctwindow,"dock",function_dock)
+KVSO_END_REGISTERCLASS(KviKvsObject_doctwindow)
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_dockwindow,KviKvsObject_widget)
-KVSO_END_CONSTRUCTOR(KviKvsObject_dockwindow)
+KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_doctwindow,KviKvsObject_widget)
+KVSO_END_CONSTRUCTOR(KviKvsObject_doctwindow)
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_dockwindow)
-KVSO_END_DESTRUCTOR(KviKvsObject_dockwindow)
+KVSO_BEGIN_DESTRUCTOR(KviKvsObject_doctwindow)
+KVSO_END_DESTRUCTOR(KviKvsObject_doctwindow)
#define _pDockWindow ((TQT_DOCK_WINDOW *)widget())
-bool KviKvsObject_dockwindow::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams)
+bool KviKvsObject_doctwindow::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams)
{
#ifdef COMPILE_USE_QT4
TQDockWidget * pWidget = new TQDockWidget(g_pFrame);
@@ -106,7 +106,7 @@ bool KviKvsObject_dockwindow::init(KviKvsRunTimeContext * pContext,KviKvsVariant
return true;
}
-bool KviKvsObject_dockwindow::function_addWidget(KviKvsObjectFunctionCall *c)
+bool KviKvsObject_doctwindow::function_addWidget(KviKvsObjectFunctionCall *c)
{
kvs_hobject_t hWidget;
KVSO_PARAMETERS_BEGIN(c)
@@ -155,7 +155,7 @@ bool KviKvsObject_dockwindow::function_addWidget(KviKvsObjectFunctionCall *c)
return true;
}
-bool KviKvsObject_dockwindow::function_orientation(KviKvsObjectFunctionCall * c)
+bool KviKvsObject_doctwindow::function_orientation(KviKvsObjectFunctionCall * c)
{
if(!widget())return true; // hum ? dead ?
#ifdef COMPILE_USE_QT4
@@ -166,7 +166,7 @@ bool KviKvsObject_dockwindow::function_orientation(KviKvsObjectFunctionCall * c)
return true;
}
-bool KviKvsObject_dockwindow::function_setOrientation(KviKvsObjectFunctionCall * c)
+bool KviKvsObject_doctwindow::function_setOrientation(KviKvsObjectFunctionCall * c)
{
TQString szOrientation;
KVSO_PARAMETERS_BEGIN(c)
@@ -180,7 +180,7 @@ bool KviKvsObject_dockwindow::function_setOrientation(KviKvsObjectFunctionCall *
return true;
}
-bool KviKvsObject_dockwindow::function_resizeEnabled(KviKvsObjectFunctionCall * c)
+bool KviKvsObject_doctwindow::function_resizeEnabled(KviKvsObjectFunctionCall * c)
{
if(!widget())return true; // hum ? dead ?
#ifdef COMPILE_USE_QT4
@@ -191,7 +191,7 @@ bool KviKvsObject_dockwindow::function_resizeEnabled(KviKvsObjectFunctionCall *
return true;
}
-bool KviKvsObject_dockwindow::function_setResizeEnabled(KviKvsObjectFunctionCall * c)
+bool KviKvsObject_doctwindow::function_setResizeEnabled(KviKvsObjectFunctionCall * c)
{
bool bResizeEnabled;
KVSO_PARAMETERS_BEGIN(c)
@@ -206,7 +206,7 @@ bool KviKvsObject_dockwindow::function_setResizeEnabled(KviKvsObjectFunctionCall
return true;
}
-bool KviKvsObject_dockwindow::function_setAllowedDockAreas(KviKvsObjectFunctionCall * c)
+bool KviKvsObject_doctwindow::function_setAllowedDockAreas(KviKvsObjectFunctionCall * c)
{
TQString szFlags;
KVSO_PARAMETERS_BEGIN(c)
@@ -242,7 +242,7 @@ bool KviKvsObject_dockwindow::function_setAllowedDockAreas(KviKvsObjectFunctionC
}
-bool KviKvsObject_dockwindow::function_dock(KviKvsObjectFunctionCall * c)
+bool KviKvsObject_doctwindow::function_dock(KviKvsObjectFunctionCall * c)
{
TQString szDock;
KVSO_PARAMETERS_BEGIN(c)
@@ -273,4 +273,4 @@ bool KviKvsObject_dockwindow::function_dock(KviKvsObjectFunctionCall * c)
return true;
}
-#include "m_class_dockwindow.moc"
+#include "m_class_doctwindow.moc"
diff --git a/src/modules/objects/class_dockwindow.h b/src/modules/objects/class_dockwindow.h
index 9ed8f60c..41128074 100644
--- a/src/modules/objects/class_dockwindow.h
+++ b/src/modules/objects/class_dockwindow.h
@@ -2,7 +2,7 @@
#define _CLASS_DOCKWINDOW_H_
//=============================================================================
//
-// File : class_dockwindow.h
+// File : class_doctwindow.h
// Created on Thu 29 Dec 2005 23:45:11 by Szymon Stefanek
//
// This file is part of the KVIrc IRC Client distribution
@@ -29,12 +29,12 @@
#include "class_widget.h"
-class KviKvsObject_dockwindow : public KviKvsObject_widget
+class KviKvsObject_doctwindow : public KviKvsObject_widget
{
Q_OBJECT
TQ_OBJECT
public:
- KVSO_DECLARE_OBJECT(KviKvsObject_dockwindow)
+ KVSO_DECLARE_OBJECT(KviKvsObject_doctwindow)
protected:
virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams);
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 977c8c9b..68456034 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -83,7 +83,7 @@
#include "class_wrapper.h"
#include "class_dialog.h"
#include "class_xmlreader.h"
-#include "class_dockwindow.h"
+#include "class_doctwindow.h"
#include "class_vbox.h"
#include "class_hbox.h"
static void dumpChildObjects(KviWindow *pWnd, TQObject *parent, const char *spacing, bool bWidgetsOnly, KviKvsArray *n, int &idx);
@@ -96,7 +96,7 @@ static bool objects_module_cleanup(KviModule *m)
KviKvsObject_wrapper::unregisterSelf();
KviKvsObject_file::unregisterSelf();
KviKvsObject_progressbar::unregisterSelf();
- KviKvsObject_dockwindow::unregisterSelf();
+ KviKvsObject_doctwindow::unregisterSelf();
KviKvsObject_wizard::unregisterSelf();
KviKvsObject_window::unregisterSelf();
KviKvsObject_urlabel::unregisterSelf();
@@ -1037,7 +1037,7 @@ static bool objects_module_init(KviModule * m)
KviKvsObject_urlabel::registerSelf();
KviKvsObject_window::registerSelf();
KviKvsObject_wizard::registerSelf();
- KviKvsObject_dockwindow::registerSelf();
+ KviKvsObject_doctwindow::registerSelf();
KviKvsObject_progressbar::registerSelf();
KviKvsObject_file::registerSelf();
KviKvsObject_wrapper::registerSelf();