summaryrefslogtreecommitdiffstats
path: root/umbrello
diff options
context:
space:
mode:
Diffstat (limited to 'umbrello')
-rw-r--r--umbrello/umbrello/Makefile.am4
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/ast.cpp2
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/ast.h2
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp2
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/ast_utils.h2
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/driver.cpp2
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/driver.h2
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/errors.cpp2
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/errors.h2
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp2
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/lexer.h2
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp2
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/lookup.h2
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/parser.cpp2
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/parser.h2
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/tree_parser.cpp2
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/tree_parser.h2
-rw-r--r--umbrello/umbrello/docgenerators/Makefile.am2
-rw-r--r--umbrello/umbrello/umlviewimageexportermodel.h8
19 files changed, 23 insertions, 23 deletions
diff --git a/umbrello/umbrello/Makefile.am b/umbrello/umbrello/Makefile.am
index b19ecb18..a68fd709 100644
--- a/umbrello/umbrello/Makefile.am
+++ b/umbrello/umbrello/Makefile.am
@@ -113,8 +113,8 @@ widget_factory.cpp \
widget_utils.cpp \
worktoolbar.cpp
-#umbrello_LDADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(AUTOLAYOUT_LIBS) $(LIB_TDEPRINT) $(LIB_KIO)
-umbrello_LDADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la ./docgenerators/libdocgenerators.la $(LIB_TDEPRINT) $(LIB_KIO)
+#umbrello_LDADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(AUTOLAYOUT_LIBS) $(LIB_TDEPRINT) $(LIB_TDEIO)
+umbrello_LDADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la ./docgenerators/libdocgenerators.la $(LIB_TDEPRINT) $(LIB_TDEIO)
## See section "dnl Not GPL compatible" in ../configure.in.in
# SUBDIRS = $(AUTOLAYOUT_DIR) codeimport dialogs clipboard pics codegenerators headings refactoring
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
index 2c962e5d..8e6922ee 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
@@ -1,5 +1,5 @@
/* This file is part of KDevelop
- Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
+ Copyright (C) 2002,2003 Roberto Raggi <roberto@kdevelop.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.h b/umbrello/umbrello/codeimport/kdevcppparser/ast.h
index e807225b..ed6d91b0 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.h
@@ -1,5 +1,5 @@
/* This file is part of KDevelop
- Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
+ Copyright (C) 2002,2003 Roberto Raggi <roberto@kdevelop.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
index d892eafc..4077a3c0 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
@@ -1,6 +1,6 @@
/***************************************************************************
* Copyright (C) 2002 by Roberto Raggi *
- * roberto@tdevelop.org *
+ * roberto@kdevelop.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.h b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.h
index f84f7249..1f6209db 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.h
@@ -1,6 +1,6 @@
/***************************************************************************
* Copyright (C) 2002 by Roberto Raggi *
- * roberto@tdevelop.org *
+ * roberto@kdevelop.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp b/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp
index b3a7329c..daef65da 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp
@@ -1,5 +1,5 @@
/* This file is part of KDevelop
- Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
+ Copyright (C) 2002,2003 Roberto Raggi <roberto@kdevelop.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/driver.h b/umbrello/umbrello/codeimport/kdevcppparser/driver.h
index a349b7c8..9c365129 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/driver.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/driver.h
@@ -1,5 +1,5 @@
/* This file is part of KDevelop
- Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
+ Copyright (C) 2002,2003 Roberto Raggi <roberto@kdevelop.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp b/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp
index 133b3117..133d6726 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp
@@ -1,5 +1,5 @@
/* This file is part of KDevelop
- Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
+ Copyright (C) 2002,2003 Roberto Raggi <roberto@kdevelop.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/errors.h b/umbrello/umbrello/codeimport/kdevcppparser/errors.h
index e0959250..6751475e 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/errors.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/errors.h
@@ -1,5 +1,5 @@
/* This file is part of KDevelop
- Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
+ Copyright (C) 2002,2003 Roberto Raggi <roberto@kdevelop.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
index e313052e..976888c1 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
@@ -1,5 +1,5 @@
/* This file is part of KDevelop
- Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
+ Copyright (C) 2002,2003 Roberto Raggi <roberto@kdevelop.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.h b/umbrello/umbrello/codeimport/kdevcppparser/lexer.h
index d27980f8..c0eca989 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.h
@@ -1,5 +1,5 @@
/* This file is part of KDevelop
- Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
+ Copyright (C) 2002,2003 Roberto Raggi <roberto@kdevelop.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp
index 2d009294..a0ee3dbc 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp
@@ -19,7 +19,7 @@
*
*/
-// adapted to tdevelop by Roberto Raggi <roberto@tdevelop.org>
+// adapted to tdevelop by Roberto Raggi <roberto@kdevelop.org>
#include "lookup.h"
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lookup.h b/umbrello/umbrello/codeimport/kdevcppparser/lookup.h
index 615d8a00..cff7dded 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/lookup.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/lookup.h
@@ -19,7 +19,7 @@
*
*/
-// adapted to tdevelop by Roberto Raggi <roberto@tdevelop.org>
+// adapted to tdevelop by Roberto Raggi <roberto@kdevelop.org>
#ifndef _KJSLOOKUP_H_
#define _KJSLOOKUP_H_
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
index 653376a0..278690fc 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
@@ -1,5 +1,5 @@
/* This file is part of KDevelop
- Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
+ Copyright (C) 2002,2003 Roberto Raggi <roberto@kdevelop.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/parser.h b/umbrello/umbrello/codeimport/kdevcppparser/parser.h
index 930a563f..9be954c2 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/parser.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/parser.h
@@ -1,5 +1,5 @@
/* This file is part of KDevelop
- Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
+ Copyright (C) 2002,2003 Roberto Raggi <roberto@kdevelop.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.cpp b/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.cpp
index d419336e..454c4b99 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.cpp
@@ -1,5 +1,5 @@
/* This file is part of KDevelop
- Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
+ Copyright (C) 2002,2003 Roberto Raggi <roberto@kdevelop.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.h b/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.h
index 66fc05ef..5377358b 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.h
@@ -1,5 +1,5 @@
/* This file is part of KDevelop
- Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
+ Copyright (C) 2002,2003 Roberto Raggi <roberto@kdevelop.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/umbrello/umbrello/docgenerators/Makefile.am b/umbrello/umbrello/docgenerators/Makefile.am
index f702ca72..bc657026 100644
--- a/umbrello/umbrello/docgenerators/Makefile.am
+++ b/umbrello/umbrello/docgenerators/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/umbrello/docgenerators -I../../../umbr
METASOURCES = AUTO
bin_PROGRAMS = umbodoc
-AM_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
umbodoc_COMPILE_FIRST = version.h
umbodoc_SOURCES = main.cpp
umbodoc_LDADD = $(LIB_TDECORE) $(LIBXSLT_LIBS) $(LIBXML_LIBS)
diff --git a/umbrello/umbrello/umlviewimageexportermodel.h b/umbrello/umbrello/umlviewimageexportermodel.h
index 5e1b7dd5..ff14b3c5 100644
--- a/umbrello/umbrello/umlviewimageexportermodel.h
+++ b/umbrello/umbrello/umlviewimageexportermodel.h
@@ -29,8 +29,8 @@ class KURL;
* The methods in this class don't communicate with the user, so asking the format
* to save the images in, checking if the target file exists and so on must be done before
* calling those methods, if needed.
- * The only exception is asking passwords for example when KIO slaves are used, as this
- * operation is made automatically by the KIO classes.
+ * The only exception is asking passwords for example when TDEIO slaves are used, as this
+ * operation is made automatically by the TDEIO classes.
*/
class UMLViewImageExporterModel {
public:
@@ -96,7 +96,7 @@ public:
*
* This method creates the specified target directory if needed. If there was an
* existing file with the same path as one to be created overwrites it without asking.
- * The url used can be local or remote, using supported KIO slaves.
+ * The url used can be local or remote, using supported TDEIO slaves.
*
* @param imageType The type of the images the views will be exported to.
* @param directory The url of the directory where the images will be saved.
@@ -112,7 +112,7 @@ public:
*
* This method creates the needed directories, if any. If there was an existing
* file in the specified url overwrites it without asking.
- * The url used can be local or remote, using supported KIO slaves.
+ * The url used can be local or remote, using supported TDEIO slaves.
*
* If some problem occurs when exporting, an error message is returned.
*