summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-07 17:44:27 -0600
committerTimothy Pearson <[email protected]>2013-02-07 17:44:27 -0600
commit010b0e260e3f8954d82ed503af05e40980a7fda2 (patch)
tree266dccd52763c327f5ff74eb6526bc3ecd6f56b7
parentabbc06820c7599ea3d423dd91ad198d11bd1e6ec (diff)
downloadkbarcode-010b0e260e3f8954d82ed503af05e40980a7fda2.tar.gz
kbarcode-010b0e260e3f8954d82ed503af05e40980a7fda2.zip
Rename KComp to avoid conflicts with KDE4
-rw-r--r--kbarcode/batchwizard.cpp2
-rw-r--r--kbarcode/batchwizard.h4
-rw-r--r--kbarcode/previewdialog.cpp2
-rw-r--r--kbarcode/smalldialogs.cpp4
-rw-r--r--kbarcode/smalldialogs.h4
5 files changed, 8 insertions, 8 deletions
diff --git a/kbarcode/batchwizard.cpp b/kbarcode/batchwizard.cpp
index 5f99793..65ea6dd 100644
--- a/kbarcode/batchwizard.cpp
+++ b/kbarcode/batchwizard.cpp
@@ -96,7 +96,7 @@ BatchWizard::BatchWizard( TQWidget* parent, const char* name )
setupPage5();
setupPage10();
- compGroup = new KCompletion();
+ compGroup = new TDECompletion();
enableControls();
setupSql();
diff --git a/kbarcode/batchwizard.h b/kbarcode/batchwizard.h
index 3bc18e1..1534022 100644
--- a/kbarcode/batchwizard.h
+++ b/kbarcode/batchwizard.h
@@ -24,7 +24,7 @@
class BatchPrinter;
class EncodingCombo;
class KComboBox;
-class KCompletion;
+class TDECompletion;
class KIntNumInput;
class KLineEdit;
class TDEListBox;
@@ -231,7 +231,7 @@ class BatchWizard : public KWizard, public BatchIface {
KComboBox* comboFormat;
EncodingCombo* comboEncoding;
- KCompletion* compGroup;
+ TDECompletion* compGroup;
KIntNumInput* serialInc;
KIntNumInput* numLabels;
diff --git a/kbarcode/previewdialog.cpp b/kbarcode/previewdialog.cpp
index 55c631c..964b0d6 100644
--- a/kbarcode/previewdialog.cpp
+++ b/kbarcode/previewdialog.cpp
@@ -65,7 +65,7 @@ PreviewDialog::PreviewDialog( TQIODevice* device, Definition* d, TQString filena
groupName = new KLineEdit( group, this );
articleId = new KLineEdit( article, this );
if( SqlTables::isConnected() ) {
- KCompletion* comp = articleId->completionObject();
+ TDECompletion* comp = articleId->completionObject();
TQSqlQuery query( "select article_no from barcode_basic" );
TQStringList slist;
while ( query.next() )
diff --git a/kbarcode/smalldialogs.cpp b/kbarcode/smalldialogs.cpp
index 82fe63a..97ff5d1 100644
--- a/kbarcode/smalldialogs.cpp
+++ b/kbarcode/smalldialogs.cpp
@@ -118,7 +118,7 @@ void AddItemsDialog::setupSql()
if( !tables->isConnected() )
return;
- KCompletion* comp = article->completionObject();
+ TDECompletion* comp = article->completionObject();
comp->clear();
TQSqlQuery query( "select article_no from " TABLE_BASIC " order by article_no" );
TQStringList slist;
@@ -128,7 +128,7 @@ void AddItemsDialog::setupSql()
comp->setItems( slist );
}
-void AddItemsDialog::setGroupCompletion( KCompletion* c )
+void AddItemsDialog::setGroupCompletion( TDECompletion* c )
{
group->setCompletionObject( c );
}
diff --git a/kbarcode/smalldialogs.h b/kbarcode/smalldialogs.h
index f4183e7..994efed 100644
--- a/kbarcode/smalldialogs.h
+++ b/kbarcode/smalldialogs.h
@@ -21,7 +21,7 @@
#include <tqwidget.h>
#include <kdialogbase.h>
-class KCompletion;
+class TDECompletion;
class KIntNumInput;
class KLineEdit;
@@ -48,7 +48,7 @@ namespace DSSmallDialogs {
AddItemsDialog( TQWidget* parent = 0, const char* name = 0 );
AddItemsDialog( const TQString & a, const TQString & g, int c, TQWidget* parent = 0, const char* name = 0 );
- void setGroupCompletion( KCompletion* c );
+ void setGroupCompletion( TDECompletion* c );
int count() const;
const TQString articleNo() const;